Skip to content

Commit 1de8156

Browse files
xinyualxinyual
committed
apply spotless
Signed-off-by: xinyual <xinyual@amazon.com>
1 parent 64dae6e commit 1de8156

17 files changed

Lines changed: 47 additions & 910 deletions

‎core/src/main/java/org/opensearch/sql/calcite/CalcitePlanContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
import java.sql.Connection;
1111
import java.util.HashMap;
12-
import java.util.Map;
1312
import java.util.List;
13+
import java.util.Map;
1414
import java.util.Optional;
1515
import java.util.Stack;
1616
import java.util.function.BiFunction;

‎core/src/main/java/org/opensearch/sql/calcite/CalciteRexNodeVisitor.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@
1212

1313
import java.math.BigDecimal;
1414
import java.util.ArrayList;
15-
import java.util.List;
16-
import java.util.Map;
17-
import java.util.stream.Collectors;
1815
import java.util.Collections;
1916
import java.util.List;
17+
import java.util.Map;
2018
import lombok.RequiredArgsConstructor;
2119
import org.apache.calcite.rel.RelNode;
2220
import org.apache.calcite.rel.type.RelDataType;
2321
import org.apache.calcite.rel.type.RelDataTypeFactory;
2422
import org.apache.calcite.rex.RexBuilder;
25-
import org.apache.calcite.rex.RexLambdaRef;
2623
import org.apache.calcite.rex.RexCall;
24+
import org.apache.calcite.rex.RexLambdaRef;
2725
import org.apache.calcite.rex.RexNode;
2826
import org.apache.calcite.sql.SqlIntervalQualifier;
2927
import org.apache.calcite.sql.fun.SqlStdOperatorTable;

‎core/src/main/java/org/opensearch/sql/calcite/utils/BuiltinFunctionUtils.java‎

Lines changed: 0 additions & 643 deletions
This file was deleted.

‎core/src/main/java/org/opensearch/sql/expression/function/PPLBuiltinOperators.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
import org.apache.calcite.sql.type.SqlTypeTransforms;
2424
import org.apache.calcite.sql.util.ReflectiveSqlOperatorTable;
2525
import org.apache.calcite.util.BuiltInMethod;
26+
import org.opensearch.sql.calcite.utils.PPLReturnTypes;
27+
import org.opensearch.sql.data.type.ExprCoreType;
28+
import org.opensearch.sql.expression.datetime.DateTimeFunctions;
2629
import org.opensearch.sql.expression.function.collectionUDF.ForallFunctionImpl;
2730
import org.opensearch.sql.expression.function.jsonUDF.JsonAppendFunctionImpl;
2831
import org.opensearch.sql.expression.function.jsonUDF.JsonArrayFunctionImpl;
@@ -36,9 +39,6 @@
3639
import org.opensearch.sql.expression.function.jsonUDF.JsonSetFunctionImpl;
3740
import org.opensearch.sql.expression.function.jsonUDF.JsonValidFunctionImpl;
3841
import org.opensearch.sql.expression.function.jsonUDF.ToJsonStringFunctionImpl;
39-
import org.opensearch.sql.calcite.utils.PPLReturnTypes;
40-
import org.opensearch.sql.data.type.ExprCoreType;
41-
import org.opensearch.sql.expression.datetime.DateTimeFunctions;
4242
import org.opensearch.sql.expression.function.udf.CryptographicFunction;
4343
import org.opensearch.sql.expression.function.udf.datetime.AddSubDateFunction;
4444
import org.opensearch.sql.expression.function.udf.datetime.CurrentFunction;

‎core/src/main/java/org/opensearch/sql/expression/function/jsonUDF/JsonAppendFunctionImpl.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,29 @@
55

66
package org.opensearch.sql.expression.function.jsonUDF;
77

8-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.VARCHAR_FORCE_NULLABLE;
9-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.gson;
8+
import static org.opensearch.sql.calcite.utils.PPLReturnTypes.STRING_FORCE_NULLABLE;
109
import static org.opensearch.sql.expression.function.jsonUDF.JsonUtils.*;
1110

