You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ch...@apache.org on 2025/03/17 07:57:25 UTC
(iotdb) 06/08: Save
This is an automated email from the ASF dual-hosted git repository.
chenyz pushed a commit to branch builtin-udtf
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d969f365a6532e991f44dec12729afd9cb556c24
Author: Chen YZ <ch...@gmail.com>
AuthorDate: Fri Mar 7 11:52:16 2025 +0800
Save
---
.../execution/config/metadata/ShowFunctionsTask.java | 2 +-
.../optimizations/TransformAggregationToStreamable.java | 1 -
.../builtin/relational/TableBuiltinTableFunction.java | 16 ++++++++--------
.../udf/builtin/relational/tvf/HOPTableFunction.java | 4 ++--
...{CountTableFunction.java => NumberTableFunction.java} | 2 +-
...nceTableFunction.java => VariationTableFunction.java} | 2 +-
6 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
index 09c612742ed..e0e88b5458d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
@@ -156,7 +156,7 @@ public class ShowFunctionsTask implements IConfigTask {
appendFunctions(
builder,
TableBuiltinTableFunction.getBuiltInTableFunctionName(),
- BINARY_MAP.get(FUNCTION_TYPE_BUILTIN_AGG_FUNC),
+ BINARY_MAP.get(FUNCTION_TYPE_BUILTIN_TABLE_FUNC),
BINARY_MAP.get(FUNCTION_STATE_AVAILABLE));
DatasetHeader datasetHeader = DatasetHeaderFactory.getShowFunctionsHeader();
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS, builder.build(), datasetHeader));
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
index afd709a70af..a525205b740 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
@@ -28,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationN
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortBasedGroupNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode;
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinTableFunction.java
index 6a6fc0eb9a8..a529ef3d6d5 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinTableFunction.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinTableFunction.java
@@ -19,11 +19,11 @@
package org.apache.iotdb.commons.udf.builtin.relational;
-import org.apache.iotdb.commons.udf.builtin.relational.tvf.CountTableFunction;
import org.apache.iotdb.commons.udf.builtin.relational.tvf.HOPTableFunction;
+import org.apache.iotdb.commons.udf.builtin.relational.tvf.NumberTableFunction;
import org.apache.iotdb.commons.udf.builtin.relational.tvf.RepeatExample;
import org.apache.iotdb.commons.udf.builtin.relational.tvf.SessionTableFunction;
-import org.apache.iotdb.commons.udf.builtin.relational.tvf.VarianceTableFunction;
+import org.apache.iotdb.commons.udf.builtin.relational.tvf.VariationTableFunction;
import org.apache.iotdb.udf.api.relational.TableFunction;
import java.util.Arrays;
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
public enum TableBuiltinTableFunction {
HOP("hop"),
SESSION("session"),
- VARIANCE("variance"),
- COUNT("count"),
+ VARIATION("variation"),
+ NUMBER("number"),
REPEAT("repeat"),
;
@@ -69,10 +69,10 @@ public enum TableBuiltinTableFunction {
return new HOPTableFunction();
case "session":
return new SessionTableFunction();
- case "variance":
- return new VarianceTableFunction();
- case "count":
- return new CountTableFunction();
+ case "variation":
+ return new VariationTableFunction();
+ case "number":
+ return new NumberTableFunction();
case "repeat":
return new RepeatExample();
default:
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/HOPTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/HOPTableFunction.java
index 731f37d0a57..cf34cbda4a8 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/HOPTableFunction.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/HOPTableFunction.java
@@ -46,8 +46,8 @@ public class HOPTableFunction implements TableFunction {
private static final String DATA_PARAMETER_NAME = "DATA";
private static final String TIMECOL_PARAMETER_NAME = "TIMECOL";
- private static final String SLIDE_PARAMETER_NAME = "SLIDE";
private static final String SIZE_PARAMETER_NAME = "SIZE";
+ private static final String SLIDE_PARAMETER_NAME = "SLIDE";
private static final String START_PARAMETER_NAME = "START";
@Override
@@ -62,8 +62,8 @@ public class HOPTableFunction implements TableFunction {
.name(TIMECOL_PARAMETER_NAME)
.type(Type.STRING)
.build(),
- ScalarParameterSpecification.builder().name(SLIDE_PARAMETER_NAME).type(Type.INT64).build(),
ScalarParameterSpecification.builder().name(SIZE_PARAMETER_NAME).type(Type.INT64).build(),
+ ScalarParameterSpecification.builder().name(SLIDE_PARAMETER_NAME).type(Type.INT64).build(),
ScalarParameterSpecification.builder()
.name(START_PARAMETER_NAME)
.type(Type.TIMESTAMP)
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/CountTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/NumberTableFunction.java
similarity index 98%
rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/CountTableFunction.java
rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/NumberTableFunction.java
index 079a6594808..bc76d229070 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/CountTableFunction.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/NumberTableFunction.java
@@ -41,7 +41,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-public class CountTableFunction implements TableFunction {
+public class NumberTableFunction implements TableFunction {
private static final String DATA_PARAMETER_NAME = "DATA";
private static final String SIZE_PARAMETER_NAME = "SIZE";
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/VarianceTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/VariationTableFunction.java
similarity index 98%
rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/VarianceTableFunction.java
rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/VariationTableFunction.java
index 56979d374f2..06491b4e0ba 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/VarianceTableFunction.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/tvf/VariationTableFunction.java
@@ -45,7 +45,7 @@ import java.util.Map;
import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex;
-public class VarianceTableFunction implements TableFunction {
+public class VariationTableFunction implements TableFunction {
private static final String DATA_PARAMETER_NAME = "DATA";
private static final String COL_PARAMETER_NAME = "COL";
private static final String DELTA_PARAMETER_NAME = "DELTA";