Skip to content

refactor(core): make SchemaManager an interface #9174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baiyangtx wants to merge 4 commits into
base: master
Choose a base branch
from
Open

refactor(core): make SchemaManager an interface #9174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa0d189
[core] Make SchemaManager an interface
Aug 11, 2026
bb4d9f3
[iceberg] Fix import order in metadata committer test
Aug 11, 2026
aa6d9ba
[iceberg] Fix formatting in metadata committer test
Aug 11, 2026
3c701f8
Merge remote-tracking branch 'apache/master' into zhangyongxiang.alph…
Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...cro-benchmarks/src/test/java/org/apache/paimon/benchmark/ManifestFileSorterBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.apache.paimon.manifest.ManifestFileMeta;
import org.apache.paimon.operation.ManifestFileMerger;
import org.apache.paimon.options.Options;
import org.apache.paimon.schema.SchemaManager;
import org.apache.paimon.schema.FileSystemSchemaManager;
import org.apache.paimon.stats.SimpleStats;
import org.apache.paimon.types.IntType;
import org.apache.paimon.types.RowType;
Expand Down Expand Up @@ -294,7 +294,7 @@ private ManifestFile createManifestFile() {
null);
return new ManifestFile.Factory(
fileIO,
new SchemaManager(fileIO, tablePath),
new FileSystemSchemaManager(fileIO, tablePath),
PARTITION_TYPE,
FileFormat.fromIdentifier("avro", new Options()),
"zstd",
Expand Down
6 changes: 4 additions & 2 deletions paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.paimon.partition.Partition;
import org.apache.paimon.partition.PartitionStatistics;
import org.apache.paimon.rest.responses.GetTagResponse;
import org.apache.paimon.schema.FileSystemSchemaManager;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaChange;
import org.apache.paimon.schema.SchemaManager;
Expand Down Expand Up @@ -886,7 +887,8 @@ protected List<String> listTablesInFileSystem(Path databasePath) throws IOExcept
}

