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 996e3da97a46799c390c8765de3b94efadc57be6 Author: SteveYurongSu <[email protected]> AuthorDate: Wed May 19 19:15:13 2021 +0800 fix IoTDBAsIT --- .../org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java | 9 --------- .../java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java | 8 +++----- .../java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java | 9 --------- .../org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java | 2 +- .../main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 2 +- .../src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java | 3 +-- 6 files changed, 6 insertions(+), 27 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..4e44e81 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 @@ -112,15 +112,6 @@ 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; - } - - @Override public String getColumnForDisplay(String columnForReader, int pathIndex) throws IllegalPathException { String columnForDisplay = columnForReader; 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..9be5527 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 @@ -21,7 +21,6 @@ package org.apache.iotdb.db.qp.physical.crud; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.PartialPath; import org.apache.iotdb.db.qp.logical.Operator; import org.apache.iotdb.db.qp.strategy.PhysicalGenerator; import org.apache.iotdb.db.service.IoTDB; @@ -45,12 +44,11 @@ public class LastQueryPlan extends RawDataQueryPlan { @Override public void deduplicate(PhysicalGenerator physicalGenerator) throws MetadataException { Set<String> columnForReaderSet = new HashSet<>(); - for (int i = 0; i < paths.size(); i++) { - PartialPath path = paths.get(i); - String column = getColumnForReaderFromPath(path, i); + for (int i = 0; i < resultColumns.size(); i++) { + String column = resultColumns.get(i).getResultColumnName(); if (!columnForReaderSet.contains(column)) { TSDataType seriesType = dataTypes.get(i); - addDeduplicatedPaths(path); + addDeduplicatedPaths(paths.get(i)); addDeduplicatedDataTypes(seriesType); columnForReaderSet.add(column); } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java index 6bd6ce4..f3af68c 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java @@ -127,15 +127,6 @@ public abstract class QueryPlan extends PhysicalPlan { this.ascending = ascending; } - public String getColumnForReaderFromPath(PartialPath path, int pathIndex) { - String columnForReader = path.isTsAliasExists() ? path.getTsAlias() : null; - if (columnForReader == null) { - columnForReader = - path.isMeasurementAliasExists() ? path.getFullPathWithAlias() : path.toString(); - } - return columnForReader; - } - public String getColumnForDisplay(String columnForReader, int pathIndex) throws IllegalPathException { return resultColumns.get(pathIndex).getResultColumnName(); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java index 74b6b25..ba517f5 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java @@ -75,7 +75,7 @@ public class RawDataQueryPlan extends QueryPlan { PartialPath originalPath = indexedPath.left; Integer originalIndex = indexedPath.right; - String columnForReader = getColumnForReaderFromPath(originalPath, originalIndex); + String columnForReader = resultColumns.get(originalIndex).getResultColumnName(); if (!columnForReaderSet.contains(columnForReader)) { addDeduplicatedPaths(originalPath); addDeduplicatedDataTypes(dataTypes.get(originalIndex)); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java index bd2cc94..3216ab0 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java @@ -84,7 +84,7 @@ public class UDTFPlan extends RawDataQueryPlan implements UDFPlan { boolean isUdf = !(resultColumns.get(originalIndex).getExpression() instanceof TimeSeriesOperand); - String columnForReader = getColumnForReaderFromPath(originalPath, originalIndex); + String columnForReader = resultColumns.get(originalIndex).getResultColumnName(); if (!columnForReaderSet.contains(columnForReader)) { addDeduplicatedPaths(originalPath); addDeduplicatedDataTypes( 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);
