This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/AggregationDebug0.13 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d71f8256ee7992aa4884a3df32ea29c183dc1a36 Author: Minghui Liu <[email protected]> AuthorDate: Fri Jun 24 21:12:25 2022 +0800 add ITs --- .../IoTDBGroupByQueryWithoutValueFilter2IT.java | 3 +- ...=> IoTDBGroupByQueryWithoutValueFilter3IT.java} | 7 +--- .../IoTDBGroupByQueryWithoutValueFilterIT.java | 43 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter2IT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter2IT.java index 7f08a03329..674d4a4a4d 100644 --- a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter2IT.java +++ b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter2IT.java @@ -37,7 +37,6 @@ public class IoTDBGroupByQueryWithoutValueFilter2IT extends IoTDBGroupByQueryWit @BeforeClass public static void setUp() throws Exception { EnvFactory.getEnv().initBeforeClass(); - // TODO When the aligned time series support compaction, we need to set compaction to true enableSeqSpaceCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction(); enableUnseqSpaceCompaction = @@ -49,7 +48,7 @@ public class IoTDBGroupByQueryWithoutValueFilter2IT extends IoTDBGroupByQueryWit ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); - TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(3); + TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(2); AlignedWriteUtil.insertData(); } diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter2IT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter3IT.java similarity index 89% copy from integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter2IT.java copy to integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter3IT.java index 7f08a03329..193caa0911 100644 --- a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter2IT.java +++ b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilter3IT.java @@ -16,28 +16,25 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.iotdb.db.integration.aligned; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.integration.env.ConfigFactory; import org.apache.iotdb.integration.env.EnvFactory; -import org.apache.iotdb.itbase.category.LocalStandaloneTest; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; -@Category({LocalStandaloneTest.class}) -public class IoTDBGroupByQueryWithoutValueFilter2IT extends IoTDBGroupByQueryWithoutValueFilterIT { +public class IoTDBGroupByQueryWithoutValueFilter3IT extends IoTDBGroupByQueryWithoutValueFilterIT { private static int numOfPointsPerPage; @BeforeClass public static void setUp() throws Exception { EnvFactory.getEnv().initBeforeClass(); - // TODO When the aligned time series support compaction, we need to set compaction to true enableSeqSpaceCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction(); enableUnseqSpaceCompaction = diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilterIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilterIT.java index a93a4771aa..02affb2fdd 100644 --- a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilterIT.java +++ b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByQueryWithoutValueFilterIT.java @@ -1165,6 +1165,49 @@ public class IoTDBGroupByQueryWithoutValueFilterIT { } } + @Test + public void groupBySmallWindowTest() throws SQLException { + String[] retArray = new String[] {"10,0", "11,1", "12,1", "13,1", "14,1", "15,1"}; + try (Connection connection = EnvFactory.getEnv().getConnection(); + Statement statement = connection.createStatement()) { + boolean hasResultSet = + statement.execute("select count(s1) from root.sg1.d1 GROUP BY ([10, 16), 1ms)"); + Assert.assertTrue(hasResultSet); + + int cnt; + try (ResultSet resultSet = statement.getResultSet()) { + cnt = 0; + while (resultSet.next()) { + String ans = + resultSet.getString(TIMESTAMP_STR) + + "," + + resultSet.getString(count("root.sg1.d1.s1")); + Assert.assertEquals(retArray[cnt], ans); + cnt++; + } + Assert.assertEquals(retArray.length, cnt); + } + + hasResultSet = + statement.execute( + "select count(s1) from root.sg1.d1 GROUP BY ([10, 16), 1ms) order by time desc"); + Assert.assertTrue(hasResultSet); + + try (ResultSet resultSet = statement.getResultSet()) { + cnt = retArray.length; + while (resultSet.next()) { + String ans = + resultSet.getString(TIMESTAMP_STR) + + "," + + resultSet.getString(count("root.sg1.d1.s1")); + Assert.assertEquals(retArray[cnt - 1], ans); + cnt--; + } + Assert.assertEquals(0, cnt); + } + } + } + @Test public void groupByWithoutAggregationFuncTest() { try (Connection connection = EnvFactory.getEnv().getConnection();
