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

[bug](function)fix potential npe in getFunction() when fe restart (#18989)

Browse Source 
fix potential npe in getFunction() when fe restart
This commit is contained in:
xy720
2023-05-04 23:45:22 +08:00
committed by GitHub
parent ddd67dba8c
commit 4b85c2738e
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fe/fe-core/src/main/java/org/apache/doris/catalog/FunctionSet.java
View File

@ -1290,8 +1290,7 @@ public class FunctionSet<T> {
if (f.hasTemplateArg()) {
f = specializeTemplateFunction(f, desc, f.hasVariadicTemplateArg());
}
f = resolveInferenceFunction(f, desc);
if (f != null) {
if (f != null && (f = resolveInferenceFunction(f, desc)) != null) {
inferredFunctions.add(f);
}
}

15
fe/fe-core/src/test/java/org/apache/doris/catalog/FunctionSetTest.java
View File

@ -18,7 +18,9 @@
package org.apache.doris.catalog;
import org.apache.doris.analysis.FunctionName;
import org.apache.doris.catalog.Function.CompareMode;
import com.google.common.collect.Lists;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@ -52,4 +54,17 @@ public class FunctionSetTest {
Assert.assertTrue(newArgTypes[0].matchesType(ScalarType.VARCHAR));
}
@Test
public void testAddInferenceFunction() {
TemplateType type1 = new TemplateType("T");
TemplateType type2 = new TemplateType("T");
functionSet.addBuiltinBothScalaAndVectorized(ScalarFunction.createBuiltin(
"test_a", Type.ANY_TYPE, Lists.newArrayList(type1, type2), false,
"", "", "", true));
Type[] argTypes = {ArrayType.create(), ScalarType.INT};
Function desc = new Function(new FunctionName("test_a"), Arrays.asList(argTypes), ScalarType.INVALID, false);
Function result = functionSet.getFunction(desc, CompareMode.IS_IDENTICAL);
Assert.assertNull(result);
}
}