protected boolean tableExistsInFileSystem(Path tablePath, String branchName) {
SchemaManager schemaManager = new SchemaManager(fileIO(tablePath), tablePath, branchName);
SchemaManager schemaManager =
new FileSystemSchemaManager(fileIO(tablePath), tablePath, branchName);

// in order to improve the performance, check the schema-0 firstly.
boolean schemaZeroExists = schemaManager.schemaExists(0);
Expand All @@ -900,7 +902,7 @@ protected boolean tableExistsInFileSystem(Path tablePath, String branchName) {

public Optional<TableSchema> tableSchemaInFileSystem(Path tablePath, String branchName) {
Optional<TableSchema> schema =
new SchemaManager(fileIO(tablePath), tablePath, branchName).latest();
new FileSystemSchemaManager(fileIO(tablePath), tablePath, branchName).latest();
if (!DEFAULT_MAIN_BRANCH.equals(branchName)) {
schema =
schema.map(
Expand Down
3 changes: 2 additions & 1 deletion paimon-core/src/main/java/org/apache/paimon/catalog/FileSystemCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.operation.Lock;
import org.apache.paimon.schema.FileSystemSchemaManager;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaChange;
import org.apache.paimon.schema.SchemaManager;
Expand Down Expand Up @@ -151,7 +152,7 @@ public <T> T runWithLock(Identifier identifier, Callable<T> callable) throws Exc

private SchemaManager schemaManager(Identifier identifier) {
Path path = getTableLocation(identifier);
return new SchemaManager(fileIO, path, identifier.getBranchNameOrDefault());
return new FileSystemSchemaManager(fileIO, path, identifier.getBranchNameOrDefault());
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion paimon-core/src/main/java/org/apache/paimon/iceberg/IcebergCommitCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.apache.paimon.manifest.ManifestEntry;
import org.apache.paimon.options.Options;
import org.apache.paimon.partition.PartitionPredicate;
import org.apache.paimon.schema.FileSystemSchemaManager;
import org.apache.paimon.schema.SchemaManager;
import org.apache.paimon.schema.TableSchema;
import org.apache.paimon.table.FileStoreTable;
Expand Down Expand Up @@ -1957,7 +1958,7 @@ private boolean isSameFormatVersion(int baseFormatVersion) {

private class SchemaCache {

SchemaManager schemaManager = new SchemaManager(table.fileIO(), table.location());
SchemaManager schemaManager = new FileSystemSchemaManager(table.fileIO(), table.location());
Map<Long, IcebergSchema> schemas = new HashMap<>();

private IcebergSchema get(long schemaId) {
Expand Down
4 changes: 3 additions & 1 deletion paimon-core/src/main/java/org/apache/paimon/index/FileIndexProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.paimon.manifest.ManifestEntry;
import org.apache.paimon.options.Options;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.FileSystemSchemaManager;
import org.apache.paimon.schema.SchemaManager;
import org.apache.paimon.schema.TableSchema;
import org.apache.paimon.table.FileStoreTable;
Expand Down Expand Up @@ -75,7 +76,8 @@ public FileIndexProcessor(FileStoreTable table) {
this.pathFactory = table.store().pathFactory();
this.pathFactories = new DataFilePathFactories(pathFactory);
this.schemaInfoCache =
new SchemaCache(fileIndexOptions, new SchemaManager(fileIO, table.location()));
new SchemaCache(
fileIndexOptions, new FileSystemSchemaManager(fileIO, table.location()));
this.sizeInMeta = table.coreOptions().fileIndexInManifestThreshold();
}

Expand Down
5 changes: 3 additions & 2 deletions paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.paimon.operation.Lock;
import org.apache.paimon.options.CatalogOptions;
import org.apache.paimon.options.Options;
import org.apache.paimon.schema.FileSystemSchemaManager;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaChange;
import org.apache.paimon.schema.SchemaManager;
Expand Down Expand Up @@ -668,7 +669,7 @@ protected void renameTableImpl(Identifier fromTable, Identifier toTable) {
}

Path fromPath = getTableLocation(fromTable);
if (!new SchemaManager(fileIO, fromPath).listAllIds().isEmpty()) {
if (!new FileSystemSchemaManager(fileIO, fromPath).listAllIds().isEmpty()) {
// Rename the file system's table directory. Maintain consistency between tables in
// the file system and tables in the Hive Metastore.
Path toPath = getTableLocation(toTable);
Expand Down Expand Up @@ -975,7 +976,7 @@ private Map<String, String> collectTableProperties(TableSchema tableSchema) {
}

private SchemaManager getSchemaManager(Identifier identifier) {
return new SchemaManager(fileIO, getTableLocation(identifier));
return new FileSystemSchemaManager(fileIO, getTableLocation(identifier));
}

private Map<String, String> fetchProperties(String databaseName) {
Expand Down
3 changes: 2 additions & 1 deletion paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import org.apache.paimon.rest.responses.GetTableResponse;
import org.apache.paimon.rest.responses.GetTagResponse;
import org.apache.paimon.rest.responses.GetViewResponse;
import org.apache.paimon.schema.FileSystemSchemaManager;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaChange;
import org.apache.paimon.schema.SchemaManager;
Expand Down Expand Up @@ -1411,7 +1412,7 @@ private Schema inferSchemaIfExternalPaimonTable(Schema schema) throws Exception
if (TableType.TABLE.equals(tableType) && Objects.nonNull(externalLocation)) {
Path externalPath = new Path(externalLocation);
SchemaManager schemaManager =
new SchemaManager(fileIOFromOptions(externalPath), externalPath);
new FileSystemSchemaManager(fileIOFromOptions(externalPath), externalPath);
Optional<TableSchema> latest = schemaManager.latest();
if (latest.isPresent()) {
// Note we just validate schema here, will not create a new table
Expand Down
Loading
Loading