NoSQL: adapt to changes on main

Author: snazy

components/persistence/bridge/src/main/java/org/apache/polaris/persistence/bridge/IndexedContainerAccess.java

@@ -108,7 +108,7 @@ static <C extends ContainerObj> IndexedContainerAccess<C> indexedAccessForEntity
             yield new IndexedContainerAccessImpl<>(
                 persistence, refName, CatalogRolesObj.class, catalogStableId);
           }
-          case NAMESPACE, ICEBERG_TABLE_LIKE -> {
+          case NAMESPACE, TABLE_LIKE -> {
             catalogMandatory(catalogStableId);
             yield new IndexedContainerAccessImpl<>(
                 persistence, refName, CatalogStateObj.class, catalogStableId);

components/persistence/bridge/src/main/java/org/apache/polaris/persistence/bridge/TypeMapping.java

@@ -22,8 +22,10 @@
 import static java.util.Objects.requireNonNull;
 import static org.apache.polaris.core.entity.CatalogEntity.CATALOG_TYPE_PROPERTY;
 import static org.apache.polaris.core.entity.CatalogEntity.DEFAULT_BASE_LOCATION_KEY;
-import static org.apache.polaris.core.entity.IcebergTableLikeEntity.METADATA_LOCATION_KEY;
 import static org.apache.polaris.core.entity.PolarisEntityConstants.PRINCIPAL_CREDENTIAL_ROTATION_REQUIRED_STATE;
+import static org.apache.polaris.core.entity.PolarisEntitySubType.ICEBERG_TABLE;
+import static org.apache.polaris.core.entity.PolarisEntitySubType.ICEBERG_VIEW;
+import static org.apache.polaris.core.entity.table.IcebergTableLikeEntity.METADATA_LOCATION_KEY;
 import static org.apache.polaris.persistence.coretypes.refs.References.catalogReferenceNames;
 import static org.apache.polaris.persistence.coretypes.refs.References.perCatalogReferenceName;
 import static org.apache.polaris.persistence.coretypes.refs.References.realmReferenceNames;
@@ -228,12 +230,12 @@ static <O extends ObjBase, B extends ObjBase.Builder<O, B>> B mapToObj(
                     Optional.ofNullable(properties.remove("data"))
                         .map(TypeMapping::serializeStringCompressed));
               }
-              case ICEBERG_TABLE_LIKE -> {
+              case TABLE_LIKE -> {
                 var tlBuilder = (IcebergTableLikeObj.Builder<?, ?>) null;
                 tlBuilder =
                     switch (subType) {
-                      case TABLE -> IcebergTableObj.builder();
-                      case VIEW -> IcebergViewObj.builder();
+                      case ICEBERG_TABLE -> IcebergTableObj.builder();
+                      case ICEBERG_VIEW -> IcebergViewObj.builder();
                       default ->
                           throw new IllegalArgumentException("Unknown or invalid subtype " + type);
                     };
@@ -285,12 +287,12 @@ static <O extends ObjBase, B extends ObjBase.Builder<O, B>> B mapToObj(
 
   static boolean isCatalogContent(int entityTypeCode) {
     return entityTypeCode == PolarisEntityType.NAMESPACE.getCode()
-        || entityTypeCode == PolarisEntityType.ICEBERG_TABLE_LIKE.getCode();
+        || entityTypeCode == PolarisEntityType.TABLE_LIKE.getCode();
   }
 
   static boolean isCatalogContent(PolarisEntityType entityType) {
     return switch (entityType) {
-      case NAMESPACE, ICEBERG_TABLE_LIKE -> true;
+      case NAMESPACE, TABLE_LIKE -> true;
       default -> false;
     };
   }
@@ -300,10 +302,10 @@ static Class<? extends ObjBase> objTypeForPolarisTypeForFiltering(
     return switch (entityType) {
       case PRINCIPAL -> PrincipalObj.class;
       case TASK -> ImmediateTaskObj.class;
-      case ICEBERG_TABLE_LIKE ->
+      case TABLE_LIKE ->
           switch (subType) {
-            case TABLE -> IcebergTableObj.class;
-            case VIEW -> IcebergViewObj.class;
+            case ICEBERG_TABLE -> IcebergTableObj.class;
+            case ICEBERG_VIEW -> IcebergViewObj.class;
             case ANY_SUBTYPE -> IcebergTableLikeObj.class;
             default -> throw new IllegalArgumentException("Illegal subtype " + subType);
           };
@@ -321,10 +323,10 @@ static ObjType objTypeForPolarisType(PolarisEntityType entityType, PolarisEntity
     return switch (entityType) {
       case PRINCIPAL -> PrincipalObj.TYPE;
       case TASK -> ImmediateTaskObj.TYPE;
-      case ICEBERG_TABLE_LIKE ->
+      case TABLE_LIKE ->
           switch (subType) {
-            case TABLE -> IcebergTableObj.TYPE;
-            case VIEW -> IcebergViewObj.TYPE;
+            case ICEBERG_TABLE -> IcebergTableObj.TYPE;
+            case ICEBERG_VIEW -> IcebergViewObj.TYPE;
             default -> throw new IllegalArgumentException("Illegal subtype " + subType);
           };
       case NAMESPACE -> LocalNamespaceObj.TYPE;
@@ -352,7 +354,7 @@ static Class<? extends ContainerObj> containerTypeForEntityType(
 
       // per catalog
       case CATALOG_ROLE -> CatalogRolesObj.class;
-      case NAMESPACE, ICEBERG_TABLE_LIKE -> CatalogStateObj.class;
+      case NAMESPACE, TABLE_LIKE -> CatalogStateObj.class;
 
       default -> throw new IllegalArgumentException("Unsupported entity type: " + entityType);
     };
@@ -368,7 +370,7 @@ static Class<? extends ContainerObj> containerTypeForEntityType(
 
       // per catalog
       case CATALOG_ROLE -> CatalogRolesObj.builder();
-      case NAMESPACE, ICEBERG_TABLE_LIKE -> CatalogStateObj.builder();
+      case NAMESPACE, TABLE_LIKE -> CatalogStateObj.builder();
 
       default -> throw new IllegalArgumentException("Unsupported entity type: " + entityType);
     };
@@ -389,13 +391,13 @@ static PolarisBaseEntity mapToEntity(@Nonnull ObjBase objBase, long catalogId) {
     switch (objBase) {
       case TableLikeObj o -> {
         catalogMandatory(catalogId);
-        type = PolarisEntityType.ICEBERG_TABLE_LIKE;
+        type = PolarisEntityType.TABLE_LIKE;
         o.metadataLocation().ifPresent(v -> internalProperties.put(METADATA_LOCATION_KEY, v));
         if (objBase instanceof IcebergTableObj) {
-          subType = PolarisEntitySubType.TABLE;
+          subType = ICEBERG_TABLE;
         }
         if (objBase instanceof IcebergViewObj) {
-          subType = PolarisEntitySubType.VIEW;
+          subType = ICEBERG_VIEW;
         }
       }
       case LocalNamespaceObj ignored -> {
@@ -489,12 +491,12 @@ static EntityNameLookupRecord mapToEntityNameLookupRecord(
     switch (objBase) {
       case TableLikeObj ignored -> {
         catalogMandatory(catalogStableId);
-        type = PolarisEntityType.ICEBERG_TABLE_LIKE;
+        type = PolarisEntityType.TABLE_LIKE;
         if (objBase instanceof IcebergTableObj) {
-          subType = PolarisEntitySubType.TABLE;
+          subType = ICEBERG_TABLE;
         }
         if (objBase instanceof IcebergViewObj) {
-          subType = PolarisEntitySubType.VIEW;
+          subType = ICEBERG_VIEW;
         }
       }
       case LocalNamespaceObj ignored -> {
@@ -572,7 +574,7 @@ static String referenceName(PolarisEntityType entityType, long catalogStableId)
       // per catalog
       case CATALOG_ROLE ->
           perCatalogReferenceName(CatalogRolesObj.CATALOG_ROLES_REF_NAME_PATTERN, catalogStableId);
-      case NAMESPACE, ICEBERG_TABLE_LIKE ->
+      case NAMESPACE, TABLE_LIKE ->
           perCatalogReferenceName(CatalogStateObj.CATALOG_STATE_REF_NAME_PATTERN, catalogStableId);
 
       default -> throw new IllegalArgumentException("Unsupported entity type: " + entityType);
@@ -599,10 +601,10 @@ static String entitySubTypeCodeFromObjType(ObjRef objRef) {
     if (objRef != null) {
       var objType = ObjTypes.objTypeById(objRef.type());
       if (objType.equals(IcebergTableObj.TYPE)) {
-        return Integer.toString(PolarisEntitySubType.TABLE.getCode());
+        return Integer.toString(ICEBERG_TABLE.getCode());
       }
       if (objType.equals(IcebergViewObj.TYPE)) {
-        return Integer.toString(PolarisEntitySubType.VIEW.getCode());
+        return Integer.toString(ICEBERG_VIEW.getCode());
       }
     }
     return null;