This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 405779a83 [core] Introduce SYSTEM_TABLE_LOADERS to SystemTableLoader
(#3831)
405779a83 is described below
commit 405779a83e36bfb27af4870a3e710ddbdff729a4
Author: Jingsong Lee <[email protected]>
AuthorDate: Mon Jul 29 19:21:44 2024 +0800
[core] Introduce SYSTEM_TABLE_LOADERS to SystemTableLoader (#3831)
---
.../org/apache/paimon/catalog/AbstractCatalog.java | 2 +-
.../table/system/AggregationFieldsTable.java | 9 +++-
.../apache/paimon/table/system/BranchesTable.java | 4 ++
.../apache/paimon/table/system/ConsumersTable.java | 5 ++
.../apache/paimon/table/system/OptionsTable.java | 5 ++
.../apache/paimon/table/system/SchemasTable.java | 5 ++
.../apache/paimon/table/system/SnapshotsTable.java | 4 ++
.../apache/paimon/table/system/StatisticTable.java | 4 ++
.../paimon/table/system/SystemTableLoader.java | 62 ++++++++++------------
.../org/apache/paimon/table/system/TagsTable.java | 5 ++
10 files changed, 69 insertions(+), 36 deletions(-)
diff --git
a/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalog.java
b/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalog.java
index bdcafe8eb..bccf2a82b 100644
--- a/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalog.java
+++ b/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalog.java
@@ -336,7 +336,7 @@ public abstract class AbstractCatalog implements Catalog {
String type = splits[1];
FileStoreTable originTable =
getDataTable(new Identifier(identifier.getDatabaseName(),
tableName));
- Table table = SystemTableLoader.load(type, fileIO, originTable);
+ Table table = SystemTableLoader.load(type, originTable);
if (table == null) {
throw new TableNotExistException(identifier);
}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/AggregationFieldsTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/AggregationFieldsTable.java
index 0aa17b1b6..48d02c421 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/system/AggregationFieldsTable.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/system/AggregationFieldsTable.java
@@ -28,6 +28,7 @@ import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.SchemaManager;
import org.apache.paimon.schema.TableSchema;
+import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.ReadonlyTable;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.InnerTableRead;
@@ -62,7 +63,7 @@ public class AggregationFieldsTable implements ReadonlyTable {
private static final long serialVersionUID = 1L;
- public static final String AGGREGATION = "aggregation_fields";
+ public static final String AGGREGATION_FIELDS = "aggregation_fields";
public static final RowType TABLE_TYPE =
new RowType(
@@ -77,6 +78,10 @@ public class AggregationFieldsTable implements ReadonlyTable
{
private final FileIO fileIO;
private final Path location;
+ public AggregationFieldsTable(FileStoreTable dataTable) {
+ this(dataTable.fileIO(), dataTable.location());
+ }
+
public AggregationFieldsTable(FileIO fileIO, Path location) {
this.fileIO = fileIO;
this.location = location;
@@ -84,7 +89,7 @@ public class AggregationFieldsTable implements ReadonlyTable {
@Override
public String name() {
- return location.getName() + SYSTEM_TABLE_SPLITTER + AGGREGATION;
+ return location.getName() + SYSTEM_TABLE_SPLITTER + AGGREGATION_FIELDS;
}
@Override
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/BranchesTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/BranchesTable.java
index 025a87396..2e3f5e90a 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/system/BranchesTable.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/system/BranchesTable.java
@@ -78,6 +78,10 @@ public class BranchesTable implements ReadonlyTable {
private final FileIO fileIO;
private final Path location;
+ public BranchesTable(FileStoreTable dataTable) {
+ this(dataTable.fileIO(), dataTable.location());
+ }
+
public BranchesTable(FileIO fileIO, Path location) {
this.fileIO = fileIO;
this.location = location;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/ConsumersTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/ConsumersTable.java
index 05b3382d2..e40f087b4 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/system/ConsumersTable.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/system/ConsumersTable.java
@@ -27,6 +27,7 @@ import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
+import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.ReadonlyTable;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.InnerTableRead;
@@ -71,6 +72,10 @@ public class ConsumersTable implements ReadonlyTable {
private final FileIO fileIO;
private final Path location;
+ public ConsumersTable(FileStoreTable dataTable) {
+ this(dataTable.fileIO(), dataTable.location());
+ }
+
public ConsumersTable(FileIO fileIO, Path location) {
this.fileIO = fileIO;
this.location = location;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java
index 0c8ac2f25..d6eda6959 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java
@@ -27,6 +27,7 @@ import org.apache.paimon.fs.Path;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.SchemaManager;
+import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.ReadonlyTable;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.InnerTableRead;
@@ -69,6 +70,10 @@ public class OptionsTable implements ReadonlyTable {
private final FileIO fileIO;
private final Path location;
+ public OptionsTable(FileStoreTable dataTable) {
+ this(dataTable.fileIO(), dataTable.location());
+ }
+
public OptionsTable(FileIO fileIO, Path location) {
this.fileIO = fileIO;
this.location = location;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
index 2dcbcd2d9..b5f2bf4d5 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java
@@ -29,6 +29,7 @@ import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.SchemaManager;
import org.apache.paimon.schema.TableSchema;
+import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.ReadonlyTable;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.InnerTableRead;
@@ -83,6 +84,10 @@ public class SchemasTable implements ReadonlyTable {
private final FileIO fileIO;
private final Path location;
+ public SchemasTable(FileStoreTable dataTable) {
+ this(dataTable.fileIO(), dataTable.location());
+ }
+
public SchemasTable(FileIO fileIO, Path location) {
this.fileIO = fileIO;
this.location = location;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
index ca7bc925d..90268bd77 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java
@@ -109,6 +109,10 @@ public class SnapshotsTable implements ReadonlyTable {
private final FileStoreTable dataTable;
+ public SnapshotsTable(FileStoreTable dataTable) {
+ this(dataTable.fileIO(), dataTable.location(), dataTable);
+ }
+
public SnapshotsTable(FileIO fileIO, Path location, FileStoreTable
dataTable) {
this.fileIO = fileIO;
this.location = location;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/StatisticTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/StatisticTable.java
index 600c85a6b..70c9fa8da 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/system/StatisticTable.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/system/StatisticTable.java
@@ -79,6 +79,10 @@ public class StatisticTable implements ReadonlyTable {
private final FileStoreTable dataTable;
+ public StatisticTable(FileStoreTable dataTable) {
+ this(dataTable.fileIO(), dataTable.location(), dataTable);
+ }
+
public StatisticTable(FileIO fileIO, Path location, FileStoreTable
dataTable) {
this.fileIO = fileIO;
this.location = location;
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 8dbd53fe9..10e0c587b 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
@@ -25,15 +25,20 @@ import org.apache.paimon.options.Options;
import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.Table;
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableMap;
+
import javax.annotation.Nullable;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
import java.util.function.Supplier;
import static org.apache.paimon.options.CatalogOptions.LINEAGE_META;
-import static
org.apache.paimon.table.system.AggregationFieldsTable.AGGREGATION;
+import static
org.apache.paimon.table.system.AggregationFieldsTable.AGGREGATION_FIELDS;
import static
org.apache.paimon.table.system.AllTableOptionsTable.ALL_TABLE_OPTIONS;
import static org.apache.paimon.table.system.AuditLogTable.AUDIT_LOG;
import static org.apache.paimon.table.system.BranchesTable.BRANCHES;
@@ -55,39 +60,30 @@ import static
org.apache.paimon.utils.Preconditions.checkNotNull;
/** Loader to load system {@link Table}s. */
public class SystemTableLoader {
+ public static final Map<String, Function<FileStoreTable, Table>>
SYSTEM_TABLE_LOADERS =
+ new ImmutableMap.Builder<String, Function<FileStoreTable, Table>>()
+ .put(MANIFESTS, ManifestsTable::new)
+ .put(SNAPSHOTS, SnapshotsTable::new)
+ .put(OPTIONS, OptionsTable::new)
+ .put(SCHEMAS, SchemasTable::new)
+ .put(PARTITIONS, PartitionsTable::new)
+ .put(AUDIT_LOG, AuditLogTable::new)
+ .put(FILES, FilesTable::new)
+ .put(TAGS, TagsTable::new)
+ .put(BRANCHES, BranchesTable::new)
+ .put(CONSUMERS, ConsumersTable::new)
+ .put(READ_OPTIMIZED, ReadOptimizedTable::new)
+ .put(AGGREGATION_FIELDS, AggregationFieldsTable::new)
+ .put(STATISTICS, StatisticTable::new)
+ .build();
+
+ public static final List<String> SYSTEM_TABLES = new
ArrayList<>(SYSTEM_TABLE_LOADERS.keySet());
+
@Nullable
- public static Table load(String type, FileIO fileIO, FileStoreTable
dataTable) {
- Path location = dataTable.location();
- switch (type.toLowerCase()) {
- case MANIFESTS:
- return new ManifestsTable(dataTable);
- case SNAPSHOTS:
- return new SnapshotsTable(fileIO, location, dataTable);
- case OPTIONS:
- return new OptionsTable(fileIO, location);
- case SCHEMAS:
- return new SchemasTable(fileIO, location);
- case PARTITIONS:
- return new PartitionsTable(dataTable);
- case AUDIT_LOG:
- return new AuditLogTable(dataTable);
- case FILES:
- return new FilesTable(dataTable);
- case TAGS:
- return new TagsTable(fileIO, location);
- case BRANCHES:
- return new BranchesTable(fileIO, location);
- case CONSUMERS:
- return new ConsumersTable(fileIO, location);
- case READ_OPTIMIZED:
- return new ReadOptimizedTable(dataTable);
- case AGGREGATION:
- return new AggregationFieldsTable(fileIO, location);
- case STATISTICS:
- return new StatisticTable(fileIO, location, dataTable);
- default:
- return null;
- }
+ public static Table load(String type, FileStoreTable dataTable) {
+ return
Optional.ofNullable(SYSTEM_TABLE_LOADERS.get(type.toLowerCase()))
+ .map(f -> f.apply(dataTable))
+ .orElse(null);
}
@Nullable
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/system/TagsTable.java
b/paimon-core/src/main/java/org/apache/paimon/table/system/TagsTable.java
index 9e311ae15..9fc13c65d 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/system/TagsTable.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/system/TagsTable.java
@@ -27,6 +27,7 @@ import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.reader.RecordReader;
+import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.ReadonlyTable;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.source.InnerTableRead;
@@ -82,6 +83,10 @@ public class TagsTable implements ReadonlyTable {
private final FileIO fileIO;
private final Path location;
+ public TagsTable(FileStoreTable dataTable) {
+ this(dataTable.fileIO(), dataTable.location());
+ }
+
public TagsTable(FileIO fileIO, Path location) {
this.fileIO = fileIO;
this.location = location;
