Skip to content

[fix](spark-load)fix-Unique-key-with-MOR-by-sparkload for branch2.0 #26414

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
xiaokang merged 2 commits into from
Nov 3, 2023
Merged

[fix](spark-load)fix-Unique-key-with-MOR-by-sparkload for branch2.0 #26414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d4a2ce
fix-Unique-key-with-MOR-by-sparkload
wuwenchi Nov 3, 2023
e644143
Merge branch 'branch-2.0' into fix-Unique-key-with-MOR-by-sparkload-f…
xiaokang Nov 3, 2023
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
13 changes: 10 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadPendingTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,13 @@ private List<EtlIndex> createEtlIndexes(OlapTable table) throws LoadException {
long indexId = entry.getKey();
int schemaHash = table.getSchemaHashByIndexId(indexId);

boolean changeAggType = table.getKeysTypeByIndexId(indexId).equals(KeysType.UNIQUE_KEYS)
&& table.getTableProperty().getEnableUniqueKeyMergeOnWrite();

// columns
List<EtlColumn> etlColumns = Lists.newArrayList();
for (Column column : entry.getValue()) {
etlColumns.add(createEtlColumn(column));
etlColumns.add(createEtlColumn(column, changeAggType));
}

// check distribution type
Expand Down Expand Up @@ -290,7 +293,7 @@ private List<EtlIndex> createEtlIndexes(OlapTable table) throws LoadException {
return etlIndexes;
}

private EtlColumn createEtlColumn(Column column) {
private EtlColumn createEtlColumn(Column column, boolean changeAggType) {
// column name
String name = column.getName().toLowerCase(Locale.ROOT);
// column type
Expand All @@ -304,7 +307,11 @@ private EtlColumn createEtlColumn(Column column) {
// aggregation type
String aggregationType = null;
if (column.getAggregationType() != null) {
aggregationType = column.getAggregationType().toString();
if (changeAggType && !column.isKey()) {
aggregationType = AggregateType.REPLACE.toSql();
} else {
aggregationType = column.getAggregationType().toString();
}
}

// default value
Expand Down