[Refactor] add getCatalogDbName and getCatalogTableName in Table (backport #53072)

fe/fe-core/src/main/java/com/starrocks/catalog/DeltaLakeTable.java

@@ -71,6 +71,7 @@ public boolean isSupported() {
         return true;
     }
 
+    @Override
     public String getTableLocation() {
         return tableLocation;
     }
@@ -92,11 +93,13 @@ public String getCatalogName() {
         return catalogName;
     }
 
-    public String getDbName() {
+    @Override
+    public String getCatalogDBName() {
         return dbName;
     }
 
-    public String getTableName() {
+    @Override
+    public String getCatalogTableName() {
         return tableName;
     }
 

fe/fe-core/src/main/java/com/starrocks/catalog/FileTable.java

@@ -99,6 +99,7 @@ private void validate(Map<String, String> properties) throws DdlException {
         fileProperties.put(AzureCloudConfigurationProvider.AZURE_PATH_KEY, path);
     }
 
+    @Override
     public String getTableLocation() {
         return fileProperties.get(JSON_KEY_FILE_PATH);
     }

fe/fe-core/src/main/java/com/starrocks/catalog/HiveTable.java

@@ -76,7 +76,7 @@
 import static com.starrocks.server.CatalogMgr.ResourceMappingCatalog.getResourceMappingCatalogName;
 import static com.starrocks.server.CatalogMgr.ResourceMappingCatalog.isResourceMappingCatalog;
 
-public class HiveTable extends Table implements HiveMetaStoreTable {
+public class HiveTable extends Table {
     public enum HiveTableType {
         VIRTUAL_VIEW,
         EXTERNAL_TABLE,
@@ -176,12 +176,13 @@ public String getCatalogName() {
         return catalogName == null ? getResourceMappingCatalogName(resourceName, "hive") : catalogName;
     }
 
-    public String getDbName() {
+    @Override
+    public String getCatalogDBName() {
         return hiveDbName;
     }
 
     @Override
-    public String getTableName() {
+    public String getCatalogTableName() {
         return hiveTableName;
     }
 
@@ -210,6 +211,7 @@ public List<String> getPartitionColumnNames() {
         return partColumnNames;
     }
 
+    @Override
     public List<String> getDataColumnNames() {
         return dataColumnNames;
     }
@@ -219,6 +221,7 @@ public boolean isUnPartitioned() {
         return partColumnNames.size() == 0;
     }
 
+    @Override
     public String getTableLocation() {
         return this.tableLocation;
     }

fe/fe-core/src/main/java/com/starrocks/catalog/HudiTable.java

@@ -57,7 +57,7 @@
  * Currently, we depend on Hive metastore to obtain table/partition path and statistics.
  * This logic should be decoupled from metastore when the related interfaces are ready.
  */
-public class HudiTable extends Table implements HiveMetaStoreTable {
+public class HudiTable extends Table {
     private static final Logger LOG = LogManager.getLogger(HudiTable.class);
 
     private static final String JSON_KEY_HUDI_DB = "database";
@@ -124,10 +124,12 @@ public HudiTable(long id, String name, String catalogName, String hiveDbName, St
         this.tableType = type;
     }
 
-    public String getDbName() {
+    @Override
+    public String getCatalogDBName() {
         return hiveDbName;
     }
 
+    @Override
     public String getResourceName() {
         return resourceName;
     }
@@ -141,6 +143,7 @@ public HoodieTableType getTableType() {
         return HoodieTableType.valueOf(hudiProperties.get(HUDI_TABLE_TYPE));
     }
 
+    @Override
     public String getTableLocation() {
         return hudiProperties.get(HUDI_BASE_PATH);
     }
@@ -150,7 +153,7 @@ public String getHudiInputFormat() {
     }
 
     @Override
-    public String getTableName() {
+    public String getCatalogTableName() {
         return hiveTableName;
     }
 
@@ -175,6 +178,7 @@ public List<String> getPartitionColumnNames() {
         return partColumnNames;
     }
 
+    @Override
     public List<String> getDataColumnNames() {
         return dataColumnNames;
     }

fe/fe-core/src/main/java/com/starrocks/catalog/IcebergTable.java

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 package com.starrocks.catalog;
 
 import com.google.common.base.Joiner;
@@ -85,7 +84,6 @@ public class IcebergTable extends Table {
 
     private final AtomicLong partitionIdGen = new AtomicLong(0L);
 
-
     public IcebergTable() {
         super(TableType.ICEBERG);
     }
@@ -98,7 +96,7 @@ public IcebergTable(long id, String srTableName, String catalogName, String reso
         this.resourceName = resourceName;
         this.remoteDbName = remoteDbName;
         this.remoteTableName = remoteTableName;
-        this.comment =  comment;
+        this.comment = comment;
         this.nativeTable = nativeTable;
         this.icebergProperties = icebergProperties;
     }
@@ -108,15 +106,18 @@ public String getCatalogName() {
         return catalogName == null ? getResourceMappingCatalogName(resourceName, "iceberg") : catalogName;
     }
 
+    @Override
     public String getResourceName() {
         return resourceName;
     }
 
-    public String getRemoteDbName() {
+    @Override
+    public String getCatalogDBName() {
         return remoteDbName;
     }
 
-    public String getRemoteTableName() {
+    @Override
+    public String getCatalogTableName() {
         return remoteTableName;
     }
 
@@ -141,6 +142,7 @@ public List<Column> getPartitionColumns() {
         }
         return partitionColumns;
     }
+
     public List<Column> getPartitionColumnsIncludeTransformed() {
         List<Column> allPartitionColumns = new ArrayList<>();
         for (PartitionField field : getNativeTable().spec().fields()) {
@@ -429,7 +431,6 @@ public Builder setCatalogName(String catalogName) {
             return this;
         }
 
-
         public Builder setComment(String comment) {
             this.comment = comment;
             return this;

fe/fe-core/src/main/java/com/starrocks/catalog/JDBCTable.java

@@ -82,6 +82,7 @@ public JDBCTable(long id, String name, List<Column> schema, List<Column> partiti
         validate(properties);
     }
 
+    @Override
     public String getResourceName() {
         return resourceName;
     }
@@ -91,7 +92,8 @@ public String getCatalogName() {
         return catalogName;
     }
 
-    public String getDbName() {
+    @Override
+    public String getCatalogDBName() {
         return dbName;
     }
 

fe/fe-core/src/main/java/com/starrocks/catalog/KuduTable.java

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 package com.starrocks.catalog;
 
 import com.google.common.collect.Sets;
@@ -33,7 +32,6 @@
 
 import static com.starrocks.connector.ConnectorTableId.CONNECTOR_ID_GENERATOR;
 
-
 public class KuduTable extends Table {
     private static final Logger LOG = LogManager.getLogger(KuduTable.class);
     public static final Set<String> KUDU_INPUT_FORMATS = Sets.newHashSet(
@@ -73,18 +71,22 @@ public static KuduTable fromMetastoreTable(org.apache.hadoop.hive.metastore.api.
     public String getMasterAddresses() {
         return masterAddresses;
     }
+
     @Override
     public String getCatalogName() {
         return catalogName;
     }
 
-    public String getDbName() {
+    @Override
+    public String getCatalogDBName() {
         return databaseName;
     }
 
-    public String getTableName() {
+    @Override
+    public String getCatalogTableName() {
         return tableName;
     }
+
     public Optional<String> getKuduTableName() {
         return kuduTableName;
     }

fe/fe-core/src/main/java/com/starrocks/catalog/OdpsTable.java

@@ -31,7 +31,7 @@
 
 import static com.starrocks.connector.ConnectorTableId.CONNECTOR_ID_GENERATOR;
 
-public class OdpsTable extends Table implements HiveMetaStoreTable {
+public class OdpsTable extends Table {
     private static final Logger LOG = LogManager.getLogger(OdpsTable.class);
     public static final String PARTITION_NULL_VALUE = "null";
 
@@ -74,12 +74,12 @@ public String getCatalogName() {
     }
 
     @Override
-    public String getDbName() {
+    public String getCatalogDBName() {
         return dbName;
     }
 
     @Override
-    public String getTableName() {
+    public String getCatalogTableName() {
         return tableName;
     }
 
@@ -123,7 +123,7 @@ public String getUUID() {
     @Override
     public TTableDescriptor toThrift(List<DescriptorTable.ReferencedPartitionInfo> partitions) {
         TTableDescriptor tTableDescriptor = new TTableDescriptor(getId(), TTableType.ODPS_TABLE,
-                fullSchema.size(), 0, getName(), getDbName());
+                fullSchema.size(), 0, getName(), getCatalogDBName());
         THdfsTable hdfsTable = new THdfsTable();
         hdfsTable.setColumns(getColumns().stream().map(Column::toThrift).collect(Collectors.toList()));
         // for be, partition column is equals to data column

fe/fe-core/src/main/java/com/starrocks/catalog/PaimonTable.java

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 package com.starrocks.catalog;
 
 import com.starrocks.analysis.DescriptorTable;
@@ -33,7 +32,6 @@
 
 import static com.starrocks.connector.ConnectorTableId.CONNECTOR_ID_GENERATOR;
 
-
 public class PaimonTable extends Table {
     private String catalogName;
     private String databaseName;
@@ -66,11 +64,13 @@ public String getCatalogName() {
         return catalogName;
     }
 
-    public String getDbName() {
+    @Override
+    public String getCatalogDBName() {
         return databaseName;
     }
 
-    public String getTableName() {
+    @Override
+    public String getCatalogTableName() {
         return tableName;
     }