This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch calc_commons in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6bedeaf179b06801c600b255a61ca27484ded44e Author: shuwenwei <[email protected]> AuthorDate: Mon Apr 20 10:20:40 2026 +0800 fix --- .../iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java | 6 ++++-- iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java index 85721cfb7a1..e24cbfbeea2 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java @@ -19,6 +19,8 @@ package org.apache.iotdb.itbase.constant; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; + import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -57,9 +59,9 @@ public enum BuiltinAggregationFunctionEnum { private static final Set<String> NATIVE_FUNCTION_NAMES = new HashSet<>( Arrays.stream( - org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction.values()) + BuiltinAggregationFunction.values()) .map( - org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction + BuiltinAggregationFunction ::getFunctionName) .collect(Collectors.toList())); diff --git a/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl b/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl index 4b1097dfd1d..7a3f154f002 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl @@ -26,8 +26,8 @@ package org.apache.iotdb.db.calc_commons.execution.aggregation; import com.google.common.collect.ImmutableList; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.statistics.Statistics; import org.apache.tsfile.block.column.Column; @@ -56,7 +56,7 @@ public class ${className} implements Accumulator { private final Map<${type.javaBoxName}, Pair<Long, Long>> countMap = new HashMap<>(); <#if type.dataType != "boolean"> - private final int MAP_SIZE_THRESHOLD = IoTDBDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); + private final int MAP_SIZE_THRESHOLD = CommonDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); </#if> @Override
