Skip to content

[INLONG-8953][Sort] Fix Iceberg source defaults the StartSnapshot to the latest #8954

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

Merged
dockerzhang merged 1 commit into from
Sep 21, 2023
+15 −0
Merged

[INLONG-8953][Sort] Fix Iceberg source defaults the StartSnapshot to the latest #8954

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
10 changes: 10 additions & 0 deletions ...t/sort-common/src/main/java/org/apache/inlong/sort/protocol/constant/IcebergConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class IcebergConstant {
public static final String WAREHOUSE_KEY = "warehouse";
public static final String START_SNAPSHOT_ID = "start-snapshot-id";
public static final String STREAMING = "streaming";
public static final String STARTING_STRATEGY_KEY = "starting-strategy";

/**
* Iceberg supported catalog type
Expand Down Expand Up @@ -65,4 +66,13 @@ public static CatalogType forName(String name) {
throw new IllegalArgumentException(String.format("Unsupport catalogType:%s", name));
}
}

public enum StreamingStartingStrategy {
TABLE_SCAN_THEN_INCREMENTAL,
INCREMENTAL_FROM_LATEST_SNAPSHOT,
INCREMENTAL_FROM_EARLIEST_SNAPSHOT,
INCREMENTAL_FROM_SNAPSHOT_ID,
INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP;

}
}
5 changes: 5 additions & 0 deletions ...common/src/main/java/org/apache/inlong/sort/protocol/node/extract/IcebergExtractNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ public Map<String, String> tableOptions() {
options.put(IcebergConstant.TABLE_KEY, tableName);
options.put(IcebergConstant.CATALOG_TYPE_KEY, catalogType.name());
options.put(IcebergConstant.CATALOG_NAME_KEY, catalogName);
// support streaming only
options.put(IcebergConstant.STREAMING, "true");
options.put(IcebergConstant.STARTING_STRATEGY_KEY,
IcebergConstant.StreamingStartingStrategy.INCREMENTAL_FROM_EARLIEST_SNAPSHOT.name());
if (null != uri) {
options.put(IcebergConstant.URI_KEY, uri);
}
Expand All @@ -119,6 +122,8 @@ public Map<String, String> tableOptions() {
}
if (null != startSnapShotId) {
options.put(IcebergConstant.START_SNAPSHOT_ID, startSnapShotId.toString());
options.put(IcebergConstant.STARTING_STRATEGY_KEY,
IcebergConstant.StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_ID.name());
}
return options;
}
Expand Down