This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 950c6a7dd63 Change IT configuration to make CI more stable
950c6a7dd63 is described below
commit 950c6a7dd6398714fe58807edb5e2e0e7239484c
Author: Jackie Tien <[email protected]>
AuthorDate: Fri Aug 8 14:01:06 2025 +0800
Change IT configuration to make CI more stable
---
.../org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java | 6 ++++++
.../apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java | 7 +++++++
.../org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java | 5 +++++
.../src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java | 2 ++
.../test/java/org/apache/iotdb/db/it/orderBy/IoTDBOrderByIT.java | 3 ++-
.../org/apache/iotdb/relational/it/db/it/IoTDBAsofJoinTableIT.java | 7 +++++--
.../db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java | 4 ++--
.../plan/planner/plan/node/source/LastQueryScanNode.java | 4 ++--
8 files changed, 31 insertions(+), 7 deletions(-)
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 4a57f81a172..c9732c9cade 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 class MppCommonConfig extends MppBaseConfig
implements CommonConfig {
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 178ba7a8b29..226271db7ce 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 class MppSharedCommonConfig implements CommonConfig
{
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 5f5e525a75d..b4f37d08b5d 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 class RemoteCommonConfig implements CommonConfig {
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 3a85d359aab..dd42d36e827 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 @@ public interface CommonConfig {
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 8904f04d8bb..7f84a2df900 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 class IoTDBOrderByIT {
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 eb48343a107..01763e7d4a9 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 2dc63ea9250..776adf96cb7 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.ValueFillNod
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 class PlanGraphPrinter extends
PlanVisitor<List<String>, PlanGraphPrinter
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 1d40c1457a2..63e19230d60 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.PlanNodeUtil;
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 class LastQueryScanNode extends LastSeriesSourceNode
{
@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(),
