Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ CommonConfig setPipeConnectorRequestSliceThresholdBytes(

CommonConfig setQueryMemoryProportion(String queryMemoryProportion);

CommonConfig setDataNodeMemoryProportion(String dataNodeMemoryProportion);

CommonConfig setSubscriptionPrefetchTsFileBatchMaxDelayInMs(
int subscriptionPrefetchTsFileBatchMaxDelayInMs);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -550,7 +550,7 @@ public List<String> 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()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(),
Expand Down
Loading