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/05/19 11:15:58 UTC
[iotdb] branch iotdb-1022-v2 updated (b96061b -> 996e3da)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch iotdb-1022-v2
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from b96061b remove a dependency in pom.xml
new 923485b fix ClusterPhysicalGenerator
new 996e3da fix IoTDBAsIT
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/iotdb/cluster/query/ClusterPhysicalGenerator.java | 4 ++--
.../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 +-
6 files changed, 7 insertions(+), 27 deletions(-)
[iotdb] 02/02: fix IoTDBAsIT
Posted by ro...@apache.org.
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 <st...@outlook.com>
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);
[iotdb] 01/02: fix ClusterPhysicalGenerator
Posted by ro...@apache.org.
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 923485b1230f184a13ca3aa4f0933b54ce004602
Author: SteveYurongSu <st...@outlook.com>
AuthorDate: Wed May 19 17:43:12 2021 +0800
fix ClusterPhysicalGenerator
---
.../java/org/apache/iotdb/cluster/query/ClusterPhysicalGenerator.java | 4 ++--
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPhysicalGenerator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPhysicalGenerator.java
index ce620fa..9e5e740 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPhysicalGenerator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPhysicalGenerator.java
@@ -64,12 +64,12 @@ public class ClusterPhysicalGenerator extends PhysicalGenerator {
}
@Override
- protected List<TSDataType> getSeriesTypes(List<PartialPath> paths) throws MetadataException {
+ public List<TSDataType> getSeriesTypes(List<PartialPath> paths) throws MetadataException {
return getCMManager().getSeriesTypesByPaths(paths, null).left;
}
@Override
- protected Pair<List<PartialPath>, Map<String, Integer>> getSeriesSchema(List<PartialPath> paths)
+ public Pair<List<PartialPath>, Map<String, Integer>> getSeriesSchema(List<PartialPath> paths)
throws MetadataException {
return getCMManager().getSeriesSchemas(paths);
}
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 2ab39c9..7aa0346 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,7 +579,8 @@ public class IoTDBAsIT {
for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
builder.append(resultSet.getString(i)).append(",");
}
- assertEquals(retArray[cnt], builder.toString());
+ System.out.println(builder.toString());
+ // assertEquals(retArray[cnt], builder.toString());
cnt++;
}
assertEquals(retArray.length, cnt);