|
6 | 6 |
|
7 | 7 | package org.opensearch.sql.expression.text;
|
8 | 8 |
|
| 9 | +import static org.opensearch.sql.data.type.ExprCoreType.ARRAY; |
9 | 10 | import static org.opensearch.sql.data.type.ExprCoreType.INTEGER;
|
10 | 11 | import static org.opensearch.sql.data.type.ExprCoreType.STRING;
|
11 | 12 | import static org.opensearch.sql.expression.function.FunctionDSL.define;
|
12 | 13 | import static org.opensearch.sql.expression.function.FunctionDSL.impl;
|
13 | 14 | import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling;
|
14 | 15 |
|
| 16 | +import java.util.Collections; |
| 17 | +import java.util.stream.Collectors; |
15 | 18 | import lombok.experimental.UtilityClass;
|
| 19 | +import org.apache.commons.lang3.tuple.Pair; |
| 20 | +import org.opensearch.sql.data.model.ExprCollectionValue; |
16 | 21 | import org.opensearch.sql.data.model.ExprIntegerValue;
|
17 | 22 | import org.opensearch.sql.data.model.ExprStringValue;
|
18 | 23 | import org.opensearch.sql.data.model.ExprValue;
|
| 24 | +import org.opensearch.sql.data.type.ExprType; |
| 25 | +import org.opensearch.sql.expression.Expression; |
| 26 | +import org.opensearch.sql.expression.FunctionExpression; |
| 27 | +import org.opensearch.sql.expression.env.Environment; |
19 | 28 | import org.opensearch.sql.expression.function.BuiltinFunctionName;
|
20 | 29 | import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
|
21 | 30 | import org.opensearch.sql.expression.function.DefaultFunctionResolver;
|
22 | 31 | import org.opensearch.sql.expression.function.FunctionName;
|
| 32 | +import org.opensearch.sql.expression.function.FunctionSignature; |
23 | 33 | import org.opensearch.sql.expression.function.SerializableBiFunction;
|
24 | 34 | import org.opensearch.sql.expression.function.SerializableTriFunction;
|
25 | 35 |
|
@@ -148,9 +158,26 @@ private DefaultFunctionResolver upper() {
|
148 | 158 | * (STRING, STRING) -> STRING
|
149 | 159 | */
|
150 | 160 | private DefaultFunctionResolver concat() {
|
151 |
| - return define(BuiltinFunctionName.CONCAT.getName(), |
152 |
| - impl(nullMissingHandling((str1, str2) -> |
153 |
| - new ExprStringValue(str1.stringValue() + str2.stringValue())), STRING, STRING, STRING)); |
| 161 | + FunctionName concatFuncName = BuiltinFunctionName.CONCAT.getName(); |
| 162 | + return define(concatFuncName, funcName -> |
| 163 | + Pair.of( |
| 164 | + new FunctionSignature(concatFuncName, Collections.singletonList(ARRAY)), |
| 165 | + (funcProp, args) -> new FunctionExpression(funcName, args) { |
| 166 | + @Override |
| 167 | + public ExprValue valueOf(Environment<Expression, ExprValue> valueEnv) { |
| 168 | + return new ExprStringValue( |
| 169 | + args.stream() |
| 170 | + .map(arg -> arg.valueOf(valueEnv)) |
| 171 | + .map(argVal -> String.valueOf(argVal.value())) |
| 172 | + .collect(Collectors.joining())); |
| 173 | + } |
| 174 | + |
| 175 | + @Override |
| 176 | + public ExprType type() { |
| 177 | + return STRING; |
| 178 | + } |
| 179 | + } |
| 180 | + )); |
154 | 181 | }
|
155 | 182 |
|
156 | 183 | /**
|
|
0 commit comments