This is an automated email from the ASF dual-hosted git repository. chenyz pushed a commit to branch rename_fa in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3ee9767958bc2a9b7758a13168700ff0944aa85f Author: Chen YZ <[email protected]> AuthorDate: Wed Jan 8 10:45:05 2025 +0800 done --- .../apache/iotdb/udf/AggregateFunctionExample.java | 2 +- .../apache/iotdb/udf/ScalarFunctionExample.java | 2 +- .../db/query/udf/example/relational/AllSum.java | 6 +++--- .../query/udf/example/relational/ContainNull.java | 2 +- .../db/query/udf/example/relational/DatePlus.java | 2 +- .../query/udf/example/relational/FirstTwoSum.java | 2 +- .../db/query/udf/example/relational/MyAvg.java | 2 +- .../db/query/udf/example/relational/MyCount.java | 2 +- .../customizer/parameter/FunctionArguments.java | 22 +++++++++++----------- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/example/udf/src/main/java/org/apache/iotdb/udf/AggregateFunctionExample.java b/example/udf/src/main/java/org/apache/iotdb/udf/AggregateFunctionExample.java index 6ddc0dd77e3..4837e7e97f0 100644 --- a/example/udf/src/main/java/org/apache/iotdb/udf/AggregateFunctionExample.java +++ b/example/udf/src/main/java/org/apache/iotdb/udf/AggregateFunctionExample.java @@ -79,7 +79,7 @@ public class AggregateFunctionExample implements AggregateFunction { @Override public AggregateFunctionAnalysis analyze(FunctionArguments arguments) throws UDFArgumentNotValidException { - if (arguments.getChildExpressionsSize() != 1) { + if (arguments.getArgumentsSize() != 1) { throw new UDFArgumentNotValidException("Only one parameter is required."); } return new AggregateFunctionAnalysis.Builder() diff --git a/example/udf/src/main/java/org/apache/iotdb/udf/ScalarFunctionExample.java b/example/udf/src/main/java/org/apache/iotdb/udf/ScalarFunctionExample.java index 0777c076bc9..ff48d0b57a9 100644 --- a/example/udf/src/main/java/org/apache/iotdb/udf/ScalarFunctionExample.java +++ b/example/udf/src/main/java/org/apache/iotdb/udf/ScalarFunctionExample.java @@ -51,7 +51,7 @@ public class ScalarFunctionExample implements ScalarFunction { @Override public ScalarFunctionAnalysis analyze(FunctionArguments arguments) throws UDFArgumentNotValidException { - if (arguments.getChildExpressionsSize() < 1) { + if (arguments.getArgumentsSize() < 1) { throw new UDFArgumentNotValidException("At least one parameter is required."); } return new ScalarFunctionAnalysis.Builder().outputDataType(Type.BOOLEAN).build(); diff --git a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/AllSum.java b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/AllSum.java index 8f51cbc0775..2f2527f8175 100644 --- a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/AllSum.java +++ b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/AllSum.java @@ -38,10 +38,10 @@ public class AllSum implements ScalarFunction { @Override public ScalarFunctionAnalysis analyze(FunctionArguments arguments) throws UDFArgumentNotValidException { - if (arguments.getChildExpressionsSize() < 1) { + if (arguments.getArgumentsSize() < 1) { throw new UDFArgumentNotValidException("At least one parameter is required."); } - for (int i = 0; i < arguments.getChildExpressionsSize(); i++) { + for (int i = 0; i < arguments.getArgumentsSize(); i++) { if (arguments.getDataType(i) != Type.INT32 && arguments.getDataType(i) != Type.INT64 && arguments.getDataType(i) != Type.FLOAT @@ -62,7 +62,7 @@ public class AllSum implements ScalarFunction { private Type inferOutputDataType(FunctionArguments arguments) { Set<Type> inputTypeSet = new HashSet<>(); - for (int i = 0; i < arguments.getChildExpressionsSize(); i++) { + for (int i = 0; i < arguments.getArgumentsSize(); i++) { inputTypeSet.add(arguments.getDataType(i)); } if (inputTypeSet.contains(Type.DOUBLE)) { diff --git a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/ContainNull.java b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/ContainNull.java index eb0a92dd24a..656a79a9c27 100644 --- a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/ContainNull.java +++ b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/ContainNull.java @@ -31,7 +31,7 @@ public class ContainNull implements ScalarFunction { @Override public ScalarFunctionAnalysis analyze(FunctionArguments arguments) throws UDFArgumentNotValidException { - if (arguments.getChildExpressionsSize() < 1) { + if (arguments.getArgumentsSize() < 1) { throw new UDFArgumentNotValidException("At least one parameter is required."); } return new ScalarFunctionAnalysis.Builder().outputDataType(Type.BOOLEAN).build(); diff --git a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/DatePlus.java b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/DatePlus.java index 18354c10b9b..e6fb975830b 100644 --- a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/DatePlus.java +++ b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/DatePlus.java @@ -33,7 +33,7 @@ public class DatePlus implements ScalarFunction { @Override public ScalarFunctionAnalysis analyze(FunctionArguments arguments) throws UDFArgumentNotValidException { - if (arguments.getChildExpressionsSize() != 2) { + if (arguments.getArgumentsSize() != 2) { throw new UDFArgumentNotValidException("Only two parameter is required."); } if (arguments.getDataType(0) != Type.DATE) { diff --git a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/FirstTwoSum.java b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/FirstTwoSum.java index 59cbf101317..c2aa402d828 100644 --- a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/FirstTwoSum.java +++ b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/FirstTwoSum.java @@ -70,7 +70,7 @@ public class FirstTwoSum implements AggregateFunction { @Override public AggregateFunctionAnalysis analyze(FunctionArguments arguments) throws UDFArgumentNotValidException { - if (arguments.getChildExpressionsSize() != 3) { + if (arguments.getArgumentsSize() != 3) { throw new UDFArgumentNotValidException("FirstTwoSum should accept three column as input"); } for (int i = 0; i < 2; i++) { diff --git a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/MyAvg.java b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/MyAvg.java index 8f43f0119c1..94c45254920 100644 --- a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/MyAvg.java +++ b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/MyAvg.java @@ -63,7 +63,7 @@ public class MyAvg implements AggregateFunction { @Override public AggregateFunctionAnalysis analyze(FunctionArguments arguments) throws UDFArgumentNotValidException { - if (arguments.getChildExpressionsSize() != 1) { + if (arguments.getArgumentsSize() != 1) { throw new UDFArgumentNotValidException("MyAvg only accepts one column as input"); } if (arguments.getDataType(0) != Type.INT32 diff --git a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/MyCount.java b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/MyCount.java index 9a2ad17b92b..e1dae4ff90d 100644 --- a/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/MyCount.java +++ b/integration-test/src/main/java/org/apache/iotdb/db/query/udf/example/relational/MyCount.java @@ -58,7 +58,7 @@ public class MyCount implements AggregateFunction { @Override public AggregateFunctionAnalysis analyze(FunctionArguments arguments) throws UDFArgumentNotValidException { - if (arguments.getChildExpressionsSize() == 0) { + if (arguments.getArgumentsSize() == 0) { throw new UDFArgumentNotValidException("MyCount accepts at least one parameter"); } return new AggregateFunctionAnalysis.Builder().outputDataType(Type.INT64).build(); diff --git a/iotdb-api/udf-api/src/main/java/org/apache/iotdb/udf/api/customizer/parameter/FunctionArguments.java b/iotdb-api/udf-api/src/main/java/org/apache/iotdb/udf/api/customizer/parameter/FunctionArguments.java index ea65984db0f..4b63c5a4f2f 100644 --- a/iotdb-api/udf-api/src/main/java/org/apache/iotdb/udf/api/customizer/parameter/FunctionArguments.java +++ b/iotdb-api/udf-api/src/main/java/org/apache/iotdb/udf/api/customizer/parameter/FunctionArguments.java @@ -29,31 +29,31 @@ import java.util.Map; * implementation. It contains the data types of the child expressions, system attributes, etc. */ public class FunctionArguments { - private final List<Type> childExpressionDataTypes; + private final List<Type> argumentTypes; private final Map<String, String> systemAttributes; public FunctionArguments( List<Type> childExpressionDataTypes, Map<String, String> systemAttributes) { - this.childExpressionDataTypes = childExpressionDataTypes; + this.argumentTypes = childExpressionDataTypes; this.systemAttributes = systemAttributes; } /** - * Get the data types of the input children expressions. + * Get the data types of the arguments. * - * @return a list of data types of the input children expressions + * @return a list of data types of the arguments */ - public List<Type> getChildExpressionDataTypes() { - return childExpressionDataTypes; + public List<Type> getArgumentTypes() { + return argumentTypes; } /** - * Get the number of the input children expressions. + * Get the number of the arguments. * - * @return the number of the input children expressions + * @return the number of the arguments */ - public int getChildExpressionsSize() { - return childExpressionDataTypes.size(); + public int getArgumentsSize() { + return argumentTypes.size(); } /** @@ -63,7 +63,7 @@ public class FunctionArguments { * @return the data type of the input child expression at the specified index */ public Type getDataType(int index) { - return childExpressionDataTypes.get(index); + return argumentTypes.get(index); } /**
