This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch iotdb-1022-v2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1b8e22055e8995b80c91fd4f3edd90c3359f8e09 Author: SteveYurongSu <[email protected]> AuthorDate: Wed May 19 20:08:38 2021 +0800 fix aggregation with alias tests --- .../java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java | 6 +----- .../java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java | 4 +--- server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java | 3 +-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java index 8a26610..ee98f49 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java @@ -113,11 +113,7 @@ public class AggregationPlan extends RawDataQueryPlan { @Override public String getColumnForReaderFromPath(PartialPath path, int pathIndex) { - String columnForReader = super.getColumnForReaderFromPath(path, pathIndex); - if (!path.isTsAliasExists()) { - columnForReader = this.getAggregations().get(pathIndex) + "(" + columnForReader + ")"; - } - return columnForReader; + return resultColumns.get(pathIndex).getResultColumnName(); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java index 553feeb..dc09cec 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java @@ -71,9 +71,7 @@ public class LastQueryPlan extends RawDataQueryPlan { private boolean isValidExpression(IExpression expression) { if (expression instanceof GlobalTimeExpression) { Filter filter = ((GlobalTimeExpression) expression).getFilter(); - if (filter instanceof TimeGtEq || filter instanceof TimeGt) { - return true; - } + return filter instanceof TimeGtEq || filter instanceof TimeGt; } return false; } diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java index 7aa0346..2ab39c9 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java @@ -579,8 +579,7 @@ public class IoTDBAsIT { for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) { builder.append(resultSet.getString(i)).append(","); } - System.out.println(builder.toString()); - // assertEquals(retArray[cnt], builder.toString()); + assertEquals(retArray[cnt], builder.toString()); cnt++; } assertEquals(retArray.length, cnt);
