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 07:19:58 UTC
[iotdb] 01/01: bug fix & add IT
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/lastValueDebug014
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c6b72ec9a78196c5fa56ef26730b4d679689f483
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Wed Aug 24 15:19:39 2022 +0800
bug fix & add IT
---
.../aggregation/IoTDBAggregationScanOrderIT.java | 113 +++++++++++++++++++++
.../db/query/executor/AggregationExecutor.java | 4 +
2 files changed, 117 insertions(+)
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationScanOrderIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationScanOrderIT.java
new file mode 100644
index 0000000000..fd08b983c4
--- /dev/null
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationScanOrderIT.java
@@ -0,0 +1,113 @@
+/*
+ * 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.it.aggregation;
+
+import org.apache.iotdb.it.env.ConfigFactory;
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.itbase.category.ClusterIT;
+import org.apache.iotdb.itbase.category.LocalStandaloneIT;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.apache.iotdb.db.constant.TestConstant.firstValue;
+import static org.apache.iotdb.db.constant.TestConstant.lastValue;
+import static org.apache.iotdb.db.it.utils.TestUtils.prepareData;
+import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualWithDescOrderTest;
+
+@Category({LocalStandaloneIT.class, ClusterIT.class})
+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 {
+ enableSeqSpaceCompaction = ConfigFactory.getConfig().isEnableSeqSpaceCompaction();
+ enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction();
+ enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction();
+ ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false);
+ ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false);
+ ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false);
+ EnvFactory.getEnv().initBeforeClass();
+ prepareData(sqls);
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ EnvFactory.getEnv().cleanAfterClass();
+ ConfigFactory.getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
+ ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction);
+ ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction);
+ }
+
+ @Test
+ public void test() {
+ String d1s1 = "root.sg1.d1.s1";
+ String[] expectedHeader = new String[] {firstValue(d1s1), lastValue(d1s1)};
+ String[] retArray = new String[] {"0.0,20.0,"};
+
+ resultSetEqualWithDescOrderTest(
+ "select first_value(s1), last_value(s1) from root.sg1.d1", expectedHeader, retArray);
+ }
+
+ @Test
+ public void alignedTest() {
+ String d2s1 = "root.sg1.d2.s1";
+ String[] expectedHeader = new String[] {firstValue(d2s1), lastValue(d2s1)};
+ String[] retArray = new String[] {"0.0,20.0,"};
+
+ resultSetEqualWithDescOrderTest(
+ "select first_value(s1), last_value(s1) from root.sg1.d2", expectedHeader, retArray);
+ }
+}
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 2f8d2efde1..004abca60d 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
@@ -289,6 +289,7 @@ public class AggregationExecutor {
timeFilter = queryDataSource.updateFilterUsingTTL(timeFilter);
if (ascAggregateResultList != null && !ascAggregateResultList.isEmpty()) {
+ QueryUtils.fillOrderIndexes(queryDataSource, seriesPath.getDevice(), true);
IAggregateReader seriesReader =
new SeriesAggregateReader(
seriesPath,
@@ -303,6 +304,7 @@ public class AggregationExecutor {
aggregateFromReader(seriesReader, ascAggregateResultList);
}
if (descAggregateResultList != null && !descAggregateResultList.isEmpty()) {
+ QueryUtils.fillOrderIndexes(queryDataSource, seriesPath.getDevice(), false);
IAggregateReader seriesReader =
new SeriesAggregateReader(
seriesPath,
@@ -341,6 +343,7 @@ public class AggregationExecutor {
timeFilter = queryDataSource.updateFilterUsingTTL(timeFilter);
if (!isAggregateResultEmpty(ascAggregateResultList)) {
+ QueryUtils.fillOrderIndexes(queryDataSource, alignedPath.getDevice(), true);
AlignedSeriesAggregateReader seriesReader =
new AlignedSeriesAggregateReader(
alignedPath,
@@ -355,6 +358,7 @@ public class AggregationExecutor {
aggregateFromAlignedReader(seriesReader, ascAggregateResultList);
}
if (!isAggregateResultEmpty(descAggregateResultList)) {
+ QueryUtils.fillOrderIndexes(queryDataSource, alignedPath.getDevice(), false);
AlignedSeriesAggregateReader seriesReader =
new AlignedSeriesAggregateReader(
alignedPath,