From c831a812ff1ff181cc122e361c02a51bf69bb9ea Mon Sep 17 00:00:00 2001 From: tsy Date: Thu, 17 Aug 2023 12:55:59 +0800 Subject: [PATCH 1/2] analyze default value --- .../src/main/java/org/apache/doris/planner/FileLoadScanNode.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/FileLoadScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/FileLoadScanNode.java index b672b309306122..17398a5491ccb6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/FileLoadScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/FileLoadScanNode.java @@ -255,6 +255,7 @@ protected void finalizeParamsForLoad(ParamCreateContext context, if (column.getDefaultValue() != null) { if (column.getDefaultValueExprDef() != null) { expr = column.getDefaultValueExpr(); + expr.analyze(analyzer); } else { expr = new StringLiteral(destSlotDesc.getColumn().getDefaultValue()); } From 7daf2afeb9cd4da8f19cf19df344ea13665ed5cd Mon Sep 17 00:00:00 2001 From: tsy Date: Thu, 17 Aug 2023 13:12:31 +0800 Subject: [PATCH 2/2] add dft val case --- .../apache/doris/planner/FileLoadScanNode.java | 1 - .../doris/planner/external/FileScanNode.java | 1 + .../correctness_p0/test_current_timestamp.out | 16 ++++++++-------- .../test_current_timestamp_streamload.csv | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/FileLoadScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/FileLoadScanNode.java index 17398a5491ccb6..b672b309306122 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/FileLoadScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/FileLoadScanNode.java @@ -255,7 +255,6 @@ protected void finalizeParamsForLoad(ParamCreateContext context, if (column.getDefaultValue() != null) { if (column.getDefaultValueExprDef() != null) { expr = column.getDefaultValueExpr(); - expr.analyze(analyzer); } else { expr = new StringLiteral(destSlotDesc.getColumn().getDefaultValue()); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/external/FileScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/external/FileScanNode.java index f882a833373a4f..63dd6d452a771e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/external/FileScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/external/FileScanNode.java @@ -175,6 +175,7 @@ protected void setDefaultValueExprs(TableIf tbl, if (column.getDefaultValue() != null) { if (column.getDefaultValueExprDef() != null) { expr = column.getDefaultValueExpr(); + expr.analyze(analyzer); } else { expr = new StringLiteral(column.getDefaultValue()); } diff --git a/regression-test/data/correctness_p0/test_current_timestamp.out b/regression-test/data/correctness_p0/test_current_timestamp.out index e66b4f88b9721b..30601403742f1a 100644 --- a/regression-test/data/correctness_p0/test_current_timestamp.out +++ b/regression-test/data/correctness_p0/test_current_timestamp.out @@ -12,28 +12,28 @@ 4 -- !stream_load_csv1 -- -4 +5 -- !stream_load_csv2 -- -4 +5 -- !stream_load_csv3 -- -4 +5 -- !stream_load_csv4 -- -4 +5 -- !stream_load_json1 -- -2 +3 -- !stream_load_json2 -- -2 +3 -- !stream_load_json3 -- -2 +3 -- !stream_load_json4 -- -2 +3 -- !stream_load_json5 -- 9 apache diff --git a/regression-test/data/correctness_p0/test_current_timestamp_streamload.csv b/regression-test/data/correctness_p0/test_current_timestamp_streamload.csv index 55f24a1c84edc3..d78a3b30458aee 100644 --- a/regression-test/data/correctness_p0/test_current_timestamp_streamload.csv +++ b/regression-test/data/correctness_p0/test_current_timestamp_streamload.csv @@ -1,4 +1,5 @@ 5,ee 6,ff 7,gg -8,hh \ No newline at end of file +8,hh +9,