Skip to content

Commit 5a939c5

Browse files
committed
refactor: remove unused code about COLUMN metadata object
1 parent 93e5ecc commit 5a939c5

File tree

4 files changed

+0
-72
lines changed

4 files changed

+0
-72
lines changed

core/src/main/java/org/apache/gravitino/storage/relational/mapper/TableColumnMapper.java

-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ public interface TableColumnMapper {
3636
List<ColumnPO> listColumnPOsByTableIdAndVersion(
3737
@Param("tableId") Long tableId, @Param("tableVersion") Long tableVersion);
3838

39-
@SelectProvider(type = TableColumnSQLProviderFactory.class, method = "listColumnPOsByColumnIds")
40-
List<ColumnPO> listColumnPOsByColumnIds(@Param("columnIds") List<Long> columnIds);
41-
4239
@InsertProvider(type = TableColumnSQLProviderFactory.class, method = "insertColumnPOs")
4340
void insertColumnPOs(@Param("columnPOs") List<ColumnPO> columnPOs);
4441

core/src/main/java/org/apache/gravitino/storage/relational/mapper/TableColumnSQLProviderFactory.java

-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ public static String listColumnPOsByTableIdAndVersion(
5757
return getProvider().listColumnPOsByTableIdAndVersion(tableId, tableVersion);
5858
}
5959

60-
public static String listColumnPOsByColumnIds(@Param("columnIds") List<Long> columnIds) {
61-
return getProvider().listColumnPOsByColumnIds(columnIds);
62-
}
63-
6460
public static String insertColumnPOs(@Param("columnPOs") List<ColumnPO> columnPOs) {
6561
return getProvider().insertColumnPOs(columnPOs);
6662
}

core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/base/TableColumnBaseSQLProvider.java

-22
Original file line numberDiff line numberDiff line change
@@ -47,28 +47,6 @@ public String listColumnPOsByTableIdAndVersion(
4747
+ " ON t1.column_id = t2.column_id AND t1.table_version = t2.max_table_version";
4848
}
4949

50-
public String listColumnPOsByColumnIds(@Param("columnIds") List<Long> columnIds) {
51-
return "<script>"
52-
+ " SELECT column_id AS columnId, column_name AS columnName,"
53-
+ " column_position AS columnPosition,"
54-
+ " metalake_id AS metalakeId, catalog_id AS catalogId,"
55-
+ " schema_id AS schemaId, table_id AS tableId,"
56-
+ " table_version AS tableVersion, column_type AS columnType,"
57-
+ " column_comment AS columnComment, column_nullable AS nullable,"
58-
+ " column_auto_increment AS autoIncrement,"
59-
+ " column_default_value AS defaultValue, column_op_type AS columnOpType,"
60-
+ " deleted_at AS deletedAt, audit_info AS auditInfo"
61-
+ " FROM "
62-
+ TableColumnMapper.COLUMN_TABLE_NAME
63-
+ " WHERE deleted_at = 0"
64-
+ " AND column_id in ("
65-
+ "<foreach collection='columnIds' item='columnId' separator=','>"
66-
+ "#{columnId}"
67-
+ "</foreach>"
68-
+ ") "
69-
+ "</script>";
70-
}
71-
7250
public String insertColumnPOs(@Param("columnPOs") List<ColumnPO> columnPOs) {
7351
return "<script>"
7452
+ "INSERT INTO "

core/src/main/java/org/apache/gravitino/storage/relational/service/MetadataObjectService.java

-43
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.gravitino.storage.relational.mapper.MetalakeMetaMapper;
3232
import org.apache.gravitino.storage.relational.mapper.ModelMetaMapper;
3333
import org.apache.gravitino.storage.relational.mapper.SchemaMetaMapper;
34-
import org.apache.gravitino.storage.relational.mapper.TableColumnMapper;
3534
import org.apache.gravitino.storage.relational.mapper.TableMetaMapper;
3635
import org.apache.gravitino.storage.relational.mapper.TopicMetaMapper;
3736
import org.apache.gravitino.storage.relational.po.CatalogPO;
@@ -432,48 +431,6 @@ public static Map<Long, String> getTopicObjectsFullName(List<Long> topicIds) {
432431
return topicIdAndNameMap;
433432
}
434433

435-
/**
436-
* Retrieves a map of Column object IDs to their full names.
437-
*
438-
* @param columnIds A list of Column object IDs to fetch names for.
439-
* @return A Map where the key is the Column ID and the value is the Column full name. The map may
440-
* contain null values for the names if its parent object is deleted. Returns an empty map if
441-
* no Column objects are found for the given IDs. {@code @example} value of column full name:
442-
* "catalog1.schema1.table1.column1"
443-
*/
444-
public static Map<Long, String> getColumnObjectsFullName(List<Long> columnIds) {
445-
List<ColumnPO> columnPOs =
446-
SessionUtils.getWithoutCommit(
447-
TableColumnMapper.class, mapper -> mapper.listColumnPOsByColumnIds(columnIds));
448-
449-
if (columnPOs == null || columnPOs.isEmpty()) {
450-
return new HashMap<>();
451-
}
452-
453-
List<Long> tableIds = columnPOs.stream().map(ColumnPO::getTableId).collect(Collectors.toList());
454-
455-
Map<Long, String> tableIdAndNameMap = getTableObjectsFullName(tableIds);
456-
457-
HashMap<Long, String> columnIdAndNameMap = new HashMap<>();
458-
459-
columnPOs.forEach(
460-
columnPO -> {
461-
// since the table can be deleted, we need to check the
462-
// null value, and when table is deleted, we will set fullName of columnPO to null
463-
String tableName = tableIdAndNameMap.getOrDefault(columnPO.getTableId(), null);
464-
if (tableName == null) {
465-
LOG.warn("The table of column {} may be deleted", columnPO.getColumnId());
466-
columnIdAndNameMap.put(columnPO.getColumnId(), null);
467-
return;
468-
}
469-
470-
String fullName = DOT_JOINER.join(tableName, columnPO.getColumnName());
471-
columnIdAndNameMap.put(columnPO.getColumnId(), fullName);
472-
});
473-
474-
return columnIdAndNameMap;
475-
}
476-
477434
/**
478435
* Retrieves a map of Catalog object IDs to their full names.
479436
*

0 commit comments

Comments
 (0)