Skip to content

Fix deletion recovery and table last-cache correctness #19081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 1 commit into from
Nov 2, 2026
Merged

Fix deletion recovery and table last-cache correctness #19081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 123 additions & 1 deletion integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.it.utils.DeletionTestUtils;
import org.apache.iotdb.db.it.utils.TestUtils;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
Expand All @@ -30,6 +31,7 @@

import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.external.commons.io.FileUtils;
import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -41,16 +43,21 @@

import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collections;
import java.util.List;
import java.util.Map;

import static org.apache.iotdb.db.utils.constant.TestConstant.TIMESTAMP_STR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

@RunWith(IoTDBTestRunner.class)
Expand All @@ -61,7 +68,18 @@ public class IoTDBRestartIT {

@Before
public void setUp() throws Exception {
EnvFactory.getEnv().getConfig().getCommonConfig().setWalMode("SYNC");
EnvFactory.getEnv()
.getConfig()
.getCommonConfig()
.setWalMode("SYNC")
.setDataRegionConsensusProtocolClass("org.apache.iotdb.consensus.simple.SimpleConsensus")
.setDataReplicationFactor(1)
.setDataRegionGroupExtensionPolicy("CUSTOM")
.setDefaultDataRegionGroupNumPerDatabase(1)
.setMemtableSizeThreshold(16 * 1024 * 1024)
.setEnableSeqSpaceCompaction(false)
.setEnableUnseqSpaceCompaction(false)
.setEnableCrossSpaceCompaction(false);
EnvFactory.getEnv()
.getConfig()
.getCommonConfig()
Expand Down Expand Up @@ -165,6 +183,110 @@ public void testRestartDelete() throws SQLException {
}
}

@Test
public void testDeleteAndRewriteSurviveForcedRestart() throws Exception {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
statement.execute("CREATE DATABASE root.restart_delete");
statement.execute("CREATE TIMESERIES root.restart_delete.d1.s1 WITH DATATYPE=INT64");
statement.execute("CREATE TIMESERIES root.restart_delete.d1.s2 WITH DATATYPE=INT64");
statement.execute("CREATE TIMESERIES root.restart_delete.d2.s1 WITH DATATYPE=INT64");
statement.execute("CREATE TIMESERIES root.restart_delete.d2.s2 WITH DATATYPE=INT64");

// The first two rows are in a TsFile. The remaining rows are only protected by the SYNC
// WAL when the delete is issued.
statement.execute("INSERT INTO root.restart_delete.d1(time,s1,s2) VALUES(1,11,101)");
statement.execute("INSERT INTO root.restart_delete.d1(time,s1) VALUES(2,12)");
statement.execute("INSERT INTO root.restart_delete.d2(time,s1,s2) VALUES(2,22,202)");
statement.execute("FLUSH");
Path history =
DeletionTestUtils.assertSharedTsFile(
"root.restart_delete",
IDeviceID.Factory.DEFAULT_FACTORY.create("root.restart_delete.d1"),
IDeviceID.Factory.DEFAULT_FACTORY.create("root.restart_delete.d2"));
assertEquals(
Map.of(1L, 11L, 2L, 12L),
DeletionTestUtils.readTreePoints(history, "root.restart_delete.d1", "s1"));
List<Path> closedFiles = DeletionTestUtils.getClosedTsFiles("root.restart_delete", true);

statement.execute("INSERT INTO root.restart_delete.d1(time,s1) VALUES(1,111)");
statement.execute("INSERT INTO root.restart_delete.d1(time,s1) VALUES(3,13)");
statement.execute("INSERT INTO root.restart_delete.d1(time,s1,s2) VALUES(4,14,104)");
assertEquals(closedFiles, DeletionTestUtils.getClosedTsFiles("root.restart_delete", true));
assertTrue(DeletionTestUtils.getClosedTsFiles("root.restart_delete", false).isEmpty());
assertEquals(
Map.of(1L, 11L, 2L, 12L),
DeletionTestUtils.readTreePoints(history, "root.restart_delete.d1", "s1"));

statement.execute("DELETE FROM root.restart_delete.d1.s1 WHERE time <= 3");
try (ResultSet resultSet =
statement.executeQuery("SELECT s1,s2 FROM root.restart_delete.d1 ORDER BY time")) {
assertTrue(resultSet.next());
assertEquals(1, resultSet.getLong(1));
assertNull(resultSet.getObject(2));
assertEquals(101, resultSet.getLong(3));
assertTrue(resultSet.next());
assertEquals(4, resultSet.getLong(1));
assertEquals(14, resultSet.getLong(2));
assertEquals(104, resultSet.getLong(3));
assertFalse(resultSet.next());
}

// This rewrite is deliberately older than the surviving point. It must survive the old
// delete record and remain visible after recovery, while s2 stays NULL.
statement.execute("INSERT INTO root.restart_delete.d1(time,s1) VALUES(2,1202)");
assertEquals(closedFiles, DeletionTestUtils.getClosedTsFiles("root.restart_delete", true));
assertTrue(DeletionTestUtils.getClosedTsFiles("root.restart_delete", false).isEmpty());
try (ResultSet rows =
statement.executeQuery("SELECT s1,s2 FROM root.restart_delete.d1 ORDER BY time")) {
TestUtils.assertResultSetEqual(
rows,
"Time,root.restart_delete.d1.s1,root.restart_delete.d1.s2,",
new String[] {"1,null,101,", "2,1202,null,", "4,14,104,"});
}
}

TestUtils.stopForciblyAndRestartDataNodes();

try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
try (ResultSet resultSet =
statement.executeQuery("SELECT s1,s2 FROM root.restart_delete.d1 ORDER BY time")) {
assertTrue(resultSet.next());
assertEquals(1, resultSet.getLong(1));
assertNull(resultSet.getObject(2));
assertEquals(101, resultSet.getLong(3));
assertTrue(resultSet.next());
assertEquals(2, resultSet.getLong(1));
assertEquals(1202, resultSet.getLong(2));
assertNull(resultSet.getObject(3));
assertTrue(resultSet.next());
assertEquals(4, resultSet.getLong(1));
assertEquals(14, resultSet.getLong(2));
assertEquals(104, resultSet.getLong(3));
assertFalse(resultSet.next());
}
try (ResultSet resultSet =
statement.executeQuery("SELECT s1,s2 FROM root.restart_delete.d2 ORDER BY time")) {
assertTrue(resultSet.next());
assertEquals(2, resultSet.getLong(1));
assertEquals(22, resultSet.getLong(2));
assertEquals(202, resultSet.getLong(3));
assertFalse(resultSet.next());
}
// Only after checking both the target and control do we test continued writes and flush.
statement.execute("INSERT INTO root.restart_delete.d1(time,s1,s2) VALUES(5,15,105)");
statement.execute("FLUSH");
try (ResultSet rows =
statement.executeQuery("SELECT s1,s2 FROM root.restart_delete.d1 ORDER BY time")) {
TestUtils.assertResultSetEqual(
rows,
"Time,root.restart_delete.d1.s1,root.restart_delete.d1.s2,",
new String[] {"1,null,101,", "2,1202,null,", "4,14,104,", "5,15,105,"});
}
}
}

