fix

apache · Feb 27, 2025 · 08f5d42 · 08f5d42
1 parent 7d6acb9
commit 08f5d42
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 17 deletions.
diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/CatalogMetaMapper.java b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/CatalogMetaMapper.java
@@ -45,11 +45,15 @@ public interface CatalogMetaMapper {
 
   @SelectProvider(
       type = CatalogMetaSQLProviderFactory.class,
-      method = "listCatalogPOsByCatalogName")
-  List<CatalogPO> listCatalogPOsByCatalogName(@Param("catalogName") String catalogName);
-
-  @SelectProvider(type = CatalogMetaSQLProviderFactory.class, method = "listCatalogPOsBySchemaName")
-  List<CatalogPO> listCatalogPOsBySchemaName(@Param("schemaName") String schemaName);
+      method = "listCatalogPOsByMetalakeAndCatalogName")
+  List<CatalogPO> listCatalogPOsByMetalakeAndCatalogName(
+      @Param("metalakeName") String metalakeName, @Param("catalogName") String catalogName);
+
+  @SelectProvider(type = CatalogMetaSQLProviderFactory.class, method = "listCatalogPOs")
+  List<CatalogPO> listCatalogPOs(
+      @Param("metalakeName") String metalakeName,
+      @Param("catalogName") String catalogName,
+      @Param("schemaName") String schemaName);
 
   @SelectProvider(type = CatalogMetaSQLProviderFactory.class, method = "listCatalogPOsByMetalakeId")
   List<CatalogPO> listCatalogPOsByMetalakeId(@Param("metalakeId") Long metalakeId);

diff --git a/...in/java/org/apache/gravitino/storage/relational/mapper/CatalogMetaSQLProviderFactory.java b/...in/java/org/apache/gravitino/storage/relational/mapper/CatalogMetaSQLProviderFactory.java
@@ -57,12 +57,16 @@ public static String listCatalogPOsByMetalakeName(@Param("metalakeName") String
     return getProvider().listCatalogPOsByMetalakeName(metalakeName);
   }
 
-  public static String listCatalogPOsByCatalogName(@Param("catalogName") String catalogName) {
-    return getProvider().listCatalogPOsByCatalogName(catalogName);
+  public static String listCatalogPOsByMetalakeAndCatalogName(
+      @Param("metalakeName") String metalakeName, @Param("catalogName") String catalogName) {
+    return getProvider().listCatalogPOsByMetalakeAndCatalogName(metalakeName, catalogName);
   }
 
-  public static String listCatalogPOsBySchemaName(@Param("schemaName") String schemaName) {
-    return getProvider().listCatalogPOsBySchemaName(schemaName);
+  public static String listCatalogPOs(
+      @Param("metalakeName") String metalakeName,
+      @Param("catalogName") String catalogName,
+      @Param("schemaName") String schemaName) {
+    return getProvider().listCatalogPOs(metalakeName, catalogName, schemaName);
   }
 
   public static String listCatalogPOsByMetalakeId(@Param("metalakeId") Long metalakeId) {

diff --git a/.../apache/gravitino/storage/relational/mapper/provider/base/CatalogMetaBaseSQLProvider.java b/.../apache/gravitino/storage/relational/mapper/provider/base/CatalogMetaBaseSQLProvider.java
@@ -43,7 +43,8 @@ public String listCatalogPOsByMetalakeName(@Param("metalakeName") String metalak
         + " AND mm.deleted_at = 0 AND cm.deleted_at = 0";
   }
 
-  public String listCatalogPOsByCatalogName(@Param("catalogName") String catalogName) {
+  public String listCatalogPOsByMetalakeAndCatalogName(
+      @Param("metalakeName") String metalakeName, @Param("catalogName") String catalogName) {
     return "SELECT cm.catalog_id as catalogId, cm.catalog_name as catalogName,"
         + " cm.metalake_id as metalakeId, cm.type, cm.provider,"
         + " cm.catalog_comment as catalogComment, cm.properties, cm.audit_info as auditInfo,"
@@ -54,11 +55,15 @@ public String listCatalogPOsByCatalogName(@Param("catalogName") String catalogNa
         + " cm JOIN "
         + MetalakeMetaMapper.TABLE_NAME
         + " mm ON cm.metalake_id = mm.metalake_id"
-        + "  WHERE cm.catalog_name = #{catalogName}"
+        + " WHERE mm.metalake_name = #{metalakeName}"
+        + " AND cm.catalog_name = #{catalogName}"
         + " AND mm.deleted_at = 0 AND cm.deleted_at = 0";
   }
 
-  public String listCatalogPOsBySchemaName(@Param("schemaName") String schemaName) {
+  public String listCatalogPOs(
+      @Param("metalakeName") String metalakeName,
+      @Param("catalogName") String catalogName,
+      @Param("schemaName") String schemaName) {
     return "SELECT cm.catalog_id as catalogId, cm.catalog_name as catalogName,"
         + " cm.metalake_id as metalakeId, cm.type, cm.provider,"
         + " cm.catalog_comment as catalogComment, cm.properties, cm.audit_info as auditInfo,"
@@ -68,9 +73,14 @@ public String listCatalogPOsBySchemaName(@Param("schemaName") String schemaName)
         + TABLE_NAME
         + " cm JOIN "
         + SchemaMetaMapper.TABLE_NAME
-        + " mm ON cm.metalake_id = sm.metalake_id"
-        + " WHERE sm.schema_name = #{schemaName}"
-        + " AND cm.deleted_at = 0 AND sm.deleted_at = 0";
+        + " sm ON cm.catalog_id = sm.catalog_id"
+        + " JOIN "
+        + MetalakeMetaMapper.TABLE_NAME
+        + " mm ON cm.metalake_id = mm.metalake_id"
+        + " WHERE mm.metalakeName = #{metalakeName}"
+        + " AND cm.catalog_name = #{catalogName}"
+        + " AND sm.schema_name = #{schemaName}"
+        + " AND cm.deleted_at = 0 AND sm.deleted_at = 0 AND mm.deleted_at = 0";
   }
 
   public String listCatalogPOsByMetalakeId(@Param("metalakeId") Long metalakeId) {

diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/CatalogMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/CatalogMetaService.java
@@ -131,14 +131,18 @@ public List<CatalogEntity> listCatalogsByNamespace(Namespace namespace) {
       catalogPOS =
           SessionUtils.getWithoutCommit(
               CatalogMetaMapper.class,
-              mapper -> mapper.listCatalogPOsByCatalogName(namespace.level(1)));
+              mapper ->
+                  mapper.listCatalogPOsByMetalakeAndCatalogName(
+                      namespace.level(0), namespace.level(1)));
     }
 
     if (namespace.levels().length >= 3) {
       catalogPOS =
           SessionUtils.getWithoutCommit(
               CatalogMetaMapper.class,
-              mapper -> mapper.listCatalogPOsBySchemaName(namespace.level(2)));
+              mapper ->
+                  mapper.listCatalogPOs(
+                      namespace.level(0), namespace.level(1), namespace.level(2)));
     }
 
     return POConverters.fromCatalogPOs(catalogPOS, namespace);