Skip to content

fix ts2diff. #618

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
ColinLeeo merged 2 commits into from
Oct 31, 2025
Merged

fix ts2diff. #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b8e279
fix ts2diff.
ColinLeeo Oct 31, 2025
9cd7569
fix fmt.
ColinLeeo Oct 31, 2025
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
14 changes: 8 additions & 6 deletions cpp/src/encoding/ts2diff_decoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,14 @@ inline int32_t TS2DIFFDecoder<int32_t>::decode(common::ByteStream &in) {
}
return ret_value;
}
if (current_index_++ >= write_index_) {
current_index_ = 0;
}
// although it seems we are reading an int64, bit_width_ guarantees
// that it does not overflow int32
stored_value_ = read_long(bit_width_, in);
ret_value = stored_value_ + first_value_ + delta_min_;
if (current_index_++ >= write_index_) {
current_index_ = 0;
bits_left_ = 0;
}
first_value_ = ret_value;
return ret_value;
}
Expand All @@ -161,12 +162,13 @@ inline int64_t TS2DIFFDecoder<int64_t>::decode(common::ByteStream &in) {
}
return ret_value;
}
if (current_index_++ >= write_index_) {
current_index_ = 0;
}
stored_value_ = (int64_t)read_long(bit_width_, in);
ret_value = stored_value_ + first_value_ + delta_min_;
first_value_ = ret_value;
if (current_index_++ >= write_index_) {
current_index_ = 0;
bits_left_ = 0;
}
return ret_value;
}

Expand Down
30 changes: 30 additions & 0 deletions cpp/test/encoding/ts2diff_codec_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,34 @@ TEST_F(TS2DIFFCodecTest, LargeDataTest) {
std::cout << "Decode time: " << decode_duration.count() << "ms\n";
}

TEST_F(TS2DIFFCodecTest, TestEncodingLast) {
common::ByteStream out_stream(1024, common::MOD_TS2DIFF_OBJ, false);
common::ByteStream out_stream_int32(1024, common::MOD_TS2DIFF_OBJ, false);
const int row_num = 6;
int64_t data[row_num];
memset(data, 0, sizeof(int64_t) * row_num);
for (int i = 0; i < row_num; i++) {
data[i] = i * i;
}

for (int i = 0; i < row_num; i++) {
EXPECT_EQ(encoder_long_->encode(data[i], out_stream), common::E_OK);
EXPECT_EQ(encoder_int_->encode((int32_t)data[i], out_stream_int32),
common::E_OK);
}
EXPECT_EQ(encoder_long_->flush(out_stream), common::E_OK);
EXPECT_EQ(encoder_int_->flush(out_stream_int32), common::E_OK);

int64_t x;
int32_t y;
for (int i = 0; i < row_num; i++) {
EXPECT_EQ(decoder_long_->read_int64(x, out_stream), common::E_OK);
EXPECT_EQ(x, data[i]);
EXPECT_EQ(decoder_int_->read_int32(y, out_stream_int32), common::E_OK);
EXPECT_EQ(y, data[i]);
}
EXPECT_FALSE(decoder_long_->has_remaining(out_stream));
EXPECT_FALSE(decoder_int_->has_remaining(out_stream_int32));
}

} // namespace storage
Loading