1211
import com.fasterxml.jackson.core.JsonProcessingException;
1312
import com.fasterxml.jackson.databind.JsonNode;
14-
import com.fasterxml.jackson.databind.ObjectMapper;
1513
import com.fasterxml.jackson.databind.node.ArrayNode;
1614
import com.jayway.jsonpath.Configuration;
1715
import com.jayway.jsonpath.DocumentContext;
1816
import com.jayway.jsonpath.JsonPath;
1917
import com.jayway.jsonpath.PathNotFoundException;
2018
import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;
2119
import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
22-
2320
import java.util.Arrays;
2421
import java.util.List;
25-
import java.util.Map;
2622
import org.apache.calcite.adapter.enumerable.NotNullImplementor;
2723
import org.apache.calcite.adapter.enumerable.NullPolicy;
2824
import org.apache.calcite.adapter.enumerable.RexImpTable;
2925
import org.apache.calcite.adapter.enumerable.RexToLixTranslator;
3026
import org.apache.calcite.linq4j.tree.Expression;
3127
import org.apache.calcite.linq4j.tree.Types;
32-
import org.apache.calcite.rel.type.RelDataTypeFactory;
3328
import org.apache.calcite.rex.RexCall;
3429
import org.apache.calcite.schema.impl.ScalarFunctionImpl;
3530
import org.apache.calcite.sql.type.SqlReturnTypeInference;
36-
import org.apache.calcite.sql.type.SqlTypeName;
3731
import org.opensearch.sql.expression.function.ImplementorUDF;
3832

