You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by GitBox <gi...@apache.org> on 2020/10/06 08:26:04 UTC
[GitHub] [iotdb] HTHou commented on a change in pull request #1751: [IOTDB-902] Order by time desc aggregation bug
HTHou commented on a change in pull request #1751:
URL: https://github.com/apache/iotdb/pull/1751#discussion_r500080227
##########
File path: server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationAlignByDeviceIT.java
##########
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.iotdb.db.integration;
-
-import static org.apache.iotdb.db.constant.TestConstant.count;
-import static org.junit.Assert.fail;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import org.apache.iotdb.db.utils.EnvironmentUtils;
-import org.apache.iotdb.jdbc.Config;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IoTDBAggregationAlignByDeviceIT {
-
Review comment:
I don't get the reason why you remove this IT?
##########
File path: server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
##########
@@ -370,27 +451,70 @@ private void minMaxTimeAggreWithSingleFilterTest() throws ClassNotFoundException
resultSet.close();
}
- retArray = new String[]{
- "0,3999,3999,3999,3599,100"
- };
hasResultSet = statement.execute("select max_time(s0),max_time(s1),max_time(s2),"
+ "max_time(s3),max_time(s4) from root.vehicle.d0 " +
"where s1 < 50000 and s1 != 100");
Assert.assertTrue(hasResultSet);
resultSet = statement.getResultSet();
+ try {
+ while (resultSet.next()) {
+ 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));
+ Assert.assertEquals(ans, retArray[cnt]);
+ cnt++;
+ }
+ Assert.assertEquals(2, cnt);
+ } finally {
+ resultSet.close();
+ }
+
+ // keep the correctness of `order by time desc`
+ hasResultSet = statement.execute(
+ "select min_time(s0),min_time(s1),min_time(s2),min_time(s3),min_time(s4)" +
+ " from root.vehicle.d0 where s1 >= 0 order by time desc");
+ Assert.assertTrue(hasResultSet);
+ resultSet = statement.getResultSet();
cnt = 0;
try {
while (resultSet.next()) {
- 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));
+ String ans = resultSet.getString(TIMESTAMP_STR) + "," +
+ resultSet.getString(min_time(d0s0)) + "," +
+ resultSet.getString(min_time(d0s1)) + "," +
+ resultSet.getString(min_time(d0s2)) +
+ "," + resultSet.getString(min_time(d0s3)) +
+ "," + resultSet.getString(min_time(d0s4));
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
Assert.assertEquals(1, cnt);
} finally {
resultSet.close();
}
Review comment:
Same as above
##########
File path: server/src/test/java/org/apache/iotdb/db/query/aggregation/AggregateResultTest.java
##########
@@ -36,9 +36,9 @@
@Test
public void avgAggrResultTest() throws QueryProcessException, IOException {
AggregateResult avgAggrResult1 = AggregateResultFactory
- .getAggrResultByName(SQLConstant.AVG, TSDataType.DOUBLE);
+ .getAggrResultByName(SQLConstant.AVG, TSDataType.DOUBLE,true);
Review comment:
```suggestion
.getAggrResultByName(SQLConstant.AVG, TSDataType.DOUBLE, true);
```
##########
File path: server/src/test/java/org/apache/iotdb/db/query/aggregation/AggregateResultTest.java
##########
@@ -36,9 +36,9 @@
@Test
public void avgAggrResultTest() throws QueryProcessException, IOException {
AggregateResult avgAggrResult1 = AggregateResultFactory
- .getAggrResultByName(SQLConstant.AVG, TSDataType.DOUBLE);
+ .getAggrResultByName(SQLConstant.AVG, TSDataType.DOUBLE,true);
AggregateResult avgAggrResult2 = AggregateResultFactory
- .getAggrResultByName(SQLConstant.AVG, TSDataType.DOUBLE);
+ .getAggrResultByName(SQLConstant.AVG, TSDataType.DOUBLE,true);
Review comment:
```suggestion
.getAggrResultByName(SQLConstant.AVG, TSDataType.DOUBLE, true);
```
##########
File path: server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
##########
@@ -357,11 +438,11 @@ private void minMaxTimeAggreWithSingleFilterTest() throws ClassNotFoundException
try {
while (resultSet.next()) {
String ans = resultSet.getString(TIMESTAMP_STR) + "," +
- resultSet.getString(min_time(d0s0)) + "," +
- resultSet.getString(min_time(d0s1)) + "," +
- resultSet.getString(min_time(d0s2)) +
- "," + resultSet.getString(min_time(d0s3)) +
- "," + resultSet.getString(min_time(d0s4));
+ resultSet.getString(min_time(d0s0)) + "," +
+ resultSet.getString(min_time(d0s1)) + "," +
+ resultSet.getString(min_time(d0s2)) +
+ "," + resultSet.getString(min_time(d0s3)) +
+ "," + resultSet.getString(min_time(d0s4));
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
Review comment:
Better to use try with resource reduce code smell...
##########
File path: server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
##########
@@ -370,27 +451,70 @@ private void minMaxTimeAggreWithSingleFilterTest() throws ClassNotFoundException
resultSet.close();
}
- retArray = new String[]{
- "0,3999,3999,3999,3599,100"
- };
hasResultSet = statement.execute("select max_time(s0),max_time(s1),max_time(s2),"
+ "max_time(s3),max_time(s4) from root.vehicle.d0 " +
"where s1 < 50000 and s1 != 100");
Assert.assertTrue(hasResultSet);
resultSet = statement.getResultSet();
+ try {
+ while (resultSet.next()) {
+ 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));
+ Assert.assertEquals(ans, retArray[cnt]);
+ cnt++;
+ }
+ Assert.assertEquals(2, cnt);
+ } finally {
+ resultSet.close();
+ }
+
+ // keep the correctness of `order by time desc`
+ hasResultSet = statement.execute(
+ "select min_time(s0),min_time(s1),min_time(s2),min_time(s3),min_time(s4)" +
+ " from root.vehicle.d0 where s1 >= 0 order by time desc");
+ Assert.assertTrue(hasResultSet);
+ resultSet = statement.getResultSet();
cnt = 0;
try {
while (resultSet.next()) {
- 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));
+ String ans = resultSet.getString(TIMESTAMP_STR) + "," +
+ resultSet.getString(min_time(d0s0)) + "," +
+ resultSet.getString(min_time(d0s1)) + "," +
+ resultSet.getString(min_time(d0s2)) +
+ "," + resultSet.getString(min_time(d0s3)) +
+ "," + resultSet.getString(min_time(d0s4));
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
Assert.assertEquals(1, cnt);
} finally {
resultSet.close();
}
+
+ hasResultSet = statement.execute("select max_time(s0),max_time(s1),max_time(s2),"
+ + "max_time(s3),max_time(s4) from root.vehicle.d0 " +
+ "where s1 < 50000 and s1 != 100 order by time desc");
+ Assert.assertTrue(hasResultSet);
+ resultSet = statement.getResultSet();
+ try {
+ while (resultSet.next()) {
+ 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));
+ Assert.assertEquals(ans, retArray[cnt]);
+ cnt++;
+ }
+ Assert.assertEquals(2, cnt);
+ } finally {
+ resultSet.close();
+ }
Review comment:
Same...
##########
File path: server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
##########
@@ -416,12 +540,35 @@ private void minValueAggreWithSingleFilterTest() throws ClassNotFoundException,
try {
while (resultSet.next()) {
String ans =
- resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(min_value(d0s0))
- + "," + resultSet.getString(min_value(d0s1)) + "," + resultSet
- .getString(min_value(d0s2))
- + "," + resultSet.getString(min_value(d0s3)) + "," + resultSet
- .getString(min_value(d0s4));
- //System.out.println("============ " + ans);
+ resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(min_value(d0s0))
+ + "," + resultSet.getString(min_value(d0s1)) + "," + resultSet
+ .getString(min_value(d0s2))
+ + "," + resultSet.getString(min_value(d0s3)) + "," + resultSet
+ .getString(min_value(d0s4));
+ Assert.assertEquals(ans, retArray[cnt]);
+ cnt++;
+ }
+ Assert.assertEquals(1, cnt);
+ } finally {
+ resultSet.close();
+ }
Review comment:
Same...
There are a lot of `try finally`, better to fix them together.
##########
File path: server/src/test/java/org/apache/iotdb/db/query/aggregation/AggregateResultTest.java
##########
@@ -62,9 +62,9 @@ public void avgAggrResultTest() throws QueryProcessException, IOException {
@Test
public void maxValueAggrResultTest() throws QueryProcessException, IOException {
AggregateResult maxValueAggrResult1 = AggregateResultFactory
- .getAggrResultByName(SQLConstant.MAX_VALUE, TSDataType.DOUBLE);
+ .getAggrResultByName(SQLConstant.MAX_VALUE, TSDataType.DOUBLE,true);
Review comment:
```suggestion
.getAggrResultByName(SQLConstant.MAX_VALUE, TSDataType.DOUBLE, true);
```
##########
File path: server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
##########
@@ -370,27 +451,70 @@ private void minMaxTimeAggreWithSingleFilterTest() throws ClassNotFoundException
resultSet.close();
}
- retArray = new String[]{
- "0,3999,3999,3999,3599,100"
- };
hasResultSet = statement.execute("select max_time(s0),max_time(s1),max_time(s2),"
+ "max_time(s3),max_time(s4) from root.vehicle.d0 " +
"where s1 < 50000 and s1 != 100");
Assert.assertTrue(hasResultSet);
resultSet = statement.getResultSet();
+ try {
+ while (resultSet.next()) {
+ 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));
+ Assert.assertEquals(ans, retArray[cnt]);
+ cnt++;
+ }
+ Assert.assertEquals(2, cnt);
+ } finally {
+ resultSet.close();
+ }
Review comment:
```suggestion
try (resultSet = statement.getResultSet()) {
while (resultSet.next()) {
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));
Assert.assertEquals(ans, retArray[cnt]);
cnt++;
}
Assert.assertEquals(2, cnt);
}
```
##########
File path: server/src/test/java/org/apache/iotdb/db/query/aggregation/AggregateResultTest.java
##########
@@ -62,9 +62,9 @@ public void avgAggrResultTest() throws QueryProcessException, IOException {
@Test
public void maxValueAggrResultTest() throws QueryProcessException, IOException {
AggregateResult maxValueAggrResult1 = AggregateResultFactory
- .getAggrResultByName(SQLConstant.MAX_VALUE, TSDataType.DOUBLE);
+ .getAggrResultByName(SQLConstant.MAX_VALUE, TSDataType.DOUBLE,true);
AggregateResult maxValueAggrResult2 = AggregateResultFactory
- .getAggrResultByName(SQLConstant.MAX_VALUE, TSDataType.DOUBLE);
+ .getAggrResultByName(SQLConstant.MAX_VALUE, TSDataType.DOUBLE,true);
Review comment:
```suggestion
.getAggrResultByName(SQLConstant.MAX_VALUE, TSDataType.DOUBLE, true);
```
##########
File path: tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/GroupByFilter.java
##########
@@ -65,7 +65,7 @@ public boolean satisfyStartEndTime(long startTime, long endTime) {
return false;
else if (startTime <= this.startTime)
return true;
Review comment:
Change to `<` here?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org