Skip to content

[AMORO-2755] Add judgment and reduce duplicate 'put' #2758

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
baiyangtx merged 3 commits into from
Apr 19, 2024
Merged

[AMORO-2755] Add judgment and reduce duplicate 'put' #2758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdc16bd
issue_2755 Add judgment and reduce duplicate 'put'
Aireed Apr 17, 2024
ef55a06
Update mixed-format/spark/v3.3/spark/src/main/java/org/apache/amoro/s…
Aireed Apr 19, 2024
ebe6d80
Update mixed-format/spark/v3.2/spark/src/main/java/org/apache/amoro/s…
Aireed Apr 19, 2024
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
1 change: 1 addition & 0 deletions core/src/main/java/org/apache/amoro/table/TableProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ private TableProperties() {}

public static final String FILE_FORMAT_ORC = "orc";
public static final String BASE_FILE_FORMAT = "base.write.format";
public static final String DELTA_FILE_FORMAT = "delta.write.format";
public static final String BASE_FILE_FORMAT_DEFAULT = FILE_FORMAT_PARQUET;

public static final String CHANGE_FILE_FORMAT = "change.write.format";
Expand Down
25 changes: 12 additions & 13 deletions ...-format/spark/v3.2/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,19 @@ public Transform[] partitioning() {
public Map<String, String> properties() {
ImmutableMap.Builder<String, String> propsBuilder = ImmutableMap.builder();

String baseFileFormat =
arcticTable
.properties()
.getOrDefault(
TableProperties.BASE_FILE_FORMAT, TableProperties.BASE_FILE_FORMAT_DEFAULT);
String deltaFileFormat =
arcticTable
.properties()
.getOrDefault(
TableProperties.CHANGE_FILE_FORMAT, TableProperties.CHANGE_FILE_FORMAT_DEFAULT);
propsBuilder.put("base.write.format", baseFileFormat);
propsBuilder.put("delta.write.format", deltaFileFormat);
propsBuilder.put("provider", "arctic");
if (!arcticTable.properties().containsKey(TableProperties.BASE_FILE_FORMAT)) {
propsBuilder.put(TableProperties.BASE_FILE_FORMAT, TableProperties.BASE_FILE_FORMAT_DEFAULT);
}

if (!arcticTable.properties().containsKey(TableProperties.DELTA_FILE_FORMAT)) {
propsBuilder.put(
TableProperties.DELTA_FILE_FORMAT,
arcticTable
.properties()
.getOrDefault(
TableProperties.CHANGE_FILE_FORMAT, TableProperties.CHANGE_FILE_FORMAT_DEFAULT));
}
propsBuilder.put("provider", "arctic");
arcticTable.properties().entrySet().stream()
.filter(entry -> !RESERVED_PROPERTIES.contains(entry.getKey()))
.forEach(propsBuilder::put);
Expand Down
25 changes: 12 additions & 13 deletions ...-format/spark/v3.3/spark/src/main/java/org/apache/amoro/spark/table/ArcticSparkTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,19 @@ public Transform[] partitioning() {
public Map<String, String> properties() {
ImmutableMap.Builder<String, String> propsBuilder = ImmutableMap.builder();

String baseFileFormat =
arcticTable
.properties()
.getOrDefault(
TableProperties.BASE_FILE_FORMAT, TableProperties.BASE_FILE_FORMAT_DEFAULT);
String deltaFileFormat =
arcticTable
.properties()
.getOrDefault(
TableProperties.CHANGE_FILE_FORMAT, TableProperties.CHANGE_FILE_FORMAT_DEFAULT);
propsBuilder.put("base.write.format", baseFileFormat);
propsBuilder.put("delta.write.format", deltaFileFormat);
propsBuilder.put("provider", "arctic");
if (!arcticTable.properties().containsKey(TableProperties.BASE_FILE_FORMAT)) {
propsBuilder.put(TableProperties.BASE_FILE_FORMAT, TableProperties.BASE_FILE_FORMAT_DEFAULT);
}

if (!arcticTable.properties().containsKey(TableProperties.DELTA_FILE_FORMAT)) {
propsBuilder.put(
TableProperties.DELTA_FILE_FORMAT,
arcticTable
.properties()
.getOrDefault(
TableProperties.CHANGE_FILE_FORMAT, TableProperties.CHANGE_FILE_FORMAT_DEFAULT));
}
propsBuilder.put("provider", "arctic");
arcticTable.properties().entrySet().stream()
.filter(entry -> !RESERVED_PROPERTIES.contains(entry.getKey()))
.forEach(propsBuilder::put);
Expand Down