This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch IOTDB-4585-013 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 06bc62f4478f50dd4dd461bf8da0e5be4d0b1e21 Author: JackieTien97 <[email protected]> AuthorDate: Mon Oct 10 17:54:42 2022 +0800 [To rel/0.13] [IOTDB-4585] Fix Delete bug in aligned time series --- .../IoTDBCountMultiTimesWithDeletionIT.java | 155 +++++++++++++++++++++ .../java/org/apache/iotdb/db/utils/QueryUtils.java | 4 +- 2 files changed, 158 insertions(+), 1 deletion(-) diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBCountMultiTimesWithDeletionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBCountMultiTimesWithDeletionIT.java new file mode 100644 index 0000000000..ff4325991c --- /dev/null +++ b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBCountMultiTimesWithDeletionIT.java @@ -0,0 +1,155 @@ +/* + * 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.aligned; + +import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.utils.EnvironmentUtils; +import org.apache.iotdb.itbase.category.LocalStandaloneTest; +import org.apache.iotdb.jdbc.Config; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.sql.Connection; +import java.sql.DriverManager; +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; + +@Category({LocalStandaloneTest.class}) +public class IoTDBCountMultiTimesWithDeletionIT { + + protected static boolean enableSeqSpaceCompaction; + protected static boolean enableUnseqSpaceCompaction; + protected static boolean enableCrossSpaceCompaction; + + @BeforeClass + public static void setUp() throws Exception { + EnvironmentUtils.envSetUp(); + // TODO When the aligned time series support compaction, we need to set compaction to true + 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); + + Class.forName(Config.JDBC_DRIVER_NAME); + try (Connection connection = + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + 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 { + IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); + IoTDBDescriptor.getInstance() + .getConfig() + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); + IoTDBDescriptor.getInstance() + .getConfig() + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); + EnvironmentUtils.cleanEnv(); + } + + @Test + public void countSingleAlignedWithoutTimeFilterMultiTimesTest() throws ClassNotFoundException { + String[] retArray = new String[] {"1"}; + String[] columnNames = { + "count(root.sg1.d1.s1)", + }; + + Class.forName(Config.JDBC_DRIVER_NAME); + try (Connection connection = + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + 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 15dad4affb..20985dd8d7 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 @@ -155,7 +155,9 @@ public class QueryUtils { removed = false; } } - alignedChunkMetadata.setModified(modified); + if (!alignedChunkMetadata.isModified()) { + alignedChunkMetadata.setModified(modified); + } return removed; }); }
