Hive: Common namespace validation for HiveCatalog

nk1506 · Mar 17, 2024 · c3f576e · c3f576e
1 parent 560b723
commit c3f576e
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveCatalog.java b/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveCatalog.java
@@ -115,8 +115,8 @@ public void initialize(String inputName, Map<String, String> properties) {
 
   @Override
   public List<TableIdentifier> listTables(Namespace namespace) {
-    Preconditions.checkArgument(
-        isValidateNamespace(namespace), "Missing database in namespace: %s", namespace);
+    checkNamespaceIsValid(namespace);
+
     String database = namespace.level(0);
 
     try {
@@ -275,12 +275,7 @@ public void renameTable(TableIdentifier from, TableIdentifier originalTo) {
 
   @Override
   public void createNamespace(Namespace namespace, Map<String, String> meta) {
-    Preconditions.checkArgument(
-        !namespace.isEmpty(), "Cannot create namespace with invalid name: %s", namespace);
-    Preconditions.checkArgument(
-        isValidateNamespace(namespace),
-        "Cannot support multi part namespace in Hive Metastore: %s",
-        namespace);
+    checkNamespaceIsValid(namespace);
     Preconditions.checkArgument(
         meta.get(HMS_DB_OWNER_TYPE) == null || meta.get(HMS_DB_OWNER) != null,
         "Create namespace setting %s without setting %s is not allowed",
@@ -312,7 +307,7 @@ public void createNamespace(Namespace namespace, Map<String, String> meta) {
 
   @Override
   public List<Namespace> listNamespaces(Namespace namespace) {
-    if (!isValidateNamespace(namespace) && !namespace.isEmpty()) {
+    if (!isValidNamespace(namespace) && !namespace.isEmpty()) {
       throw new NoSuchNamespaceException("Namespace does not exist: %s", namespace);
     }
     if (!namespace.isEmpty()) {
@@ -340,7 +335,7 @@ public List<Namespace> listNamespaces(Namespace namespace) {
 
   @Override
   public boolean dropNamespace(Namespace namespace) {
-    if (!isValidateNamespace(namespace)) {
+    if (!isValidNamespace(namespace)) {
       return false;
     }
 
@@ -439,7 +434,7 @@ private void alterHiveDataBase(Namespace namespace, Database database) {
 
   @Override
   public Map<String, String> loadNamespaceMetadata(Namespace namespace) {
-    if (!isValidateNamespace(namespace)) {
+    if (!isValidNamespace(namespace)) {
       throw new NoSuchNamespaceException("Namespace does not exist: %s", namespace);
     }
 
@@ -482,10 +477,17 @@ private TableIdentifier removeCatalogName(TableIdentifier to) {
     return to;
   }
 
-  private boolean isValidateNamespace(Namespace namespace) {
+  private boolean isValidNamespace(Namespace namespace) {
     return namespace.levels().length == 1;
   }
 
+  private void checkNamespaceIsValid(Namespace namespace) {
+    Preconditions.checkArgument(
+        isValidNamespace(namespace),
+        "Cannot support empty or multi part namespace in Hive Metastore: %s",
+        namespace);
+  }
+
   @Override
   public TableOperations newTableOps(TableIdentifier tableIdentifier) {
     String dbName = tableIdentifier.namespace().level(0);
@@ -554,10 +556,6 @@ private Map<String, String> convertToMetadata(Database database) {
   }
 
   Database convertToDatabase(Namespace namespace, Map<String, String> meta) {
-    if (!isValidateNamespace(namespace)) {
-      throw new NoSuchNamespaceException("Namespace does not exist: %s", namespace);
-    }
-
     Database database = new Database();
     Map<String, String> parameter = Maps.newHashMap();