This is an automated email from the ASF dual-hosted git repository.
caiconghui pushed a commit to branch stream_load_error
in repository https://gitbox.apache.org/repos/asf/doris.git
commit d8d0ac1e6593ac7650d63c52c4b0c243566456aa
Author: caiconghui1 <caicongh...@jd.com>
AuthorDate: Fri May 31 15:48:13 2024 +0800
fix
---
.../java/org/apache/doris/task/StreamLoadTask.java | 4 ++
.../data/load_p0/stream_load/test_keyword.csv | 10 ++++
.../stream_load/test_stream_load_keyword.out | 14 +++++
.../stream_load/test_stream_load_keyword.groovy | 63 ++++++++++++++++++++++
4 files changed, 91 insertions(+)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/task/StreamLoadTask.java
b/fe/fe-core/src/main/java/org/apache/doris/task/StreamLoadTask.java
index 94f3625fbc7..eea85c8f089 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/task/StreamLoadTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/task/StreamLoadTask.java
@@ -466,6 +466,10 @@ public class StreamLoadTask implements LoadTaskInfo {
// used for stream load
private void setColumnToColumnExpr(String columns) throws UserException {
+ // wrap each column with `` to escape potential syntax error caused by
keyword
+ columns = String.join(",", Arrays.stream(columns.split(","))
+ .map(column -> "`" + column.trim() + "`")
+ .toArray(String[]::new));
String columnsSQL = new String("COLUMNS (" + columns + ")");
SqlParser parser = new SqlParser(new SqlScanner(new
StringReader(columnsSQL)));
ImportColumnsStmt columnsStmt;
diff --git a/regression-test/data/load_p0/stream_load/test_keyword.csv
b/regression-test/data/load_p0/stream_load/test_keyword.csv
new file mode 100644
index 00000000000..c5339f8b57e
--- /dev/null
+++ b/regression-test/data/load_p0/stream_load/test_keyword.csv
@@ -0,0 +1,10 @@
+1 2 3 4 5 6 7
+2 3 4 5 6 7 8
+3 4 5 6 7 8 9
+4 5 6 7 8 9 10
+5 6 7 8 9 10 11
+6 7 8 9 10 11 12
+7 8 9 10 11 12 13
+8 9 10 11 12 13 14
+9 10 11 12 13 14 15
+10 11 12 13 14 16 16
\ No newline at end of file
diff --git
a/regression-test/data/load_p0/stream_load/test_stream_load_keyword.out
b/regression-test/data/load_p0/stream_load/test_stream_load_keyword.out
new file mode 100644
index 00000000000..980309896da
--- /dev/null
+++ b/regression-test/data/load_p0/stream_load/test_stream_load_keyword.out
@@ -0,0 +1,14 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !sql --
+1 2 3 4 5 6 7
+2 3 4 5 6 7 8
+3 4 5 6 7 8 9
+4 5 6 7 8 9 10
+5 6 7 8 9 10 11
+6 7 8 9 10 11 12
+7 8 9 10 11 12 13
+8 9 10 11 12 13 14
+9 10 11 12 13 14 15
+10 11 12 13 14 16 16
+
+
diff --git
a/regression-test/suites/load_p0/stream_load/test_stream_load_keyword.groovy
b/regression-test/suites/load_p0/stream_load/test_stream_load_keyword.groovy
new file mode 100644
index 00000000000..38e09aaaf5c
--- /dev/null
+++ b/regression-test/suites/load_p0/stream_load/test_stream_load_keyword.groovy
@@ -0,0 +1,63 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_stream_load_keyword", "p0") {
+ def tableName = "test_stream_load_keyword"
+ try {
+ sql """ DROP TABLE IF EXISTS ${tableName} """
+ sql """
+ CREATE TABLE IF NOT EXISTS ${tableName} (
+ `k1` bigint(20) NULL,
+ `k2` bigint(20) NULL,
+ `sql` tinyint(4) SUM NULL,
+ `database` tinyint(4) REPLACE NULL,
+ `table` tinyint(4) REPLACE_IF_NOT_NULL NULL,
+ `sum` smallint(6) REPLACE_IF_NOT_NULL NULL,
+ `schema` int(11) REPLACE_IF_NOT_NULL NULL
+ ) ENGINE=OLAP
+ AGGREGATE KEY(`k1`, `k2`)
+ COMMENT 'OLAP'
+ DISTRIBUTED BY HASH(`k1`, `k2`) BUCKETS 3
+ PROPERTIES ("replication_allocation" = "tag.location.default: 1");
+ """
+
+ // test columns with keyword success
+ streamLoad {
+ table "${tableName}"
+
+ file 'test_keyword.csv'
+
+ set 'columns', 'k1, k2, sql, database, table, sum, schema'
+
+ check { result, exception, startTime, endTime ->
+ if (exception != null) {
+ throw exception
+ }
+ log.info("Stream load result: ${result}".toString())
+ def json = parseJson(result)
+ assertEquals("success", json.Status.toLowerCase())
+ assertEquals(10, json.NumberTotalRows)
+ }
+ time 10000 // limit inflight 10s
+ }
+
+ sql "sync"
+ qt_sql "select * from ${tableName} order by k1"
+ } finally {
+ sql """ DROP TABLE IF EXISTS ${tableName} """
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
