You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/07/12 16:20:46 UTC
[iotdb] 02/02: remove QMC in cluster module
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch removeQMC
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fb4ea617ec0d90e7eb95ef08ab8c84532e78ba0b
Author: Alima777 <wx...@gmail.com>
AuthorDate: Mon Jul 12 22:54:07 2021 +0800
remove QMC in cluster module
---
.../iotdb/cluster/query/LocalQueryExecutor.java | 32 +++++-----------------
.../cluster/query/manage/ClusterQueryManager.java | 8 ++----
.../query/ClusterAggregateExecutorTest.java | 4 +--
.../query/ClusterDataQueryExecutorTest.java | 10 +++----
.../cluster/query/ClusterFillExecutorTest.java | 4 +--
.../query/ClusterPhysicalGeneratorTest.java | 3 +-
.../cluster/query/ClusterPlanExecutorTest.java | 4 +--
.../cluster/query/ClusterQueryRouterTest.java | 12 ++++----
.../iotdb/cluster/query/LoadConfigurationTest.java | 2 +-
.../ClusterGroupByNoVFilterDataSetTest.java | 2 +-
.../groupby/ClusterGroupByVFilterDataSetTest.java | 2 +-
.../query/groupby/MergeGroupByExecutorTest.java | 4 +--
.../query/groupby/RemoteGroupByExecutorTest.java | 4 +--
.../query/manage/ClusterQueryManagerTest.java | 12 +++-----
.../query/reader/ClusterReaderFactoryTest.java | 2 +-
.../query/reader/ClusterTimeGeneratorTest.java | 4 +--
.../cluster/server/member/DataGroupMemberTest.java | 2 +-
.../cluster/server/member/MetaGroupMemberTest.java | 4 +--
18 files changed, 44 insertions(+), 71 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java
index d35e200..28da147 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java
@@ -92,8 +92,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.apache.iotdb.session.Config.DEFAULT_FETCH_SIZE;
-
public class LocalQueryExecutor {
private static final Logger logger = LoggerFactory.getLogger(LocalQueryExecutor.class);
@@ -237,11 +235,7 @@ public class LocalQueryExecutor {
// the same query from a requester correspond to a context here
RemoteQueryContext queryContext =
- queryManager.getQueryContext(
- request.getRequester(),
- request.getQueryId(),
- request.getFetchSize(),
- request.getDeduplicatedPathNum());
+ queryManager.getQueryContext(request.getRequester(), request.getQueryId());
logger.debug(
DEBUG_SHOW_QUERY_ID,
name,
@@ -341,11 +335,7 @@ public class LocalQueryExecutor {
// the same query from a requester correspond to a context here
RemoteQueryContext queryContext =
- queryManager.getQueryContext(
- request.getRequester(),
- request.getQueryId(),
- request.getFetchSize(),
- request.getDeduplicatedPathNum());
+ queryManager.getQueryContext(request.getRequester(), request.getQueryId());
logger.debug(
DEBUG_SHOW_QUERY_ID,
name,
@@ -581,11 +571,7 @@ public class LocalQueryExecutor {
Set<String> deviceMeasurements = request.getDeviceMeasurements();
RemoteQueryContext queryContext =
- queryManager.getQueryContext(
- request.getRequester(),
- request.getQueryId(),
- request.getFetchSize(),
- request.getDeduplicatedPathNum());
+ queryManager.getQueryContext(request.getRequester(), request.getQueryId());
logger.debug(
DEBUG_SHOW_QUERY_ID,
name,
@@ -689,8 +675,7 @@ public class LocalQueryExecutor {
timeFilter = FilterFactory.deserialize(request.timeFilterBytes);
}
RemoteQueryContext queryContext =
- queryManager.getQueryContext(
- request.getRequestor(), request.queryId, DEFAULT_FETCH_SIZE, -1);
+ queryManager.getQueryContext(request.getRequestor(), request.queryId);
Set<String> deviceMeasurements = request.getDeviceMeasurements();
boolean ascending = request.ascending;
@@ -881,8 +866,7 @@ public class LocalQueryExecutor {
Set<String> deviceMeasurements = request.getDeviceMeasurements();
boolean ascending = request.ascending;
- RemoteQueryContext queryContext =
- queryManager.getQueryContext(request.getRequestor(), queryId, DEFAULT_FETCH_SIZE, -1);
+ RemoteQueryContext queryContext = queryManager.getQueryContext(request.getRequestor(), queryId);
LocalGroupByExecutor executor =
getGroupByExecutor(
path,
@@ -968,8 +952,7 @@ public class LocalQueryExecutor {
long beforeRange = request.getBeforeRange();
Node requester = request.getRequester();
Set<String> deviceMeasurements = request.getDeviceMeasurements();
- RemoteQueryContext queryContext =
- queryManager.getQueryContext(requester, queryId, DEFAULT_FETCH_SIZE, -1);
+ RemoteQueryContext queryContext = queryManager.getQueryContext(requester, queryId);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
@@ -1034,8 +1017,7 @@ public class LocalQueryExecutor {
dataGroupMember.syncLeaderWithConsistencyCheck(false);
RemoteQueryContext queryContext =
- queryManager.getQueryContext(
- request.getRequestor(), request.getQueryId(), DEFAULT_FETCH_SIZE, -1);
+ queryManager.getQueryContext(request.getRequestor(), request.getQueryId());
List<PartialPath> partialPaths = new ArrayList<>();
for (String path : request.getPaths()) {
partialPaths.add(new PartialPath(path));
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/manage/ClusterQueryManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/manage/ClusterQueryManager.java
index 455e7fb..f3376ba 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/manage/ClusterQueryManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/manage/ClusterQueryManager.java
@@ -43,16 +43,12 @@ public class ClusterQueryManager {
private Map<Long, IAggregateReader> aggrReaderMap = new ConcurrentHashMap<>();
private Map<Long, GroupByExecutor> groupByExecutorMap = new ConcurrentHashMap<>();
- public synchronized RemoteQueryContext getQueryContext(
- Node node, long queryId, int fetchSize, int deduplicatedPathNum) {
+ public synchronized RemoteQueryContext getQueryContext(Node node, long queryId) {
Map<Long, RemoteQueryContext> nodeContextMap =
queryContextMap.computeIfAbsent(node, n -> new HashMap<>());
return nodeContextMap.computeIfAbsent(
queryId,
- qId ->
- new RemoteQueryContext(
- QueryResourceManager.getInstance()
- .assignQueryId(true, fetchSize, deduplicatedPathNum)));
+ qId -> new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true)));
}
public long registerReader(IBatchReader reader) {
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterAggregateExecutorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterAggregateExecutorTest.java
index b76afed..7d18a00 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterAggregateExecutorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterAggregateExecutorTest.java
@@ -85,7 +85,7 @@ public class ClusterAggregateExecutorTest extends BaseQueryTest {
plan.setDeduplicatedAggregations(aggregations);
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
executor = new ClusterAggregateExecutor(plan, testMetaMember);
QueryDataSet queryDataSet = executor.executeWithoutValueFilter(context, plan);
@@ -142,7 +142,7 @@ public class ClusterAggregateExecutorTest extends BaseQueryTest {
new PartialPath(TestUtils.getTestSeries(0, 0)), TimeFilter.gtEq(3))));
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
executor = new ClusterAggregateExecutor(plan, testMetaMember);
QueryDataSet queryDataSet = executor.executeWithValueFilter(context, plan);
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterDataQueryExecutorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterDataQueryExecutorTest.java
index 65148b0..c2d8f0b 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterDataQueryExecutorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterDataQueryExecutorTest.java
@@ -66,7 +66,7 @@ public class ClusterDataQueryExecutorTest extends BaseQueryTest {
plan.setDeduplicatedDataTypes(dataTypes);
queryExecutor = new ClusterDataQueryExecutor(plan, testMetaMember);
RemoteQueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet dataSet = queryExecutor.executeWithoutValueFilter(context);
checkSequentialDataset(dataSet, 0, 20);
@@ -87,7 +87,7 @@ public class ClusterDataQueryExecutorTest extends BaseQueryTest {
plan.setExpression(expression);
queryExecutor = new ClusterDataQueryExecutor(plan, testMetaMember);
RemoteQueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet dataSet = queryExecutor.executeWithValueFilter(context);
checkSequentialDataset(dataSet, 5, 15);
@@ -104,7 +104,7 @@ public class ClusterDataQueryExecutorTest extends BaseQueryTest {
plan.setEnableRedirect(true);
queryExecutor = new ClusterDataQueryExecutor(plan, testMetaMember);
RemoteQueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet dataSet = queryExecutor.executeWithoutValueFilter(context);
assertNull(dataSet.getEndPoint());
@@ -126,7 +126,7 @@ public class ClusterDataQueryExecutorTest extends BaseQueryTest {
plan.setEnableRedirect(true);
queryExecutor = new ClusterDataQueryExecutor(plan, testMetaMember);
RemoteQueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet dataSet = queryExecutor.executeWithValueFilter(context);
assertNull(dataSet.getEndPoint());
@@ -147,7 +147,7 @@ public class ClusterDataQueryExecutorTest extends BaseQueryTest {
plan.setEnableRedirect(true);
queryExecutor = new ClusterDataQueryExecutor(plan, testMetaMember);
RemoteQueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet dataSet = queryExecutor.executeWithoutValueFilter(context);
assertEquals("ip:port=0.0.0.0:6667", dataSet.getEndPoint().toString());
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterFillExecutorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterFillExecutorTest.java
index 48e869a..cecb1b0 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterFillExecutorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterFillExecutorTest.java
@@ -60,7 +60,7 @@ public class ClusterFillExecutorTest extends BaseQueryTest {
TSDataType.DOUBLE, new PreviousFill(TSDataType.DOUBLE, 0, defaultFillInterval));
plan.setFillType(tsDataTypeIFillMap);
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
ClusterFillExecutor fillExecutor;
@@ -107,7 +107,7 @@ public class ClusterFillExecutorTest extends BaseQueryTest {
new LinearFill(TSDataType.DOUBLE, 0, defaultFillInterval, defaultFillInterval));
plan.setFillType(tsDataTypeIFillMap);
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
ClusterFillExecutor fillExecutor;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterPhysicalGeneratorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterPhysicalGeneratorTest.java
index fdbe72f..bdbbe00 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterPhysicalGeneratorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterPhysicalGeneratorTest.java
@@ -65,8 +65,7 @@ public class ClusterPhysicalGeneratorTest extends BaseQueryTest {
operator.setSelectComponent(selectComponent);
operator.setFromComponent(fromComponent);
- RawDataQueryPlan plan =
- (RawDataQueryPlan) physicalGenerator.transformToPhysicalPlan(operator, 1024);
+ RawDataQueryPlan plan = (RawDataQueryPlan) physicalGenerator.transformToPhysicalPlan(operator);
assertEquals(pathList, plan.getDeduplicatedPaths());
assertEquals(dataTypes, plan.getDeduplicatedDataTypes());
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterPlanExecutorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterPlanExecutorTest.java
index a0264bb..e60674c 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterPlanExecutorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterPlanExecutorTest.java
@@ -61,7 +61,7 @@ public class ClusterPlanExecutorTest extends BaseQueryTest {
queryPlan.setPaths(pathList);
queryPlan.setDataTypes(dataTypes);
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet dataSet = queryExecutor.processQuery(queryPlan, context);
@@ -96,7 +96,7 @@ public class ClusterPlanExecutorTest extends BaseQueryTest {
IOException, InterruptedException, QueryProcessException {
ShowTimeSeriesPlan showTimeSeriesPlan = new ShowTimeSeriesPlan(pathList.get(0));
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet dataSet = queryExecutor.processQuery(showTimeSeriesPlan, context);
int count = 0;
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterQueryRouterTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterQueryRouterTest.java
index 6e31c23..c611ec6 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterQueryRouterTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterQueryRouterTest.java
@@ -73,7 +73,7 @@ public class ClusterQueryRouterTest extends BaseQueryTest {
queryPlan.setDeduplicatedPathsAndUpdate(pathList);
queryPlan.setDeduplicatedDataTypes(dataTypes);
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet dataSet = clusterQueryRouter.rawDataQuery(queryPlan, context);
@@ -117,7 +117,7 @@ public class ClusterQueryRouterTest extends BaseQueryTest {
plan.setDeduplicatedAggregations(aggregations);
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet queryDataSet = clusterQueryRouter.aggregate(plan, context);
checkDoubleDataset(queryDataSet, new Object[] {0.0, 19.0, 9.5, 20.0, 190.0});
@@ -142,7 +142,7 @@ public class ClusterQueryRouterTest extends BaseQueryTest {
TSDataType.DOUBLE, new PreviousFill(TSDataType.DOUBLE, 0, defaultFillInterval));
plan.setFillType(tsDataTypeIFillMap);
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet queryDataSet;
@@ -183,7 +183,7 @@ public class ClusterQueryRouterTest extends BaseQueryTest {
plan.setFillType(tsDataTypeIFillMap);
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet queryDataSet;
@@ -212,7 +212,7 @@ public class ClusterQueryRouterTest extends BaseQueryTest {
throws IOException, StorageEngineException, QueryFilterOptimizationException,
QueryProcessException, IllegalPathException {
QueryContext queryContext =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
GroupByTimePlan groupByPlan = new GroupByTimePlan();
List<PartialPath> pathList = new ArrayList<>();
@@ -265,7 +265,7 @@ public class ClusterQueryRouterTest extends BaseQueryTest {
throws StorageEngineException, IOException, QueryFilterOptimizationException,
QueryProcessException, IllegalPathException {
QueryContext queryContext =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
GroupByTimePlan groupByPlan = new GroupByTimePlan();
List<PartialPath> pathList = new ArrayList<>();
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/LoadConfigurationTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/LoadConfigurationTest.java
index bd3d6d1..48d6653 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/LoadConfigurationTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/LoadConfigurationTest.java
@@ -114,7 +114,7 @@ public class LoadConfigurationTest {
LoadConfigurationPlan loadConfigurationPlan =
(LoadConfigurationPlan)
- physicalGenerator.transformToPhysicalPlan(loadConfigurationOperator, 0);
+ physicalGenerator.transformToPhysicalPlan(loadConfigurationOperator);
String metricProperties =
(String) loadConfigurationPlan.getIoTDBProperties().get("enable_metric_service");
assertEquals("false", metricProperties);
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByNoVFilterDataSetTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByNoVFilterDataSetTest.java
index 931de93..64e06cd 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByNoVFilterDataSetTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByNoVFilterDataSetTest.java
@@ -48,7 +48,7 @@ public class ClusterGroupByNoVFilterDataSetTest extends BaseQueryTest {
public void test()
throws StorageEngineException, IOException, QueryProcessException, IllegalPathException {
QueryContext queryContext =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
GroupByTimePlan groupByPlan = new GroupByTimePlan();
List<PartialPath> pathList = new ArrayList<>();
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByVFilterDataSetTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByVFilterDataSetTest.java
index b948ff4..756c29f 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByVFilterDataSetTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByVFilterDataSetTest.java
@@ -51,7 +51,7 @@ public class ClusterGroupByVFilterDataSetTest extends BaseQueryTest {
public void test()
throws IOException, StorageEngineException, QueryProcessException, IllegalPathException {
QueryContext queryContext =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
GroupByTimePlan groupByPlan = new GroupByTimePlan();
List<PartialPath> pathList = new ArrayList<>();
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/MergeGroupByExecutorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/MergeGroupByExecutorTest.java
index b95308f..136e392 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/MergeGroupByExecutorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/MergeGroupByExecutorTest.java
@@ -50,7 +50,7 @@ public class MergeGroupByExecutorTest extends BaseQueryTest {
PartialPath path = new PartialPath(TestUtils.getTestSeries(0, 0));
TSDataType dataType = TSDataType.DOUBLE;
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
Filter timeFilter = null;
Set<String> deviceMeasurements = new HashSet<>();
@@ -85,7 +85,7 @@ public class MergeGroupByExecutorTest extends BaseQueryTest {
PartialPath path = new PartialPath(TestUtils.getTestSeries(0, 0));
TSDataType dataType = TSDataType.DOUBLE;
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
Filter timeFilter = TimeFilter.gtEq(3);
Set<String> deviceMeasurements = new HashSet<>();
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/RemoteGroupByExecutorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/RemoteGroupByExecutorTest.java
index 04f7027..6df7ee7 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/RemoteGroupByExecutorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/groupby/RemoteGroupByExecutorTest.java
@@ -55,7 +55,7 @@ public class RemoteGroupByExecutorTest extends BaseQueryTest {
PartialPath path = new PartialPath(TestUtils.getTestSeries(0, 0));
TSDataType dataType = TSDataType.DOUBLE;
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
Filter timeFilter = null;
List<Integer> aggregationTypes = new ArrayList<>();
@@ -113,7 +113,7 @@ public class RemoteGroupByExecutorTest extends BaseQueryTest {
PartialPath path = new PartialPath(TestUtils.getTestSeries(0, 0));
TSDataType dataType = TSDataType.DOUBLE;
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
Filter timeFilter = TimeFilter.gtEq(3);
List<Integer> aggregationTypes = new ArrayList<>();
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/manage/ClusterQueryManagerTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/manage/ClusterQueryManagerTest.java
index 35a404e..a50b037 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/manage/ClusterQueryManagerTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/manage/ClusterQueryManagerTest.java
@@ -46,12 +46,9 @@ public class ClusterQueryManagerTest {
@Test
public void testContext() {
- RemoteQueryContext queryContext1 =
- queryManager.getQueryContext(TestUtils.getNode(0), 1, 1024, -1);
- RemoteQueryContext queryContext2 =
- queryManager.getQueryContext(TestUtils.getNode(0), 1, 1024, -1);
- RemoteQueryContext queryContext3 =
- queryManager.getQueryContext(TestUtils.getNode(1), 1, 1024, -1);
+ RemoteQueryContext queryContext1 = queryManager.getQueryContext(TestUtils.getNode(0), 1);
+ RemoteQueryContext queryContext2 = queryManager.getQueryContext(TestUtils.getNode(0), 1);
+ RemoteQueryContext queryContext3 = queryManager.getQueryContext(TestUtils.getNode(1), 1);
assertSame(queryContext1, queryContext2);
assertNotEquals(queryContext2, queryContext3);
}
@@ -158,8 +155,7 @@ public class ClusterQueryManagerTest {
@Test
public void testEndQuery() throws StorageEngineException {
- RemoteQueryContext queryContext =
- queryManager.getQueryContext(TestUtils.getNode(0), 1, 1024, -1);
+ RemoteQueryContext queryContext = queryManager.getQueryContext(TestUtils.getNode(0), 1);
for (int i = 0; i < 10; i++) {
IBatchReader reader =
new IBatchReader() {
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactoryTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactoryTest.java
index 6567249..33743ee 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactoryTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactoryTest.java
@@ -46,7 +46,7 @@ public class ClusterReaderFactoryTest extends BaseQueryTest {
ClusterReaderFactory readerFactory = new ClusterReaderFactory(testMetaMember);
RemoteQueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
SeriesRawDataBatchReader seriesReader =
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterTimeGeneratorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterTimeGeneratorTest.java
index 17261b2..fbbee45 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterTimeGeneratorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterTimeGeneratorTest.java
@@ -57,7 +57,7 @@ public class ClusterTimeGeneratorTest extends BaseQueryTest {
throws StorageEngineException, IOException, IllegalPathException, QueryProcessException {
RawDataQueryPlan dataQueryPlan = new RawDataQueryPlan();
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
IExpression expression =
BinaryExpression.and(
@@ -86,7 +86,7 @@ public class ClusterTimeGeneratorTest extends BaseQueryTest {
throws StorageEngineException, IOException, IllegalPathException, QueryProcessException {
RawDataQueryPlan dataQueryPlan = new RawDataQueryPlan();
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
Filter valueFilter = ValueFilter.gtEq(3.0);
Filter timeFilter = TimeFilter.ltEq(8);
try {
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
index f756f10..fecd87d 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
@@ -1160,7 +1160,7 @@ public class DataGroupMemberTest extends BaseMember {
Filter timeFilter = TimeFilter.gtEq(5);
request.setTimeFilterBytes(SerializeUtils.serializeFilter(timeFilter));
QueryContext queryContext =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
request.setQueryId(queryContext.getQueryId());
request.setRequestor(TestUtils.getNode(0));
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
index 88ada81..14706e9 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
@@ -919,7 +919,7 @@ public class MetaGroupMemberTest extends BaseMember {
}
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
ClusterReaderFactory readerFactory = new ClusterReaderFactory(testMetaMember);
@@ -985,7 +985,7 @@ public class MetaGroupMemberTest extends BaseMember {
}
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
ClusterReaderFactory readerFactory = new ClusterReaderFactory(testMetaMember);