You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/12/11 13:11:24 UTC
[iotdb] branch master updated: [IOTDB-1050] Fix Count timeserise
column name is wrong (#2238)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 9431e53 [IOTDB-1050] Fix Count timeserise column name is wrong (#2238)
9431e53 is described below
commit 9431e538423745cdeaebf19626689b888a87f7a9
Author: Boris <ge...@apache.org>
AuthorDate: Fri Dec 11 21:11:14 2020 +0800
[IOTDB-1050] Fix Count timeserise column name is wrong (#2238)
---
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../db/query/dataset/ShowTimeseriesDataSet.java | 7 +-
.../iotdb/db/query/dataset/ListDataSetTest.java | 126 +++++++++++++++++++
.../iotdb/db/query/dataset/SingleDataSetTest.java | 133 +++++++++++++++++++++
4 files changed, 263 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index bbbb1b4..68497de 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -523,7 +523,7 @@ public class PlanExecutor implements IPlanExecutor {
private QueryDataSet processCountTimeSeries(CountPlan countPlan) throws MetadataException {
int num = getPathsNum(countPlan.getPath());
- return createSingleDataSet(COLUMN_CHILD_PATHS, TSDataType.INT32, num);
+ return createSingleDataSet(COLUMN_COUNT, TSDataType.INT32, num);
}
private QueryDataSet processShowDevices(ShowDevicesPlan showDevicesPlan)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
index fee1a59..0a32b75 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
@@ -37,7 +37,6 @@ import java.util.stream.Collectors;
import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.qp.physical.sys.ShowTimeSeriesPlan;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -52,11 +51,11 @@ public class ShowTimeseriesDataSet extends QueryDataSet {
private final ShowTimeSeriesPlan plan;
private List<RowRecord> result = new ArrayList<>();
private int index = 0;
- private QueryContext context;
+ private final QueryContext context;
public boolean hasLimit;
- private static Path[] resourcePaths = {new PartialPath(COLUMN_TIMESERIES, false),
+ private static final Path[] resourcePaths = {new PartialPath(COLUMN_TIMESERIES, false),
new PartialPath(COLUMN_TIMESERIES_ALIAS, false),
new PartialPath(COLUMN_STORAGE_GROUP, false),
new PartialPath(COLUMN_TIMESERIES_DATATYPE, false),
@@ -64,7 +63,7 @@ public class ShowTimeseriesDataSet extends QueryDataSet {
new PartialPath(COLUMN_TIMESERIES_COMPRESSION, false),
new PartialPath(COLUMN_TAGS, false),
new PartialPath(COLUMN_ATTRIBUTES, false)};
- private static TSDataType[] resourceTypes = {TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT,
+ private static final TSDataType[] resourceTypes = {TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT,
TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT};
public ShowTimeseriesDataSet(ShowTimeSeriesPlan showTimeSeriesPlan, QueryContext context)
diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java
new file mode 100644
index 0000000..f03209b
--- /dev/null
+++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.query.dataset;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import org.apache.iotdb.db.exception.StorageEngineException;
+import org.apache.iotdb.db.exception.metadata.MetadataException;
+import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.qp.Planner;
+import org.apache.iotdb.db.qp.executor.IPlanExecutor;
+import org.apache.iotdb.db.qp.executor.PlanExecutor;
+import org.apache.iotdb.db.qp.physical.PhysicalPlan;
+import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
+import org.apache.iotdb.tsfile.read.common.RowRecord;
+import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
+import org.apache.thrift.TException;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ListDataSetTest {
+
+ private final IPlanExecutor queryExecutor = new PlanExecutor();
+ private final Planner processor = new Planner();
+
+ private final String[] sqls = {
+ "SET STORAGE GROUP TO root.vehicle",
+ "SET STORAGE GROUP TO root.test",
+ "CREATE TIMESERIES root.vehicle.d0.s0 WITH DATATYPE=INT32, ENCODING=RLE",
+ "CREATE TIMESERIES root.vehicle.d0.s1 WITH DATATYPE=TEXT, ENCODING=PLAIN",
+ "CREATE TIMESERIES root.test.d0.s0 WITH DATATYPE=INT32, ENCODING=RLE",
+ "CREATE TIMESERIES root.test.d0.s1 WITH DATATYPE=TEXT, ENCODING=PLAIN",
+ "CREATE TIMESERIES root.test.d1.\"s3.xy\" WITH DATATYPE=TEXT, ENCODING=PLAIN"};
+
+ public ListDataSetTest() throws QueryProcessException {
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ EnvironmentUtils.envSetUp();
+ for (String sql : sqls) {
+ queryExecutor.processNonQuery(processor.parseSQLToPhysicalPlan(sql));
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ EnvironmentUtils.cleanEnv();
+ }
+
+ @Test
+ public void showStorageGroups()
+ throws QueryProcessException, TException, StorageEngineException, QueryFilterOptimizationException, MetadataException, IOException, InterruptedException, SQLException {
+ String[] results = new String [] {"0\troot.test", "0\troot.vehicle"};
+ PhysicalPlan plan = processor
+ .parseSQLToPhysicalPlan(
+ "show storage group");
+ QueryDataSet dataSet = queryExecutor
+ .processQuery(plan, EnvironmentUtils.TEST_QUERY_CONTEXT);
+ Assert.assertTrue(dataSet instanceof ListDataSet);
+ Assert.assertEquals("[storage group]", dataSet.getPaths().toString());
+ int i = 0;
+ while (dataSet.hasNext()) {
+ RowRecord record = dataSet.next();
+ Assert.assertEquals(results[i], record.toString());
+ i++;
+ }
+ }
+
+ @Test
+ public void showChildPaths()
+ throws QueryProcessException, TException, StorageEngineException, QueryFilterOptimizationException, MetadataException, IOException, InterruptedException, SQLException {
+ String[] results = new String [] {"0\troot.test.d0", "0\troot.test.d1"};
+ PhysicalPlan plan = processor
+ .parseSQLToPhysicalPlan(
+ "show child paths root.test");
+ QueryDataSet dataSet = queryExecutor
+ .processQuery(plan, EnvironmentUtils.TEST_QUERY_CONTEXT);
+ Assert.assertTrue(dataSet instanceof ListDataSet);
+ Assert.assertEquals("[child paths]", dataSet.getPaths().toString());
+ int i = 0;
+ while (dataSet.hasNext()) {
+ RowRecord record = dataSet.next();
+ Assert.assertEquals(results[i], record.toString());
+ i++;
+ }
+ }
+
+ @Test
+ public void showDevices()
+ throws QueryProcessException, TException, StorageEngineException, QueryFilterOptimizationException, MetadataException, IOException, InterruptedException, SQLException {
+ String[] results = new String [] {"0\troot.test.d0", "0\troot.test.d1", "0\troot.vehicle.d0"};
+ PhysicalPlan plan = processor
+ .parseSQLToPhysicalPlan(
+ "show devices");
+ QueryDataSet dataSet = queryExecutor
+ .processQuery(plan, EnvironmentUtils.TEST_QUERY_CONTEXT);
+ Assert.assertTrue(dataSet instanceof ListDataSet);
+ Assert.assertEquals("[devices]", dataSet.getPaths().toString());
+ int i = 0;
+ while (dataSet.hasNext()) {
+ RowRecord record = dataSet.next();
+ Assert.assertEquals(results[i], record.toString());
+ i++;
+ }
+ }
+}
diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/SingleDataSetTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/SingleDataSetTest.java
new file mode 100644
index 0000000..f2cc8c8
--- /dev/null
+++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/SingleDataSetTest.java
@@ -0,0 +1,133 @@
+/*
+ * 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.query.dataset;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import org.apache.iotdb.db.exception.StorageEngineException;
+import org.apache.iotdb.db.exception.metadata.MetadataException;
+import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.qp.Planner;
+import org.apache.iotdb.db.qp.executor.IPlanExecutor;
+import org.apache.iotdb.db.qp.executor.PlanExecutor;
+import org.apache.iotdb.db.qp.physical.PhysicalPlan;
+import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
+import org.apache.iotdb.tsfile.read.common.RowRecord;
+import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
+import org.apache.thrift.TException;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SingleDataSetTest {
+ private final IPlanExecutor queryExecutor = new PlanExecutor();
+ private final Planner processor = new Planner();
+
+ private final String[] sqls = {
+ "SET STORAGE GROUP TO root.vehicle",
+ "SET STORAGE GROUP TO root.test",
+ "CREATE TIMESERIES root.vehicle.d0.s0 WITH DATATYPE=INT32, ENCODING=RLE",
+ "CREATE TIMESERIES root.vehicle.d0.s1 WITH DATATYPE=TEXT, ENCODING=PLAIN",
+ "CREATE TIMESERIES root.test.d0.s0 WITH DATATYPE=INT32, ENCODING=RLE",
+ "CREATE TIMESERIES root.test.d0.s1 WITH DATATYPE=TEXT, ENCODING=PLAIN",
+ "CREATE TIMESERIES root.test.d1.\"s3.xy\" WITH DATATYPE=TEXT, ENCODING=PLAIN"};
+
+ public SingleDataSetTest() throws QueryProcessException {
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ EnvironmentUtils.envSetUp();
+ for (String sql : sqls) {
+ queryExecutor.processNonQuery(processor.parseSQLToPhysicalPlan(sql));
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ EnvironmentUtils.cleanEnv();
+ }
+
+ @Test
+ public void countDevice()
+ throws QueryProcessException, TException, StorageEngineException, QueryFilterOptimizationException, MetadataException, IOException, InterruptedException, SQLException {
+ PhysicalPlan plan = processor
+ .parseSQLToPhysicalPlan(
+ "count devices");
+ QueryDataSet dataSet = queryExecutor
+ .processQuery(plan, EnvironmentUtils.TEST_QUERY_CONTEXT);
+ Assert.assertTrue(dataSet instanceof SingleDataSet);
+ Assert.assertEquals("[devices]", dataSet.getPaths().toString());
+ while (dataSet.hasNext()) {
+ RowRecord record = dataSet.next();
+ Assert.assertEquals("0\t3", record.toString());
+ }
+ }
+
+ @Test
+ public void countTimeSeries()
+ throws QueryProcessException, TException, StorageEngineException, QueryFilterOptimizationException, MetadataException, IOException, InterruptedException, SQLException {
+ PhysicalPlan plan = processor
+ .parseSQLToPhysicalPlan(
+ "count TimeSeries");
+ QueryDataSet dataSet = queryExecutor
+ .processQuery(plan, EnvironmentUtils.TEST_QUERY_CONTEXT);
+ Assert.assertTrue(dataSet instanceof SingleDataSet);
+ Assert.assertEquals("[count]", dataSet.getPaths().toString());
+ while (dataSet.hasNext()) {
+ RowRecord record = dataSet.next();
+ Assert.assertEquals("0\t5", record.toString());
+ }
+ }
+
+ @Test
+ public void countStorageGroup()
+ throws TException, StorageEngineException, QueryFilterOptimizationException, MetadataException, IOException, InterruptedException, SQLException, QueryProcessException {
+ PhysicalPlan plan = processor
+ .parseSQLToPhysicalPlan(
+ "count storage group");
+ QueryDataSet dataSet = queryExecutor
+ .processQuery(plan, EnvironmentUtils.TEST_QUERY_CONTEXT);
+ Assert.assertTrue(dataSet instanceof SingleDataSet);
+ Assert.assertEquals("[storage group]", dataSet.getPaths().toString());
+ while (dataSet.hasNext()) {
+ RowRecord record = dataSet.next();
+ Assert.assertEquals("0\t2", record.toString());
+ }
+ }
+
+ @Test
+ public void countNodes()
+ throws QueryProcessException, TException, StorageEngineException, QueryFilterOptimizationException, MetadataException, IOException, InterruptedException, SQLException {
+ PhysicalPlan plan = processor
+ .parseSQLToPhysicalPlan(
+ "count nodes root.test level=2");
+ QueryDataSet dataSet = queryExecutor
+ .processQuery(plan, EnvironmentUtils.TEST_QUERY_CONTEXT);
+ Assert.assertTrue(dataSet instanceof SingleDataSet);
+ Assert.assertEquals("[count]", dataSet.getPaths().toString());
+ while (dataSet.hasNext()) {
+ RowRecord record = dataSet.next();
+ Assert.assertEquals("0\t2", record.toString());
+ }
+ }
+
+}