This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch IOTDB-4585 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b7495d2eab95570c16469ce15ae6c8b93e6823bf Author: JackieTien97 <[email protected]> AuthorDate: Mon Oct 10 17:40:00 2022 +0800 [IOTDB-4585] Fix Delete bug in aligned time series --- .../IoTDBCountMultiTimesWithDeletionIT.java | 146 +++++++++++++++++++++ .../java/org/apache/iotdb/db/utils/QueryUtils.java | 4 +- 2 files changed, 149 insertions(+), 1 deletion(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBCountMultiTimesWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBCountMultiTimesWithDeletionIT.java new file mode 100644 index 0000000000..09f7a34e70 --- /dev/null +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBCountMultiTimesWithDeletionIT.java @@ -0,0 +1,146 @@ +/* + * 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.aligned; + +import org.apache.iotdb.it.env.ConfigFactory; +import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; +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 org.junit.runner.RunWith; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.HashMap; +import java.util.Map; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +@RunWith(IoTDBTestRunner.class) +@Category({LocalStandaloneIT.class, ClusterIT.class}) +public class IoTDBCountMultiTimesWithDeletionIT { + + protected static boolean enableSeqSpaceCompaction; + protected static boolean enableUnseqSpaceCompaction; + protected static boolean enableCrossSpaceCompaction; + protected static int maxTsBlockLineNumber; + + @BeforeClass + public static void setUp() throws Exception { + enableSeqSpaceCompaction = ConfigFactory.getConfig().isEnableSeqSpaceCompaction(); + enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); + enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); + ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); + ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); + ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); + EnvFactory.getEnv().initBeforeClass(); + + try (Connection connection = EnvFactory.getEnv().getConnection(); + Statement statement = connection.createStatement()) { + + statement.execute("insert into root.sg1.d1(time, s1) aligned values (1,1), (2,2)"); + statement.execute("flush"); + statement.execute("delete from root.sg1.d1.s1 where time > 1"); + } catch (Exception e) { + fail(e.getMessage()); + e.printStackTrace(); + } + } + + @AfterClass + public static void tearDown() throws Exception { + EnvFactory.getEnv().cleanAfterClass(); + ConfigFactory.getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); + ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); + ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); + } + + @Test + public void countSingleAlignedWithoutTimeFilterMultiTimesTest() { + String[] retArray = new String[] {"1"}; + String[] columnNames = { + "count(root.sg1.d1.s1)", + }; + try (Connection connection = EnvFactory.getEnv().getConnection(); + Statement statement = connection.createStatement()) { + + // first time + try (ResultSet resultSet = statement.executeQuery("select count(s1) from root.sg1.d1")) { + ResultSetMetaData resultSetMetaData = resultSet.getMetaData(); + Map<String, Integer> map = new HashMap<>(); // used to adjust result sequence + for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) { + map.put(resultSetMetaData.getColumnName(i), i); + } + + int cnt = 0; + while (resultSet.next()) { + String[] ans = new String[columnNames.length]; + // No need to add time column for aggregation query + for (int i = 0; i < columnNames.length; i++) { + String columnName = columnNames[i]; + int index = map.get(columnName); + ans[i] = resultSet.getString(index); + } + assertArrayEquals(retArray, ans); + cnt++; + } + assertEquals(1, cnt); + } + + // second time + try (ResultSet resultSet = statement.executeQuery("select count(s1) from root.sg1.d1")) { + ResultSetMetaData resultSetMetaData = resultSet.getMetaData(); + Map<String, Integer> map = new HashMap<>(); // used to adjust result sequence + for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) { + map.put(resultSetMetaData.getColumnName(i), i); + } + + int cnt = 0; + while (resultSet.next()) { + String[] ans = new String[columnNames.length]; + // No need to add time column for aggregation query + for (int i = 0; i < columnNames.length; i++) { + String columnName = columnNames[i]; + int index = map.get(columnName); + ans[i] = resultSet.getString(index); + } + assertArrayEquals(retArray, ans); + cnt++; + } + assertEquals(1, cnt); + } + } catch (SQLException e) { + e.printStackTrace(); + fail(e.getMessage()); + } + } +} diff --git a/server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java index a6f0906e95..af3c459a77 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java @@ -154,7 +154,9 @@ public class QueryUtils { removed = false; } } - alignedChunkMetadata.setModified(modified); + if (!alignedChunkMetadata.isModified()) { + alignedChunkMetadata.setModified(modified); + } return removed; }); }
