You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/08/24 06:50:41 UTC
[iotdb] branch lmh/lastValueDebug013 created (now dac0c52bd9)
This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch lmh/lastValueDebug013
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at dac0c52bd9 fix bug
This branch includes the following new commits:
new dac0c52bd9 fix bug
The 1 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.
[iotdb] 01/01: fix bug
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/lastValueDebug013
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dac0c52bd967da69aed138d43a6ea521574bace3
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Wed Aug 24 14:49:56 2022 +0800
fix bug
---
.../aggregation/IoTDBAggregationScanOrderIT.java | 192 +++++++++++++++++++++
.../db/query/executor/AggregationExecutor.java | 4 +
2 files changed, 196 insertions(+)
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationScanOrderIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationScanOrderIT.java
new file mode 100644
index 0000000000..c65a0c8ca4
--- /dev/null
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationScanOrderIT.java
@@ -0,0 +1,192 @@
+/*
+ * 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.aggregation;
+
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.integration.env.EnvFactory;
+import org.apache.iotdb.jdbc.Config;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import static org.apache.iotdb.db.constant.TestConstant.firstValue;
+import static org.apache.iotdb.db.constant.TestConstant.lastValue;
+import static org.junit.Assert.fail;
+
+public class IoTDBAggregationScanOrderIT {
+
+ protected static boolean enableSeqSpaceCompaction;
+ protected static boolean enableUnseqSpaceCompaction;
+ protected static boolean enableCrossSpaceCompaction;
+
+ private static final String[] sqls =
+ new String[] {
+ "insert into root.sg1.d1(time, s1) values (12, 12);",
+ "flush;",
+ "insert into root.sg1.d1(time, s2) values (30, 30);",
+ "flush;",
+ "insert into root.sg1.d1(time, s1) values (0, 0);",
+ "insert into root.sg1.d1(time, s1) values (8, 8);",
+ "flush;",
+ "insert into root.sg1.d1(time, s1) values (0, 0);",
+ "insert into root.sg1.d1(time, s1) values (10, 10);",
+ "flush;",
+ "insert into root.sg1.d1(time, s1) values (17, 17);",
+ "insert into root.sg1.d1(time, s1) values (20, 20);",
+ "flush;",
+ "insert into root.sg1.d2(time, s1) aligned values (12, 12);",
+ "flush;",
+ "insert into root.sg1.d2(time, s2) aligned values (30, 30);",
+ "flush;",
+ "insert into root.sg1.d2(time, s1) aligned values (0, 0);",
+ "insert into root.sg1.d2(time, s1) aligned values (8, 8);",
+ "flush;",
+ "insert into root.sg1.d2(time, s1) aligned values (0, 0);",
+ "insert into root.sg1.d2(time, s1) aligned values (10, 10);",
+ "flush;",
+ "insert into root.sg1.d2(time, s1) aligned values (17, 17);",
+ "insert into root.sg1.d2(time, s1) aligned values (20, 20);",
+ "flush;"
+ };
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ EnvFactory.getEnv().initBeforeClass();
+ enableSeqSpaceCompaction =
+ IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
+ enableUnseqSpaceCompaction =
+ IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
+ enableCrossSpaceCompaction =
+ IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
+
+ insertSQL();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
+ IoTDBDescriptor.getInstance()
+ .getConfig()
+ .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction);
+ IoTDBDescriptor.getInstance()
+ .getConfig()
+ .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction);
+ EnvFactory.getEnv().cleanAfterClass();
+ }
+
+ @Test
+ public void test() throws ClassNotFoundException {
+ String expectedRet = "0.0,20.0";
+ String d1s1 = "root.sg1.d1.s1";
+
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ boolean hasResultSet =
+ statement.execute("select first_value(s1), last_value(s1) from root.sg1.d1;");
+
+ Assert.assertTrue(hasResultSet);
+ try (ResultSet resultSet = statement.getResultSet()) {
+ Assert.assertTrue(resultSet.next());
+ String ans =
+ resultSet.getString(firstValue(d1s1)) + "," + resultSet.getString(lastValue(d1s1));
+ Assert.assertEquals(expectedRet, ans);
+ Assert.assertFalse(resultSet.next());
+ }
+
+ hasResultSet =
+ statement.execute(
+ "select first_value(s1), last_value(s1) from root.sg1.d1 order by time desc;");
+
+ Assert.assertTrue(hasResultSet);
+ try (ResultSet resultSet = statement.getResultSet()) {
+ Assert.assertTrue(resultSet.next());
+ String ans =
+ resultSet.getString(firstValue(d1s1)) + "," + resultSet.getString(lastValue(d1s1));
+ Assert.assertEquals(expectedRet, ans);
+ Assert.assertFalse(resultSet.next());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void alignedTest() throws ClassNotFoundException {
+ String expectedRet = "0.0,20.0";
+ String d2s1 = "root.sg1.d2.s1";
+
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ boolean hasResultSet =
+ statement.execute("select first_value(s1), last_value(s1) from root.sg1.d2;");
+
+ Assert.assertTrue(hasResultSet);
+ try (ResultSet resultSet = statement.getResultSet()) {
+ Assert.assertTrue(resultSet.next());
+ String ans =
+ resultSet.getString(firstValue(d2s1)) + "," + resultSet.getString(lastValue(d2s1));
+ Assert.assertEquals(expectedRet, ans);
+ Assert.assertFalse(resultSet.next());
+ }
+
+ hasResultSet =
+ statement.execute(
+ "select first_value(s1), last_value(s1) from root.sg1.d2 order by time desc;");
+
+ Assert.assertTrue(hasResultSet);
+ try (ResultSet resultSet = statement.getResultSet()) {
+ Assert.assertTrue(resultSet.next());
+ String ans =
+ resultSet.getString(firstValue(d2s1)) + "," + resultSet.getString(lastValue(d2s1));
+ Assert.assertEquals(expectedRet, ans);
+ Assert.assertFalse(resultSet.next());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ public static void insertSQL() throws ClassNotFoundException {
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ for (String sql : sqls) {
+ statement.execute(sql);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
index 124ca0f5b6..f7cc90adc8 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
@@ -290,6 +290,7 @@ public class AggregationExecutor {
timeFilter = queryDataSource.updateFilterUsingTTL(timeFilter);
if (ascAggregateResultList != null && !ascAggregateResultList.isEmpty()) {
+ QueryUtils.fillOrderIndexes(queryDataSource, seriesPath.getDevice(), true);
IAggregateReader seriesReader =
new SeriesAggregateReader(
seriesPath,
@@ -304,6 +305,7 @@ public class AggregationExecutor {
aggregateFromReader(seriesReader, ascAggregateResultList);
}
if (descAggregateResultList != null && !descAggregateResultList.isEmpty()) {
+ QueryUtils.fillOrderIndexes(queryDataSource, seriesPath.getDevice(), false);
IAggregateReader seriesReader =
new SeriesAggregateReader(
seriesPath,
@@ -342,6 +344,7 @@ public class AggregationExecutor {
timeFilter = queryDataSource.updateFilterUsingTTL(timeFilter);
if (ascAggregateResultList != null && !isAggregateResultEmpty(ascAggregateResultList)) {
+ QueryUtils.fillOrderIndexes(queryDataSource, alignedPath.getDevice(), true);
AlignedSeriesAggregateReader seriesReader =
new AlignedSeriesAggregateReader(
alignedPath,
@@ -356,6 +359,7 @@ public class AggregationExecutor {
aggregateFromAlignedReader(seriesReader, ascAggregateResultList);
}
if (descAggregateResultList != null && !isAggregateResultEmpty(descAggregateResultList)) {
+ QueryUtils.fillOrderIndexes(queryDataSource, alignedPath.getDevice(), false);
AlignedSeriesAggregateReader seriesReader =
new AlignedSeriesAggregateReader(
alignedPath,