This is an automated email from the ASF dual-hosted git repository.
caiconghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0b8c6315fb [fix](broker load) Fix hll_hash(null) in broker load report
incorrect Exception (#16293)
0b8c6315fb is described below
commit 0b8c6315fba9571d196750b861826d10e4932b4f
Author: Henry2SS <[email protected]>
AuthorDate: Tue Feb 7 11:32:20 2023 +0800
[fix](broker load) Fix hll_hash(null) in broker load report incorrect
Exception (#16293)
Co-authored-by: wuhangze <[email protected]>
---
.../main/java/org/apache/doris/analysis/DataDescription.java | 2 +-
.../java/org/apache/doris/analysis/DataDescriptionTest.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java
index 34f22ada25..c78c47aa80 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DataDescription.java
@@ -490,7 +490,7 @@ public class DataDescription {
private static void validateHllHash(List<String> args, Map<String, String>
columnNameMap) throws AnalysisException {
for (int i = 0; i < args.size(); ++i) {
String argColumn = args.get(i);
- if (!columnNameMap.containsKey(argColumn)) {
+ if (argColumn == null || !columnNameMap.containsKey(argColumn)) {
throw new AnalysisException("Column is not in sources, column:
" + argColumn);
}
args.set(i, columnNameMap.get(argColumn));
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/DataDescriptionTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/DataDescriptionTest.java
index ec07f8c0b5..d79770c9c7 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/DataDescriptionTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/DataDescriptionTest.java
@@ -20,6 +20,7 @@ package org.apache.doris.analysis;
import org.apache.doris.analysis.BinaryPredicate.Operator;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.FunctionSet;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.jmockit.Deencapsulation;
@@ -39,6 +40,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -413,4 +416,13 @@ public class DataDescriptionTest {
+ "SET (`k1` = bitmap_dict('day', `k2`))";
Assert.assertEquals(sql, desc.toSql());
}
+
+ @Test(expected = AnalysisException.class)
+ public void testHllFunctionArgsNull() throws AnalysisException {
+ String functionName = FunctionSet.HLL_HASH;
+ List<String> args = new ArrayList<>();
+ args.add(null);
+
+ DataDescription.validateMappingFunction(functionName, args, new
HashMap<String, String>(), null, false);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
