Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions cpp/src/common/tsfile_common.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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_++;
Expand Down
7 changes: 4 additions & 3 deletions cpp/src/common/tsfile_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -631,13 +631,14 @@ class TSMIterator {
// timeseries measurenemnt chunk meta info
// map <device_name, <measurement_name, vector<chunk_meta>>>
std::map<std::shared_ptr<IDeviceID>,
std::map<common::String, std::vector<ChunkMeta*>>>
std::map<common::String, std::vector<ChunkMeta*>>,
IDeviceIDComparator>
tsm_chunk_meta_info_;

// device iterator
std::map<std::shared_ptr<IDeviceID>,
std::map<common::String, std::vector<ChunkMeta*>>>::iterator
tsm_device_iter_;
std::map<common::String, std::vector<ChunkMeta*>>,
IDeviceIDComparator>::iterator tsm_device_iter_;

// measurement iterator
std::map<common::String, std::vector<ChunkMeta*>>::iterator
Expand Down
3 changes: 2 additions & 1 deletion cpp/test/cwrapper/c_release_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
51 changes: 51 additions & 0 deletions cpp/test/file/restorable_tsfile_io_writer_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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<int64_t>(MAGIC_STRING_TSFILE_LEN + 1));

TsFileTreeWriter tree_writer(&rw);
TsRecord r3(3 + 2 * i, "d1");
r3.add_point("s1", static_cast<float>(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<float>(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
Expand Down
Loading