This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch rc/1.3.5 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 96cd6c202948c4aaf5b0da08009000b1af16da65 Author: JackieTien97 <[email protected]> AuthorDate: Wed Sep 3 14:59:57 2025 +0800 resolve conflicts --- .../apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java index a10fdb405a7..ba6660f3d6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java @@ -29,7 +29,9 @@ import org.apache.tsfile.utils.RamUsageEstimator; import javax.annotation.Nullable; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; public class MemoryEstimationHelper {
