Add log line to debug npe in resolveLocationForPath

apache · Dec 19, 2024 · 68a7750 · 68a7750
1 parent b069591
commit 68a7750
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/service/common/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java b/service/common/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java
@@ -554,14 +554,33 @@ private String resolveNamespaceLocation(Namespace namespace, Map<String, String>
         .map(
             entity -> {
               if (entity.getType().equals(PolarisEntityType.CATALOG)) {
-                return CatalogEntity.of(entity).getDefaultBaseLocation();
+                CatalogEntity catEntity = CatalogEntity.of(entity);
+                String catalogDefaultBaseLocation = catEntity.getDefaultBaseLocation();
+                if (catalogDefaultBaseLocation == null) {
+                  LOGGER.warn(
+                      "Tried to resolve location with catalog with null defalut base location. Catalog = {}",
+                      catEntity);
+                  throw new RuntimeException(
+                      "Tried to resolve location with catalog with null defalut base location. Catalog = "
+                          + catEntity);
+                }
+                return catalogDefaultBaseLocation;
               } else {
                 String baseLocation =
                     entity.getPropertiesAsMap().get(PolarisEntityConstants.ENTITY_BASE_LOCATION);
                 if (baseLocation != null) {
                   return baseLocation;
                 } else {
-                  return entity.getName();
+                  String entityName = entity.getName();
+                  if (entityName == null) {
+                    LOGGER.warn(
+                        "Tried to resolve location with entity without base location or name. entity = {}",
+                        entity);
+                    throw new RuntimeException(
+                        "Tried to resolve location with entity without base location or name. entity = "
+                            + entity);
+                  }
+                  return entityName;
                 }
               }
             })