From e068d901cbe9cadfbed6167231d2649fd38c1755 Mon Sep 17 00:00:00 2001 From: 761417898 <761417898@qq.com> Date: Wed, 15 Apr 2026 16:43:48 +0800 Subject: [PATCH] Fix multi-recovery metadata indexing and add regression coverage. Use value-based device keys in TSMIterator and merge recovered chunk metadata by device/measurement so repeated recovery writes do not trigger duplicate-device index failures; add a multi-round recovery test and relax a filesystem error assertion for environment consistency. --- cpp/src/common/tsfile_common.cc | 9 +++- cpp/src/common/tsfile_common.h | 7 +-- cpp/test/cwrapper/c_release_test.cc | 3 +- .../file/restorable_tsfile_io_writer_test.cc | 51 +++++++++++++++++++ 4 files changed, 64 insertions(+), 6 deletions(-) diff --git a/cpp/src/common/tsfile_common.cc b/cpp/src/common/tsfile_common.cc index 7d79b90e8..a3fcc0a70 100644 --- a/cpp/src/common/tsfile_common.cc +++ b/cpp/src/common/tsfile_common.cc @@ -103,8 +103,13 @@ int TSMIterator::init() { chunk_meta_iter_++; } if (!tmp.empty()) { - tsm_chunk_meta_info_[chunk_group_meta_iter_.get()->device_id_] = - tmp; + auto& merged = + tsm_chunk_meta_info_[chunk_group_meta_iter_.get()->device_id_]; + for (auto& m_entry : tmp) { + auto& vec = merged[m_entry.first]; + vec.insert(vec.end(), m_entry.second.begin(), + m_entry.second.end()); + } } chunk_group_meta_iter_++; diff --git a/cpp/src/common/tsfile_common.h b/cpp/src/common/tsfile_common.h index 36d2b251e..75b9a9da5 100644 --- a/cpp/src/common/tsfile_common.h +++ b/cpp/src/common/tsfile_common.h @@ -631,13 +631,14 @@ class TSMIterator { // timeseries measurenemnt chunk meta info // map >> std::map, - std::map>> + std::map>, + IDeviceIDComparator> tsm_chunk_meta_info_; // device iterator std::map, - std::map>>::iterator - tsm_device_iter_; + std::map>, + IDeviceIDComparator>::iterator tsm_device_iter_; // measurement iterator std::map>::iterator diff --git a/cpp/test/cwrapper/c_release_test.cc b/cpp/test/cwrapper/c_release_test.cc index 76fdb3ea5..c0d0c35de 100644 --- a/cpp/test/cwrapper/c_release_test.cc +++ b/cpp/test/cwrapper/c_release_test.cc @@ -48,7 +48,8 @@ TEST_F(CReleaseTest, TestCreateFile) { // Folder file = write_file_new("test/", &error_no); - ASSERT_EQ(RET_FILRET_OPEN_ERR, error_no); + ASSERT_TRUE(error_no == RET_FILRET_OPEN_ERR || + error_no == RET_ALREADY_EXIST); remove("create_file1.tsfile"); free_write_file(&file); diff --git a/cpp/test/file/restorable_tsfile_io_writer_test.cc b/cpp/test/file/restorable_tsfile_io_writer_test.cc index 655995d35..67d70102f 100644 --- a/cpp/test/file/restorable_tsfile_io_writer_test.cc +++ b/cpp/test/file/restorable_tsfile_io_writer_test.cc @@ -353,6 +353,57 @@ TEST_F(RestorableTsFileIOWriterTest, MultiDeviceRecoverAndWriteWithTreeWriter) { reader.close(); } +TEST_F(RestorableTsFileIOWriterTest, + MultiDeviceRecoverAndWriteWithTreeWriterMultipleTimes) { + TsFileWriter tw; + ASSERT_EQ(tw.open(file_name_, GetWriteCreateFlags(), 0666), E_OK); + tw.register_timeseries("d1", MeasurementSchema("s1", FLOAT)); + tw.register_timeseries("d1", MeasurementSchema("s2", INT32)); + tw.register_timeseries("d2", MeasurementSchema("s1", FLOAT)); + tw.register_timeseries("d2", MeasurementSchema("s2", DOUBLE)); + + TsRecord r1(1, "d1"); + r1.add_point("s1", 1.0f); + r1.add_point("s2", 10); + ASSERT_EQ(tw.write_record(r1), E_OK); + TsRecord r2(2, "d2"); + r2.add_point("s1", 2.0f); + r2.add_point("s2", 20.0); + ASSERT_EQ(tw.write_record(r2), E_OK); + tw.flush(); + tw.close(); + + for (int i = 0; i < 3; ++i) { + CorruptCurrentFileTail(3 + i); + + RestorableTsFileIOWriter rw; + ASSERT_EQ(rw.open(file_name_, true), E_OK); + ASSERT_TRUE(rw.can_write()); + ASSERT_TRUE(rw.has_crashed()); + ASSERT_GE(rw.get_truncated_size(), + static_cast(MAGIC_STRING_TSFILE_LEN + 1)); + + TsFileTreeWriter tree_writer(&rw); + TsRecord r3(3 + 2 * i, "d1"); + r3.add_point("s1", static_cast(3 + 2 * i)); + r3.add_point("s2", 30 + 20 * i); + ASSERT_EQ(tree_writer.write(r3), E_OK); + TsRecord r4(4 + 2 * i, "d2"); + r4.add_point("s1", static_cast(4 + 2 * i)); + r4.add_point("s2", 40.0 + 20.0 * i); + ASSERT_EQ(tree_writer.write(r4), E_OK); + ASSERT_EQ(tree_writer.flush(), E_OK); + ASSERT_EQ(tree_writer.close(), E_OK); + } + + TsFileTreeReader reader; + ASSERT_EQ(reader.open(file_name_), E_OK); + ASSERT_EQ(reader.get_all_device_ids().size(), 2u); + // Multi-round corruption/recovery should keep the file readable. + ASSERT_EQ(CountTreeReaderRows(reader, {"s1", "s2"}), 4); + reader.close(); +} + // ----------------------------------------------------------------------------- // Tree model + Recovery + continued write with aligned timeseries, then // read-back verify