You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/07/27 01:46:06 UTC
[iotdb] branch master updated: Fix compile error in assignQueryId
(#3629)
This is an automated email from the ASF dual-hosted git repository.
rong 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 9437339 Fix compile error in assignQueryId (#3629)
9437339 is described below
commit 943733987d694c17ce286401899ef79d41de1487
Author: Xiangwei Wei <34...@users.noreply.github.com>
AuthorDate: Tue Jul 27 09:45:36 2021 +0800
Fix compile error in assignQueryId (#3629)
* Fix compile error in assignQueryId(#3628)
* Fix master compile bug
Co-authored-by: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
---
.../org/apache/iotdb/cluster/query/ClusterQueryRouterTest.java | 5 ++---
.../apache/iotdb/cluster/query/ClusterUDTFQueryExecutorTest.java | 8 ++++----
2 files changed, 6 insertions(+), 7 deletions(-)
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 c5656d4..f9218e0 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
@@ -52,7 +52,6 @@ import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
-import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -316,10 +315,10 @@ public class ClusterQueryRouterTest extends BaseQueryTest {
public void testUDTFQuery() throws QueryProcessException, StorageEngineException {
ClusterPlanner processor = new ClusterPlanner();
String sqlStr = "select sin(s0) from root.*";
- PhysicalPlan plan = processor.parseSQLToPhysicalPlan(sqlStr, ZoneId.systemDefault(), 1024);
+ PhysicalPlan plan = processor.parseSQLToPhysicalPlan(sqlStr);
UDTFPlan udtfPlan = (UDTFPlan) plan;
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
QueryDataSet queryDataSet = clusterQueryRouter.udtfQuery(udtfPlan, context);
for (int i = 0; i < 20; i++) {
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutorTest.java
index ee91d22..5122a31 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutorTest.java
@@ -59,10 +59,10 @@ public class ClusterUDTFQueryExecutorTest extends BaseQueryTest {
throws QueryProcessException, StorageEngineException {
ClusterPlanner processor = new ClusterPlanner();
String sqlStr = "select sin(s0) from root.*";
- PhysicalPlan plan = processor.parseSQLToPhysicalPlan(sqlStr, ZoneId.systemDefault(), 1024);
+ PhysicalPlan plan = processor.parseSQLToPhysicalPlan(sqlStr, ZoneId.systemDefault());
UDTFPlan udtfPlan = (UDTFPlan) plan;
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
executor = new ClusterUDTFQueryExecutor(udtfPlan, testMetaMember);
QueryDataSet queryDataSet = executor.executeWithoutValueFilterAlignByTime(context);
@@ -79,10 +79,10 @@ public class ClusterUDTFQueryExecutorTest extends BaseQueryTest {
throws IOException, StorageEngineException, QueryProcessException {
ClusterPlanner processor = new ClusterPlanner();
String sqlStr = "select sin(s0) from root.* where time >= 5";
- PhysicalPlan plan = processor.parseSQLToPhysicalPlan(sqlStr, ZoneId.systemDefault(), 1024);
+ PhysicalPlan plan = processor.parseSQLToPhysicalPlan(sqlStr, ZoneId.systemDefault());
UDTFPlan udtfPlan = (UDTFPlan) plan;
QueryContext context =
- new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true, 1024, -1));
+ new RemoteQueryContext(QueryResourceManager.getInstance().assignQueryId(true));
try {
executor = new ClusterUDTFQueryExecutor(udtfPlan, testMetaMember);
QueryDataSet queryDataSet = executor.executeWithoutValueFilterAlignByTime(context);