You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/05/21 02:59:12 UTC
[incubator-iotdb] branch cluster updated: remove syso
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/cluster by this push:
new 45fece1 remove syso
45fece1 is described below
commit 45fece11e2b5ef291cf56463cd42688ded3555c4
Author: lta <li...@163.com>
AuthorDate: Tue May 21 10:58:30 2019 +0800
remove syso
---
.../cluster/query/executor/ClusterQueryRouter.java | 2 +-
.../integration/IoTDBAggregationLargeDataIT.java | 24 +++-------------------
.../cluster/integration/IoTDBFillQueryIT.java | 7 -------
.../iotdb/cluster/utils/hash/RouterTest.java | 14 ++-----------
.../groupby/GroupByWithOnlyTimeFilterDataSet.java | 2 +-
.../integration/IoTDBAggregationLargeDataIT.java | 2 --
6 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java
index 672ca9d..5d6a342 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java
@@ -94,7 +94,7 @@ public class ClusterQueryRouter implements IEngineQueryRouter {
@Override
public QueryDataSet aggregate(List<Path> selectedSeries, List<String> aggres,
IExpression expression, QueryContext context)
- throws QueryFilterOptimizationException, FileNodeManagerException, IOException, PathErrorException, ProcessorException {
+ throws FileNodeManagerException, PathErrorException, ProcessorException {
ClusterRpcSingleQueryManager queryManager = ClusterRpcQueryManager.getInstance()
.getSingleQuery(context.getJobId());
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/integration/IoTDBAggregationLargeDataIT.java b/cluster/src/test/java/org/apache/iotdb/cluster/integration/IoTDBAggregationLargeDataIT.java
index 45ab923..16e1a5d 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/integration/IoTDBAggregationLargeDataIT.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/integration/IoTDBAggregationLargeDataIT.java
@@ -350,7 +350,6 @@ public class IoTDBAggregationLargeDataIT {
resultSet.getString(TIMESTAMP_STR) + "," + Math.round(resultSet.getDouble(mean(d0s0)))
+ "," + Math.round(resultSet.getDouble(mean(d0s1))) + "," +
Math.round(resultSet.getDouble(mean(d0s2)));
- //System.out.println("!!!!!============ " + ans);
Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
@@ -384,7 +383,6 @@ public class IoTDBAggregationLargeDataIT {
while (resultSet.next()) {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(count(d0s0))
+ "," + resultSet.getString(count(d0s1)) + "," + resultSet.getString(count(d0s2));
- //System.out.println("!!!!!============ " + ans);
Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
@@ -482,7 +480,6 @@ public class IoTDBAggregationLargeDataIT {
.getString(min_value(d0s2))
+ "," + resultSet.getString(min_value(d0s3)) + "," + resultSet
.getString(min_value(d0s4));
- //System.out.println("============ " + ans);
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
@@ -523,7 +520,6 @@ public class IoTDBAggregationLargeDataIT {
.getString(max_value(d0s2))
+ "," + resultSet.getString(max_value(d0s3)) + "," + resultSet
.getString(max_value(d0s4));
- //System.out.println("============ " + ans);
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
@@ -561,7 +557,6 @@ public class IoTDBAggregationLargeDataIT {
+ "," +
Math.round(resultSet.getDouble(mean(d0s1))) + "," + Math
.round(resultSet.getDouble(mean(d0s2)));
- System.out.println("!!!!!============ " + ans);
Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
@@ -592,8 +587,6 @@ public class IoTDBAggregationLargeDataIT {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(sum(d0s0))
+ "," + resultSet.getString(sum(d0s1)) + "," + Math
.round(resultSet.getDouble(sum(d0s2)));
- //String ans = resultSet.getString(sum(d0s3));
- //System.out.println("!!!!!============ " + ans);
Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
@@ -609,7 +602,7 @@ public class IoTDBAggregationLargeDataIT {
}
}
- private void firstAggreWithMultiFilterTest() throws ClassNotFoundException, SQLException {
+ private void firstAggreWithMultiFilterTest() throws SQLException {
String[] retArray = new String[]{
"0,90,1101,2.22,ddddd,true"
};
@@ -628,8 +621,6 @@ public class IoTDBAggregationLargeDataIT {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(first(d0s0))
+ "," + resultSet.getString(first(d0s1)) + "," + resultSet.getString(first(d0s2))
+ "," + resultSet.getString(first(d0s3)) + "," + resultSet.getString(first(d0s4));
- //String ans = resultSet.getString(first(d0s3));
- //System.out.println("!!!!!============ " + ans);
Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
@@ -664,8 +655,6 @@ public class IoTDBAggregationLargeDataIT {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(count(d0s0))
+ "," + resultSet.getString(count(d0s1)) + "," + resultSet.getString(count(d0s2))
+ "," + resultSet.getString(count(d0s3)) + "," + resultSet.getString(count(d0s4));
- //String ans = resultSet.getString(count(d0s3));
- //System.out.println("!!!!!============ " + ans);
Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
@@ -703,7 +692,6 @@ public class IoTDBAggregationLargeDataIT {
resultSet.getString(Constant.min_time(d0s2)) + "," +
resultSet.getString(Constant.min_time(d0s3)) + "," +
resultSet.getString(Constant.min_time(d0s4));
- // System.out.println("============ " + ans);
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
@@ -719,7 +707,7 @@ public class IoTDBAggregationLargeDataIT {
}
}
- private void maxTimeAggreWithMultiFilterTest() throws ClassNotFoundException, SQLException {
+ private void maxTimeAggreWithMultiFilterTest() throws SQLException {
String[] retArray = new String[]{
"0,3999,3999,3999,3599,100"
};
@@ -739,7 +727,6 @@ public class IoTDBAggregationLargeDataIT {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(max_time(d0s0))
+ "," + resultSet.getString(max_time(d0s1)) + "," + resultSet.getString(max_time(d0s2))
+ "," + resultSet.getString(max_time(d0s3)) + "," + resultSet.getString(max_time(d0s4));
- //System.out.println("============ " + ans);
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
@@ -755,7 +742,7 @@ public class IoTDBAggregationLargeDataIT {
}
}
- private void minValueAggreWithMultiFilterTest() throws ClassNotFoundException, SQLException {
+ private void minValueAggreWithMultiFilterTest() throws SQLException {
String[] retArray = new String[]{
"0,0,0,0.0,B,true"
};
@@ -777,7 +764,6 @@ public class IoTDBAggregationLargeDataIT {
.getString(min_value(d0s2))
+ "," + resultSet.getString(min_value(d0s3)) + "," + resultSet
.getString(min_value(d0s4));
- //System.out.println("============ " + ans);
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
@@ -868,7 +854,6 @@ public class IoTDBAggregationLargeDataIT {
}
statement.execute("flush");
- System.out.println("cnt = " + cnt);
// insert large amount of data
for (int time = 3700; time < 4000; time++) {
@@ -894,9 +879,6 @@ public class IoTDBAggregationLargeDataIT {
statement.execute("merge");
- System.out.println("large insert cnt = " + cnt);
- System.out
- .println("d0s0sum = " + d0s0sum + "; d0s1sum = " + d0s1sum + "; d0s2sum = " + d0s2sum);
for (String sql : insertSql) {
statement.execute(sql);
}
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/integration/IoTDBFillQueryIT.java b/cluster/src/test/java/org/apache/iotdb/cluster/integration/IoTDBFillQueryIT.java
index f78c39a..4c905f9 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/integration/IoTDBFillQueryIT.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/integration/IoTDBFillQueryIT.java
@@ -151,7 +151,6 @@ public class IoTDBFillQueryIT {
while (resultSet.next()) {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(TEMPERATURE_STR)
+ "," + resultSet.getString(STATUS_STR) + "," + resultSet.getString(HARDWARE_STR);
- System.out.println(ans);
Assert.assertEquals(retArray1[cnt], ans);
cnt++;
}
@@ -169,7 +168,6 @@ public class IoTDBFillQueryIT {
+ "," + resultSet.getString(STATUS_STR) + "," + resultSet.getString(HARDWARE_STR);
Assert.assertEquals(retArray1[cnt], ans);
cnt++;
- System.out.println(ans);
}
statement.close();
@@ -185,7 +183,6 @@ public class IoTDBFillQueryIT {
+ "," + resultSet.getString(STATUS_STR) + "," + resultSet.getString(HARDWARE_STR);
Assert.assertEquals(retArray1[cnt], ans);
cnt++;
- System.out.println(ans);
}
statement.close();
@@ -199,7 +196,6 @@ public class IoTDBFillQueryIT {
while (resultSet.next()) {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(TEMPERATURE_STR)
+ "," + resultSet.getString(STATUS_STR) + "," + resultSet.getString(HARDWARE_STR);
- System.out.println(cnt + " " + ans);
Assert.assertEquals(retArray1[cnt], ans);
cnt++;
}
@@ -260,7 +256,6 @@ public class IoTDBFillQueryIT {
+ "," + resultSet.getString(STATUS_STR) + "," + resultSet.getString(HARDWARE_STR);
Assert.assertEquals(retArray1[cnt], ans);
cnt++;
- System.out.println(ans);
}
statement.close();
@@ -276,7 +271,6 @@ public class IoTDBFillQueryIT {
+ "," + resultSet.getString(STATUS_STR) + "," + resultSet.getString(HARDWARE_STR);
Assert.assertEquals(retArray1[cnt], ans);
cnt++;
- System.out.println(ans);
}
statement.close();
Assert.assertEquals(retArray1.length, cnt);
@@ -334,7 +328,6 @@ public class IoTDBFillQueryIT {
+ "," + resultSet.getString(STATUS_STR) + "," + resultSet.getString(HARDWARE_STR);
Assert.assertEquals(retArray1[cnt], ans);
cnt++;
- System.out.println(ans);
}
statement.close();
Assert.assertEquals(retArray1.length, cnt);
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/utils/hash/RouterTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/utils/hash/RouterTest.java
index f59bb35..5a515fe 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/utils/hash/RouterTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/utils/hash/RouterTest.java
@@ -64,10 +64,7 @@ public class RouterTest {
config.setNumOfVirtualNodes(numOfVirtulaNodes);
Router router = Router.getInstance();
router.init();
-// router.showPhysicalRing();
-// router.showVirtualRing();
String sg1 = "root.device.sensor";
-// System.out.println(function.hash(sg1));
assertTrue(router.routeNode(sg1).equals(new PhysicalNode("192.168.130.4", PORT)));
PhysicalNode[] expected1 = {
new PhysicalNode("192.168.130.4", PORT),
@@ -80,7 +77,6 @@ public class RouterTest {
assertEquals(Router.DATA_GROUP_STR + "0", router.getGroupID(router.routeGroup(sg1)));
String sg2 = "root.device.sensor2";
-// System.out.println(function.hash(sg2));
assertTrue(router.routeNode(sg2).equals(new PhysicalNode("192.168.130.3", PORT)));
PhysicalNode[] expected2 = {
new PhysicalNode("192.168.130.3", PORT),
@@ -105,11 +101,8 @@ public class RouterTest {
Router router = Router.getInstance();
router.init();
-// router.showPhysicalRing();
-// router.showVirtualRing();
String sg1 = "root.device.sensor";
-// System.out.println(function.hash(sg1));
- assertTrue(router.routeNode(sg1).equals(new PhysicalNode("192.168.130.3", PORT)));
+ assertEquals(router.routeNode(sg1), new PhysicalNode("192.168.130.3", PORT));
PhysicalNode[] expected1 = {
new PhysicalNode("192.168.130.3", PORT),
new PhysicalNode("192.168.130.2", PORT),
@@ -121,8 +114,7 @@ public class RouterTest {
assertEquals(Router.DATA_GROUP_STR + "0", router.getGroupID(router.routeGroup(sg1)));
String sg2 = "root.vehicle.d1";
-// System.out.println(function.hash(sg2));
- assertTrue(router.routeNode(sg2).equals(new PhysicalNode("192.168.130.2", PORT)));
+ assertEquals(router.routeNode(sg2), new PhysicalNode("192.168.130.2", PORT));
PhysicalNode[] expected2 = {
new PhysicalNode("192.168.130.2", PORT),
new PhysicalNode("192.168.130.1", PORT),
@@ -149,7 +141,6 @@ public class RouterTest {
Router router = Router.getInstance();
router.init();
-// router.showPhysicalRing();
String[][][] ipIndex = {
{
{"192.168.130.1", "192.168.130.3", "192.168.130.4",},
@@ -195,7 +186,6 @@ public class RouterTest {
Router router = Router.getInstance();
router.init();
-// router.showPhysicalRing();
String[][][] ipIndex = {
{
{"192.168.130.1", "192.168.130.3", "192.168.130.2",},
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java
index e2688ba..af74bf6 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java
@@ -108,7 +108,7 @@ public class GroupByWithOnlyTimeFilterDataSet extends GroupByEngineDataSet {
hasCachedTimeInterval = false;
RowRecord record = new RowRecord(startTime);
for (int i = 0; i < functions.size(); i++) {
- AggreResultData res = null;
+ AggreResultData res;
try {
res = nextSeries(i);
} catch (ProcessorException e) {
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
index d0f782d..206eeba 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
@@ -318,7 +318,6 @@ public class IoTDBAggregationLargeDataIT {
resultSet.getString(TIMESTAMP_STR) + "," + Math.round(resultSet.getDouble(mean(d0s0)))
+ "," + Math.round(resultSet.getDouble(mean(d0s1))) + "," +
Math.round(resultSet.getDouble(mean(d0s2)));
- //System.out.println("!!!!!============ " + ans);
Assert.assertEquals(retArray[cnt], ans);
cnt++;
}
@@ -352,7 +351,6 @@ public class IoTDBAggregationLargeDataIT {
while (resultSet.next()) {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(count(d0s0))
+ "," + resultSet.getString(count(d0s1)) + "," + resultSet.getString(count(d0s2));
- //System.out.println("!!!!!============ " + ans);
Assert.assertEquals(retArray[cnt], ans);
cnt++;
}