diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java index 04977b309fb3..271ce2d6e33b 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java @@ -538,6 +538,12 @@ public CommonConfig setQueryMemoryProportion(String queryMemoryProportion) { return this; } + @Override + public CommonConfig setDataNodeMemoryProportion(String dataNodeMemoryProportion) { + setProperty("datanode_memory_proportion", dataNodeMemoryProportion); + return this; + } + @Override public CommonConfig setSubscriptionPrefetchTsFileBatchMaxDelayInMs( int subscriptionPrefetchTsFileBatchMaxDelayInMs) { diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java index 37295b92ab40..84aefd4c9cca 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java @@ -555,6 +555,13 @@ public CommonConfig setQueryMemoryProportion(String queryMemoryProportion) { return this; } + @Override + public CommonConfig setDataNodeMemoryProportion(String dataNodeMemoryProportion) { + dnConfig.setDataNodeMemoryProportion(dataNodeMemoryProportion); + cnConfig.setDataNodeMemoryProportion(dataNodeMemoryProportion); + return this; + } + @Override public CommonConfig setSubscriptionPrefetchTsFileBatchMaxDelayInMs( int subscriptionPrefetchTsFileBatchMaxDelayInMs) { diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java index 2db51185bf6c..ef772fbc20ee 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java @@ -391,6 +391,11 @@ public CommonConfig setQueryMemoryProportion(String queryMemoryProportion) { return this; } + @Override + public CommonConfig setDataNodeMemoryProportion(String dataNodeMemoryProportion) { + return this; + } + @Override public CommonConfig setEnforceStrongPassword(boolean enforceStrongPassword) { return this; diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java b/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java index 1623f83c7a7b..b53299c8aaf3 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java @@ -172,6 +172,8 @@ CommonConfig setPipeConnectorRequestSliceThresholdBytes( CommonConfig setQueryMemoryProportion(String queryMemoryProportion); + CommonConfig setDataNodeMemoryProportion(String dataNodeMemoryProportion); + CommonConfig setSubscriptionPrefetchTsFileBatchMaxDelayInMs( int subscriptionPrefetchTsFileBatchMaxDelayInMs); diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/orderBy/IoTDBOrderByIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/orderBy/IoTDBOrderByIT.java index 8904f04d8bb5..7f84a2df9006 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/orderBy/IoTDBOrderByIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/orderBy/IoTDBOrderByIT.java @@ -103,7 +103,8 @@ public static void setUp() throws Exception { EnvFactory.getEnv() .getConfig() .getDataNodeCommonConfig() - .setQueryMemoryProportion("1:100:200:50:200:400:200:50"); + .setDataNodeMemoryProportion("2:4:1:1:1:1") + .setQueryMemoryProportion("1:100:100:10:400:200:100:50"); EnvFactory.getEnv().initClusterEnvironment(); insertData(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBAsofJoinTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBAsofJoinTableIT.java index eb48343a107f..01763e7d4a98 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBAsofJoinTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBAsofJoinTableIT.java @@ -63,12 +63,15 @@ public class IoTDBAsofJoinTableIT { @BeforeClass public static void setUp() throws Exception { - EnvFactory.getEnv().initClusterEnvironment(); EnvFactory.getEnv() .getConfig() .getCommonConfig() .setMaxTsBlockLineNumber(2) - .setMaxNumberOfPointsInPage(5); + .setMaxNumberOfPointsInPage(5) + .setDataNodeMemoryProportion("2:4:1:1:1:1") + .setQueryMemoryProportion("1:100:100:10:400:200:100:50") + .setSortBufferSize(1024 * 1024); + EnvFactory.getEnv().initClusterEnvironment(); insertData(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java index 2dc63ea92500..776adf96cb7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java @@ -86,9 +86,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import com.google.common.base.Joiner; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.tsfile.utils.Pair; -import org.eclipse.jetty.util.StringUtil; import java.util.ArrayList; import java.util.HashMap; @@ -550,7 +550,7 @@ public List visitLastQueryScan(LastQueryScanNode node, GraphContext cont boxValue.add( String.format( "Series: %s%s", node.getDevicePath().getIDeviceID(), node.getMeasurementSchemas())); - if (StringUtil.isNotBlank(node.getOutputViewPath())) { + if (StringUtils.isNotBlank(node.getOutputViewPath())) { boxValue.add(String.format("ViewPath: %s", node.getOutputViewPath())); } boxValue.add(printRegion(node.getRegionReplicaSet())); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java index 1d40c1457a2a..63e19230d604 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java @@ -31,11 +31,11 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; +import org.apache.commons.lang3.StringUtils; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; import org.apache.tsfile.write.schema.IMeasurementSchema; -import org.eclipse.jetty.util.StringUtil; import java.io.DataOutputStream; import java.io.IOException; @@ -258,7 +258,7 @@ public int hashCode() { @Override public String toString() { - if (StringUtil.isNotBlank(outputViewPath)) { + if (StringUtils.isNotBlank(outputViewPath)) { return String.format( "LastQueryScanNode-%s:[Device: %s, Aligned: %s, Measurements: %s, ViewPath: %s, DataRegion: %s]", this.getPlanNodeId(),