database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](txn insert) Fix txn insert into values for sequence column or column name is keyword (#33336)

Browse Source
This commit is contained in:
meiyi
2024-04-08 00:13:04 +08:00
committed by yiguolei
parent 29777bc3a8
commit 4079a7b6ab
7 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fe/fe-core/src/main/java/org/apache/doris/analysis/NativeInsertStmt.java
View File

@ -1326,4 +1326,9 @@ public class NativeInsertStmt extends InsertStmt {
slotDesc.setIsNullable(col.isAllowNull());
}
}
public boolean containTargetColumnName(String columnName) {
return targetColumnNames != null && targetColumnNames.stream()
.anyMatch(col -> col.equalsIgnoreCase(columnName));
}
}

24
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
View File

@ -1838,13 +1838,11 @@ public class StmtExecutor {
int schemaSize = tbl.getBaseSchema(false).size();
if (parsedStmt instanceof NativeInsertStmt
&& ((NativeInsertStmt) parsedStmt).getTargetColumnNames() != null) {
if (((NativeInsertStmt) parsedStmt).getTargetColumnNames()
.contains(Column.SEQUENCE_COL)) {
NativeInsertStmt nativeInsertStmt = (NativeInsertStmt) parsedStmt;
if (nativeInsertStmt.containTargetColumnName(Column.SEQUENCE_COL)) {
schemaSize++;
}
if (((NativeInsertStmt) parsedStmt).getTargetColumnNames()
.contains(Column.DELETE_SIGN)) {
if (nativeInsertStmt.containTargetColumnName(Column.DELETE_SIGN)) {
schemaSize++;
}
}
@ -1922,19 +1920,13 @@ public class StmtExecutor {
.setExecMemLimit(maxExecMemByte).setTimeout((int) timeoutSecond)
.setTimezone(timeZone).setSendBatchParallelism(sendBatchParallelism).setTrimDoubleQuotes(true);
if (parsedStmt instanceof NativeInsertStmt && ((NativeInsertStmt) parsedStmt).getTargetColumnNames() != null) {
List<String> targetColumnNames = ((NativeInsertStmt) parsedStmt).getTargetColumnNames();
if (targetColumnNames.contains(Column.SEQUENCE_COL) || targetColumnNames.contains(Column.DELETE_SIGN)) {
if (targetColumnNames.contains(Column.SEQUENCE_COL)) {
NativeInsertStmt nativeInsertStmt = (NativeInsertStmt) parsedStmt;
if (nativeInsertStmt.containTargetColumnName(Column.SEQUENCE_COL)
|| nativeInsertStmt.containTargetColumnName(Column.DELETE_SIGN)) {
if (nativeInsertStmt.containTargetColumnName(Column.SEQUENCE_COL)) {
request.setSequenceCol(Column.SEQUENCE_COL);
}
StringBuilder allCols = new StringBuilder();
for (String col : ((NativeInsertStmt) parsedStmt).getTargetColumnNames()) {
allCols.append(col);
allCols.append(",");
}
allCols.deleteCharAt(allCols.length() - 1);
request.setColumns(String.valueOf(allCols));
request.setColumnSeparator(",");
request.setColumns("`" + String.join("`,`", nativeInsertStmt.getTargetColumnNames()) + "`");
}
}