remove Preconditions.checkArgument

apache · Jan 7, 2025 · f8f2db9 · f8f2db9
1 parent 3ad84b9
commit f8f2db9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/...rc/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHDFSPlugin.java b/...rc/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationHDFSPlugin.java
@@ -253,6 +253,7 @@ protected void updatePolicyByMetadataObject(
    * If remove the TABLE, need to remove these the relevant policies, `{schema}.*`, `{schema}.*.*`
    * <br>
    * If remove the COLUMN, Only need to remove `{schema}.*.*` <br>
+   * If remove the PATH, Only need to remove `{path}` <br>
    */
   @Override
   protected void doRemoveMetadataObject(AuthorizationMetadataObject authzMetadataObject) {

diff --git a/core/src/main/java/org/apache/gravitino/authorization/AuthorizationUtils.java b/core/src/main/java/org/apache/gravitino/authorization/AuthorizationUtils.java
@@ -414,10 +414,11 @@ public static List<String> getMetadataObjectLocation(
                         if (schema.properties().containsKey(HiveConstants.LOCATION)) {
                           String defaultSchemaLocation =
                               schema.properties().get(HiveConstants.LOCATION);
-                          Preconditions.checkArgument(
-                              defaultSchemaLocation != null,
-                              String.format("Catalog %s location is not found", ident));
-                          locations.add(defaultSchemaLocation);
+                          if (defaultSchemaLocation != null && !defaultSchemaLocation.isEmpty()) {
+                            locations.add(defaultSchemaLocation);
+                          } else {
+                            LOG.warn("Catalog %s location is not found", ident);
+                          }
                         }
                       }
                     });
@@ -435,10 +436,11 @@ public static List<String> getMetadataObjectLocation(
                               metalake, catalogObj.name(), "default" /*Hive default schema*/));
               if (schema.properties().containsKey(HiveConstants.LOCATION)) {
                 String defaultSchemaLocation = schema.properties().get(HiveConstants.LOCATION);
-                Preconditions.checkArgument(
-                    defaultSchemaLocation != null,
-                    String.format("Catalog %s location is not found", ident));
-                locations.add(defaultSchemaLocation);
+                if (defaultSchemaLocation != null && !defaultSchemaLocation.isEmpty()) {
+                  locations.add(defaultSchemaLocation);
+                } else {
+                  LOG.warn("Catalog %s location is not found", ident);
+                }
               }
             }
           }
@@ -448,20 +450,24 @@ public static List<String> getMetadataObjectLocation(
             Schema schema = GravitinoEnv.getInstance().schemaDispatcher().loadSchema(ident);
             if (schema.properties().containsKey(HiveConstants.LOCATION)) {
               String schemaLocation = schema.properties().get(HiveConstants.LOCATION);
-              Preconditions.checkArgument(
-                  schemaLocation != null, String.format("Schema %s location is not found", ident));
-              locations.add(schemaLocation);
+              if (schemaLocation != null && schemaLocation.isEmpty()) {
+                locations.add(schemaLocation);
+              } else {
+                LOG.warn("Schema %s location is not found", ident);
+              }
             }
           }
           break;
         case TABLE:
           {
             Table table = GravitinoEnv.getInstance().tableDispatcher().loadTable(ident);
             if (table.properties().containsKey(HiveConstants.LOCATION)) {
-              String schemaLocation = table.properties().get(HiveConstants.LOCATION);
-              Preconditions.checkArgument(
-                  schemaLocation != null, String.format("Table %s location is not found", ident));
-              locations.add(schemaLocation);
+              String tableLocation = table.properties().get(HiveConstants.LOCATION);
+              if (tableLocation != null && tableLocation.isEmpty()) {
+                locations.add(tableLocation);
+              } else {
+                LOG.warn("Table %s location is not found", ident);
+              }
             }
           }
           break;
@@ -477,8 +483,6 @@ public static List<String> getMetadataObjectLocation(
               String.format("Fileset %s location is not found", identifier));
           locations.add(filesetLocation);
           break;
-        case TOPIC:
-          break;
         default:
           throw new AuthorizationPluginException(
               "The metadata object type %s is not supported get location paths.",