Skip to content

fix:ttl #3244

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

Open
chejinge wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

fix:ttl #3244

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
20 changes: 11 additions & 9 deletions src/storage/src/base_meta_value_format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,12 @@ class ParsedBaseMetaValue : public ParsedInternalValue {
uint64_t etime = DecodeFixed64(internal_value_str->data() + offset);

ctime_ = (ctime & ~(1ULL << 63));
// if ctime_==ctime, means ctime_ storaged in seconds
if (ctime_ == ctime) {
if ((ctime & (1ULL << 63)) == 0) {
ctime_ *= 1000;
}

etime_ = (etime & ~(1ULL << 63));
// if etime_==etime, means etime_ storaged in seconds
if (etime == etime_) {
if ((etime & (1ULL << 63)) == 0) {
etime_ *= 1000;
}
}
Expand All @@ -100,7 +99,7 @@ class ParsedBaseMetaValue : public ParsedInternalValue {
type_ = static_cast<DataType>(static_cast<uint8_t>(internal_value_slice[0]));
offset += kTypeLength;
user_value_ = Slice(internal_value_slice.data() + offset,
internal_value_slice.size() - kBaseMetaValueSuffixLength - offset);
internal_value_slice.size() - kBaseMetaValueSuffixLength - offset);
offset += user_value_.size();
version_ = DecodeFixed64(internal_value_slice.data() + offset);
offset += sizeof(uint64_t);
Expand All @@ -110,14 +109,17 @@ class ParsedBaseMetaValue : public ParsedInternalValue {
offset += sizeof(ctime_);
uint64_t etime = DecodeFixed64(internal_value_slice.data() + offset);

// 修复时间戳解析问题：只有当时间戳没有毫秒标志时才乘以 1000
// 毫秒时间戳的最高位是 1，秒时间戳的最高位是 0
ctime_ = (ctime & ~(1ULL << 63));
// if ctime_!=ctime, means ctime_ storaged in seconds
if (ctime_ == ctime) {
if ((ctime & (1ULL << 63)) == 0) {
// 秒时间戳，转换为毫秒
ctime_ *= 1000;
}

etime_ = (etime & ~(1ULL << 63));
// if etime_!=etime, means etime_ storaged in seconds
if (etime == etime_) {
if ((etime & (1ULL << 63)) == 0) {
// 秒时间戳，转换为毫秒
etime_ *= 1000;
}
}
Expand Down
18 changes: 10 additions & 8 deletions src/storage/src/strings_value_format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,12 @@ class ParsedStringsValue : public ParsedInternalValue {
uint64_t etime = DecodeFixed64(internal_value_str->data() + offset);

ctime_ = (ctime & ~(1ULL << 63));
// if ctime_==ctime, means ctime_ storaged in seconds
if (ctime_ == ctime) {
if ((ctime & (1ULL << 63)) == 0) {
ctime_ *= 1000;
}

etime_ = (etime & ~(1ULL << 63));
// if etime_==etime, means etime_ storaged in seconds
if (etime == etime_) {
if ((etime & (1ULL << 63)) == 0) {
etime_ *= 1000;
}
}
Expand All @@ -113,14 +112,17 @@ class ParsedStringsValue : public ParsedInternalValue {
offset += kTimestampLength;
uint64_t etime = DecodeFixed64(internal_value_slice.data() + offset);

// 修复时间戳解析问题：只有当时间戳没有毫秒标志时才乘以 1000
// 毫秒时间戳的最高位是 1，秒时间戳的最高位是 0
ctime_ = (ctime & ~(1ULL << 63));
// if ctime_==ctime, means ctime_ storaged in seconds
if (ctime_ == ctime) {
if ((ctime & (1ULL << 63)) == 0) {
// 秒时间戳，转换为毫秒
ctime_ *= 1000;
}

etime_ = (etime & ~(1ULL << 63));
// if etime_==etime, means etime_ storaged in seconds
if (etime == etime_) {
if ((etime & (1ULL << 63)) == 0) {
// 秒时间戳，转换为毫秒
etime_ *= 1000;
}
}
Expand Down
Loading