Skip to content
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

[core] add interface in Catalog for CloneAction adapter CachingCatalog #3898

Merged
merged 1 commit into from
Aug 5, 2024
Merged

[core] add interface in Catalog for CloneAction adapter CachingCatalog #3898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions paimon-core/src/main/java/org/apache/paimon/catalog/Catalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.apache.paimon.annotation.Public;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.metastore.MetastoreClient;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaChange;
Expand Down Expand Up @@ -169,6 +170,13 @@ void dropDatabase(String name, boolean ignoreIfNotExists, boolean cascade)
*/
List<String> listTables(String databaseName) throws DatabaseNotExistException;

/**
* Get the table location in this catalog.
*
* @return the table location
*/
Path getDataTableLocation(Identifier identifier);

/**
* Check if a table exists in this catalog.
*
Expand Down
6 changes: 6 additions & 0 deletions paimon-core/src/main/java/org/apache/paimon/catalog/DelegateCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.paimon.catalog;

import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.Path;
import org.apache.paimon.metastore.MetastoreClient;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaChange;
Expand Down Expand Up @@ -134,6 +135,11 @@ public Table getTable(Identifier identifier) throws TableNotExistException {
return wrapped.getTable(identifier);
}

@Override
public Path getDataTableLocation(Identifier identifier) {
return wrapped.getDataTableLocation(identifier);
}

@Override
public void dropPartition(Identifier identifier, Map<String, String> partitions)
throws TableNotExistException, PartitionNotExistException {
Expand Down
18 changes: 4 additions & 14 deletions ...ink/paimon-flink-common/src/main/java/org/apache/paimon/flink/clone/CopyFileOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@

import java.util.Map;

import static org.apache.paimon.CoreOptions.PATH;

/** A Operator to copy files. */
public class CopyFileOperator extends AbstractStreamOperator<CloneFileInfo>
implements OneInputStreamOperator<CloneFileInfo, CloneFileInfo> {
Expand Down Expand Up @@ -69,19 +67,11 @@ public void processElement(StreamRecord<CloneFileInfo> streamRecord) throws Exce
FileIO sourceTableFileIO = sourceCatalog.fileIO();
FileIO targetTableFileIO = targetCatalog.fileIO();
Path sourceTableRootPath =
new Path(
sourceCatalog
.getTable(
Identifier.fromString(cloneFileInfo.getSourceIdentifier()))
.options()
.get(PATH.key()));
sourceCatalog.getDataTableLocation(
Identifier.fromString(cloneFileInfo.getSourceIdentifier()));
Path targetTableRootPath =
new Path(
targetCatalog
.getTable(
Identifier.fromString(cloneFileInfo.getTargetIdentifier()))
.options()
.get(PATH.key()));
targetCatalog.getDataTableLocation(
Identifier.fromString(cloneFileInfo.getTargetIdentifier()));

String filePathExcludeTableRoot = cloneFileInfo.getFilePathExcludeTableRoot();
Path sourcePath = new Path(sourceTableRootPath + filePathExcludeTableRoot);
Expand Down
Loading