From b9c72c200b3bda8eb49ba020026704d37966f1ca Mon Sep 17 00:00:00 2001 From: yuzelin Date: Fri, 27 Dec 2024 11:15:58 +0800 Subject: [PATCH] fix --- docs/content/concepts/system-tables.md | 4 ++-- .../paimon/table/system/SystemTableLoader.java | 4 ++-- ...{IndexesTable.java => TableIndexesTable.java} | 16 ++++++++-------- .../apache/paimon/flink/SystemTableITCase.java | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) rename paimon-core/src/main/java/org/apache/paimon/table/system/{IndexesTable.java => TableIndexesTable.java} (94%) diff --git a/docs/content/concepts/system-tables.md b/docs/content/concepts/system-tables.md index 47ba39fd4163..92119874e266 100644 --- a/docs/content/concepts/system-tables.md +++ b/docs/content/concepts/system-tables.md @@ -389,13 +389,13 @@ SELECT * FROM T$statistics; */ ``` -### Indexes Table +### Table Indexes Table You can query the table's index files generated for dynamic bucket table (index_type = HASH) and deletion vectors (index_type = DELETION_VECTORS) through indexes table. ```sql -SELECT * FROM my_table$indexes; +SELECT * FROM my_table$table_indexes; /* +--------------------------------+-------------+--------------------------------+--------------------------------+----------------------+----------------------+--------------------------------+ diff --git a/paimon-core/src/main/java/org/apache/paimon/table/system/SystemTableLoader.java b/paimon-core/src/main/java/org/apache/paimon/table/system/SystemTableLoader.java index 8e5f8c38c85a..57c3c2caacac 100644 --- a/paimon-core/src/main/java/org/apache/paimon/table/system/SystemTableLoader.java +++ b/paimon-core/src/main/java/org/apache/paimon/table/system/SystemTableLoader.java @@ -41,7 +41,6 @@ import static org.apache.paimon.table.system.CatalogOptionsTable.CATALOG_OPTIONS; import static org.apache.paimon.table.system.ConsumersTable.CONSUMERS; import static org.apache.paimon.table.system.FilesTable.FILES; -import static org.apache.paimon.table.system.IndexesTable.INDEXES; import static org.apache.paimon.table.system.ManifestsTable.MANIFESTS; import static org.apache.paimon.table.system.OptionsTable.OPTIONS; import static org.apache.paimon.table.system.PartitionsTable.PARTITIONS; @@ -49,6 +48,7 @@ import static org.apache.paimon.table.system.SchemasTable.SCHEMAS; import static org.apache.paimon.table.system.SnapshotsTable.SNAPSHOTS; import static org.apache.paimon.table.system.StatisticTable.STATISTICS; +import static org.apache.paimon.table.system.TableIndexesTable.TABLE_INDEXES; import static org.apache.paimon.table.system.TagsTable.TAGS; /** Loader to load system {@link Table}s. */ @@ -71,7 +71,7 @@ public class SystemTableLoader { .put(AGGREGATION_FIELDS, AggregationFieldsTable::new) .put(STATISTICS, StatisticTable::new) .put(BINLOG, BinlogTable::new) - .put(INDEXES, IndexesTable::new) + .put(TABLE_INDEXES, TableIndexesTable::new) .build(); public static final List SYSTEM_TABLES = new ArrayList<>(SYSTEM_TABLE_LOADERS.keySet()); diff --git a/paimon-core/src/main/java/org/apache/paimon/table/system/IndexesTable.java b/paimon-core/src/main/java/org/apache/paimon/table/system/TableIndexesTable.java similarity index 94% rename from paimon-core/src/main/java/org/apache/paimon/table/system/IndexesTable.java rename to paimon-core/src/main/java/org/apache/paimon/table/system/TableIndexesTable.java index e890538580b6..08731e768a93 100644 --- a/paimon-core/src/main/java/org/apache/paimon/table/system/IndexesTable.java +++ b/paimon-core/src/main/java/org/apache/paimon/table/system/TableIndexesTable.java @@ -64,12 +64,12 @@ import static org.apache.paimon.catalog.Catalog.SYSTEM_TABLE_SPLITTER; import static org.apache.paimon.utils.SerializationUtils.newStringType; -/** A {@link Table} for showing committing snapshots of table. */ -public class IndexesTable implements ReadonlyTable { +/** A {@link Table} for showing indexes. */ +public class TableIndexesTable implements ReadonlyTable { - private static final Logger LOG = LoggerFactory.getLogger(IndexesTable.class); + private static final Logger LOG = LoggerFactory.getLogger(TableIndexesTable.class); - public static final String INDEXES = "indexes"; + public static final String TABLE_INDEXES = "table_indexes"; public static final RowType TABLE_TYPE = new RowType( @@ -87,7 +87,7 @@ public class IndexesTable implements ReadonlyTable { private final FileStoreTable dataTable; - public IndexesTable(FileStoreTable dataTable) { + public TableIndexesTable(FileStoreTable dataTable) { this.dataTable = dataTable; } @@ -103,7 +103,7 @@ public InnerTableRead newRead() { @Override public String name() { - return dataTable.name() + SYSTEM_TABLE_SPLITTER + INDEXES; + return dataTable.name() + SYSTEM_TABLE_SPLITTER + TABLE_INDEXES; } @Override @@ -118,7 +118,7 @@ public List primaryKeys() { @Override public Table copy(Map dynamicOptions) { - return new IndexesTable(dataTable.copy(dynamicOptions)); + return new TableIndexesTable(dataTable.copy(dynamicOptions)); } private static class IndexesScan extends ReadOnceTableScan { @@ -194,7 +194,7 @@ public RecordReader createReader(Split split) { Iterators.transform( rows, row -> - ProjectedRow.from(readType, IndexesTable.TABLE_TYPE) + ProjectedRow.from(readType, TableIndexesTable.TABLE_TYPE) .replaceRow(row)); } return new IteratorRecordReader<>(rows); diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/SystemTableITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/SystemTableITCase.java index 37114edbe152..98ec635e85f7 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/SystemTableITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/SystemTableITCase.java @@ -73,7 +73,7 @@ public void testIndexesTable() { "INSERT INTO T VALUES ('2024-10-01', 1, 'aaaaaaaaaaaaaaaaaaa'), ('2024-10-01', 2, 'b'), ('2024-10-01', 3, 'c')"); sql("INSERT INTO T VALUES ('2024-10-01', 1, 'a_new1'), ('2024-10-01', 3, 'c_new1')"); - List rows = sql("SELECT * FROM `T$indexes` WHERE index_type = 'HASH'"); + List rows = sql("SELECT * FROM `T$table_indexes` WHERE index_type = 'HASH'"); assertThat(rows.size()).isEqualTo(1); Row row = rows.get(0); assertThat(row.getField(0)).isEqualTo("[2024-10-01]"); @@ -84,7 +84,7 @@ public void testIndexesTable() { assertThat(row.getField(5)).isEqualTo(3L); assertThat(row.getField(6)).isNull(); - rows = sql("SELECT * FROM `T$indexes` WHERE index_type = 'DELETION_VECTORS'"); + rows = sql("SELECT * FROM `T$table_indexes` WHERE index_type = 'DELETION_VECTORS'"); assertThat(rows.size()).isEqualTo(1); row = rows.get(0); assertThat(row.getField(0)).isEqualTo("[2024-10-01]");