@Test
public void testRestartQueryLargerThanEndTime() throws SQLException {
try (Connection connection = EnvFactory.getEnv().getConnection();
Expand Down
119 changes: 119 additions & 0 deletions integration-test/src/test/java/org/apache/iotdb/db/it/utils/DeletionTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
/*
* 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.utils;

import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;

import org.apache.tsfile.file.metadata.ChunkMetadata;
import org.apache.tsfile.file.metadata.IChunkMetadata;
import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.file.metadata.TimeseriesMetadata;
import org.apache.tsfile.read.TsFileSequenceReader;
import org.apache.tsfile.read.common.BatchData;
import org.apache.tsfile.read.reader.chunk.ChunkReader;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static org.apache.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX;
import static org.junit.Assert.fail;

/** Physical preconditions for deletion ITs; SQL assertions still verify the visible data. */
public final class DeletionTestUtils {
private DeletionTestUtils() {}

public static List<Path> getClosedTsFiles(String database, boolean sequence) throws IOException {
List<Path> result = new ArrayList<>();
for (DataNodeWrapper node : EnvFactory.getEnv().getDataNodeWrapperList()) {
Path directory =
Paths.get(
node.getDataPath(),
sequence ? IoTDBConstant.SEQUENCE_FOLDER_NAME : IoTDBConstant.UNSEQUENCE_FOLDER_NAME,
database);
if (Files.exists(directory)) {
try (Stream<Path> files = Files.walk(directory)) {
result.addAll(
files
.filter(Files::isRegularFile)
.filter(file -> file.toString().endsWith(TSFILE_SUFFIX))
.filter(file -> Files.isRegularFile(Paths.get(file + ".resource")))
.sorted()
.collect(Collectors.toList()));
}
}
}
return result;
}

public static Path assertSharedTsFile(String database, IDeviceID... devices) throws IOException {
for (Path file : getClosedTsFiles(database, true)) {
try (TsFileSequenceReader reader = new TsFileSequenceReader(file.toString())) {
if (reader.getAllDevices().containsAll(Arrays.asList(devices))) {
return file;
}
}
}
fail("No closed TsFile contains all expected devices: " + Arrays.toString(devices));
return null;
}

// Read the physical file without applying mods or merging it with newer files.
public static Map<Long, Long> readTreePoints(Path file, String device, String measurement)
throws IOException {
Map<Long, Long> points = new TreeMap<>();
try (TsFileSequenceReader reader = new TsFileSequenceReader(file.toString())) {
List<TimeseriesMetadata> series =
reader
.getAllTimeseriesMetadata(true)
.get(IDeviceID.Factory.DEFAULT_FACTORY.create(device));
if (series != null) {
for (TimeseriesMetadata metadata : series) {
if (!measurement.equals(metadata.getMeasurementId())) {
continue;
}
for (IChunkMetadata chunk : metadata.getChunkMetadataList()) {
try (ChunkReader chunkReader =
new ChunkReader(reader.readMemChunk((ChunkMetadata) chunk))) {
while (chunkReader.hasNextSatisfiedPage()) {
BatchData page = chunkReader.nextPageData();
while (page.hasCurrent()) {
points.put(page.currentTime(), page.getLong());
page.next();
}
}
}
}
}
}
}
return points;
}
}
Loading
Loading