3933
public class JsonAppendFunctionImpl extends ImplementorUDF {
@@ -43,7 +37,7 @@ public JsonAppendFunctionImpl() {
4337

4438
@Override
4539
public SqlReturnTypeInference getReturnTypeInference() {
46-
return VARCHAR_FORCE_NULLABLE;
40+
return STRING_FORCE_NULLABLE;
4741
}
4842

4943
public static class JsonAppendImplementor implements NotNullImplementor {

‎core/src/main/java/org/opensearch/sql/expression/function/jsonUDF/JsonArrayLengthFunctionImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package org.opensearch.sql.expression.function.jsonUDF;
77

8-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.gson;
9-
import static org.opensearch.sql.calcite.utils.UserDefinedFunctionUtils.INTEGER_FORCE_NULLABLE;
8+
import static org.opensearch.sql.calcite.utils.PPLReturnTypes.INTEGER_FORCE_NULLABLE;
9+
import static org.opensearch.sql.expression.function.jsonUDF.JsonUtils.gson;
1010

1111
import com.google.gson.JsonSyntaxException;
1212
import java.util.List;

‎core/src/main/java/org/opensearch/sql/expression/function/jsonUDF/JsonDeleteFunctionImpl.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,25 @@
55

66
package org.opensearch.sql.expression.function.jsonUDF;
77

8-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.VARCHAR_FORCE_NULLABLE;
9-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.gson;
8+
import static org.opensearch.sql.calcite.utils.PPLReturnTypes.STRING_FORCE_NULLABLE;
109
import static org.opensearch.sql.expression.function.jsonUDF.JsonUtils.*;
1110

1211
import com.fasterxml.jackson.core.JsonProcessingException;
1312
import com.fasterxml.jackson.databind.JsonNode;
14-
import com.fasterxml.jackson.databind.ObjectMapper;
1513
import com.jayway.jsonpath.DocumentContext;
1614
import com.jayway.jsonpath.JsonPath;
1715
import com.jayway.jsonpath.PathNotFoundException;
18-
1916
import java.util.Arrays;
2017
import java.util.List;
21-
import java.util.Map;
2218
import org.apache.calcite.adapter.enumerable.NotNullImplementor;
2319
import org.apache.calcite.adapter.enumerable.NullPolicy;
2420
import org.apache.calcite.adapter.enumerable.RexImpTable;
2521
import org.apache.calcite.adapter.enumerable.RexToLixTranslator;
2622
import org.apache.calcite.linq4j.tree.Expression;
2723
import org.apache.calcite.linq4j.tree.Types;
28-
import org.apache.calcite.rel.type.RelDataTypeFactory;
2924
import org.apache.calcite.rex.RexCall;
3025
import org.apache.calcite.schema.impl.ScalarFunctionImpl;
31-
import org.apache.calcite.sql.type.ReturnTypes;
3226
import org.apache.calcite.sql.type.SqlReturnTypeInference;
33-
import org.apache.calcite.sql.type.SqlTypeName;
3427
import org.opensearch.sql.expression.function.ImplementorUDF;
3528

3629
public class JsonDeleteFunctionImpl extends ImplementorUDF {
@@ -40,7 +33,7 @@ public JsonDeleteFunctionImpl() {
4033

4134
@Override
4235
public SqlReturnTypeInference getReturnTypeInference() {
43-
return VARCHAR_FORCE_NULLABLE;
36+
return STRING_FORCE_NULLABLE;
4437
}
4538

4639
public static class JsonDeleteImplementor implements NotNullImplementor {

‎core/src/main/java/org/opensearch/sql/expression/function/jsonUDF/JsonExtendFunctionImpl.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,21 @@
55

66
package org.opensearch.sql.expression.function.jsonUDF;
77

8-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.VARCHAR_FORCE_NULLABLE;
9-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.gson;
8+
import static org.opensearch.sql.calcite.utils.PPLReturnTypes.STRING_FORCE_NULLABLE;
109
import static org.opensearch.sql.expression.function.jsonUDF.JsonAppendFunctionImpl.jsonAppendIfArray;
1110

1211
import com.fasterxml.jackson.core.JsonProcessingException;
13-
1412
import java.util.Arrays;
1513
import java.util.List;
16-
import java.util.Map;
1714
import org.apache.calcite.adapter.enumerable.NotNullImplementor;
1815
import org.apache.calcite.adapter.enumerable.NullPolicy;
1916
import org.apache.calcite.adapter.enumerable.RexImpTable;
2017
import org.apache.calcite.adapter.enumerable.RexToLixTranslator;
2118
import org.apache.calcite.linq4j.tree.Expression;
2219
import org.apache.calcite.linq4j.tree.Types;
23-
import org.apache.calcite.rel.type.RelDataTypeFactory;
2420
import org.apache.calcite.rex.RexCall;
2521
import org.apache.calcite.schema.impl.ScalarFunctionImpl;
2622
import org.apache.calcite.sql.type.SqlReturnTypeInference;
27-
import org.apache.calcite.sql.type.SqlTypeName;
2823
import org.opensearch.sql.expression.function.ImplementorUDF;
2924

3025
public class JsonExtendFunctionImpl extends ImplementorUDF {
@@ -34,7 +29,7 @@ public JsonExtendFunctionImpl() {
3429

3530
@Override
3631
public SqlReturnTypeInference getReturnTypeInference() {
37-
return VARCHAR_FORCE_NULLABLE;
32+
return STRING_FORCE_NULLABLE;
3833
}
3934

4035
public static class JsonExtendImplementor implements NotNullImplementor {

‎core/src/main/java/org/opensearch/sql/expression/function/jsonUDF/JsonExtractFunctionImpl.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
package org.opensearch.sql.expression.function.jsonUDF;
77

88
import static org.apache.calcite.sql.type.SqlTypeUtil.createArrayType;
9-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.VARCHAR_FORCE_NULLABLE;
10-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.gson;
119
import static org.opensearch.sql.expression.function.jsonUDF.JsonUtils.convertToJsonPath;
10+
import static org.opensearch.sql.expression.function.jsonUDF.JsonUtils.gson;
1211

1312
import com.jayway.jsonpath.JsonPath;
14-
1513
import java.util.ArrayList;
1614
import java.util.Arrays;
1715
import java.util.List;
@@ -38,13 +36,12 @@ public JsonExtractFunctionImpl() {
3836
public SqlReturnTypeInference getReturnTypeInference() {
3937
return sqlOperatorBinding -> {
4038
RelDataTypeFactory typeFactory = sqlOperatorBinding.getTypeFactory();
41-
RelDataType varcharType = typeFactory.createTypeWithNullability(typeFactory.createSqlType(SqlTypeName.VARCHAR), true);
39+
RelDataType varcharType =
40+
typeFactory.createTypeWithNullability(
41+
typeFactory.createSqlType(SqlTypeName.VARCHAR), true);
4242
if (sqlOperatorBinding.collectOperandTypes().size() > 2) {
43-
return createArrayType(
44-
typeFactory,
45-
varcharType,
46-
true);
47-
} else {
43+
return createArrayType(typeFactory, varcharType, true);
44+
} else {
4845
return varcharType;
4946
}
5047
};
@@ -69,7 +66,7 @@ public static Object eval(Object... args) {
6966
Object value = args[0];
7067
List<Object> results = new ArrayList<>();
7168
List<Object> paths = Arrays.asList(args).subList(1, args.length);
72-
for (Object path: paths) {
69+
for (Object path : paths) {
7370
String jsonPath = convertToJsonPath(path.toString());
7471
try {
7572
Object result;

‎core/src/main/java/org/opensearch/sql/expression/function/jsonUDF/JsonKeysFunctionImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package org.opensearch.sql.expression.function.jsonUDF;
77

88
import static org.apache.calcite.sql.type.SqlTypeUtil.createArrayType;
9-
import static org.opensearch.sql.calcite.utils.BuiltinFunctionUtils.gson;
9+
import static org.opensearch.sql.expression.function.jsonUDF.JsonUtils.gson;
1010

1111
import com.google.gson.JsonSyntaxException;
1212
import java.util.Arrays;

0 commit comments

Comments
 (0)