This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-1.2-lts in repository https://gitbox.apache.org/repos/asf/doris.git
commit 7781f640a316e0a2e10ae88cb9d1bb0cffc5c568 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 72b494a89d..4b52c71116 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 @@ -446,7 +446,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 c8a9002236..9e25a2f031 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; @@ -372,4 +375,13 @@ public class DataDescriptionTest { }; desc.analyze("testDb"); } + + @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]
