Skip to content
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

fix: change storage ttl time from seconds to milliseconds #2822

Merged
merged 24 commits into from
Aug 8, 2024
Merged

fix: change storage ttl time from seconds to milliseconds #2822

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f5eaaf8
change storage ttl time from seconds to milliseconds
Jul 23, 2024
8f957fc
fix comment
Jul 23, 2024
abde555
change version micro-seconds
Jul 23, 2024
7169ecd
optimize logic
Jul 24, 2024
4e68b93
optimize logic
Jul 24, 2024
00a9ae4
打印test的失败日志
Jul 24, 2024
e55311c
fix strings_test.cc bug
Jul 24, 2024
b4450a9
use int64 to vertion param
Jul 24, 2024
3bcfe99
add NowMillis()
Jul 24, 2024
6c954ea
add NowMillis()
Jul 24, 2024
2f4559a
ctime 和 mtime 同时兼容秒和毫秒的解析
Jul 27, 2024
803302b
ctime 和 mtime 同时兼容秒和毫秒的解析
Jul 28, 2024
8420e14
修复时间戳为负数的问题
Jul 28, 2024
21f6555
格式化代码
Jul 28, 2024
ce5d38f
如果 time 为 0 ，不进行编码转换
Jul 28, 2024
c3be22d
如果 time 为 0 ，不进行编码转换
Jul 28, 2024
4237b51
将 NowMillis 返回 pstd::TimeType
Jul 30, 2024
c465f67
格式化代码
Jul 30, 2024
30a71a6
修复 cmd 层的 TTL 时间单位问题
Jul 31, 2024
18199be
fix test
Aug 2, 2024
9e53030
检查所有的时间相关代码，进行修改
Aug 6, 2024
5fa3155
解决冲突
Aug 6, 2024
37f03a9
fix
Aug 7, 2024
3e03f1c
fix unit test
Aug 7, 2024
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
4 changes: 2 additions & 2 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 @@ -46,7 +46,7 @@ class BaseMetaValue : public InternalValue {
}

uint64_t UpdateVersion() {
int64_t unix_time = rocksdb::Env::Default()->NowMicros();
int64_t unix_time = rocksdb::Env::Default()->NowMicros() / 1000;
AlexStocks marked this conversation as resolved.
Show resolved Hide resolved
if (version_ >= unix_time) {
version_++;
} else {
Expand Down Expand Up @@ -171,7 +171,7 @@ class ParsedBaseMetaValue : public ParsedInternalValue {
}

uint64_t UpdateVersion() {
int64_t unix_time = rocksdb::Env::Default()->NowMicros();
int64_t unix_time = rocksdb::Env::Default()->NowMicros() / 1000;
if (version_ >= static_cast<uint64_t>(unix_time)) {
version_++;
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/storage/src/lists_meta_value_format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ListsMetaValue : public InternalValue {
}

uint64_t UpdateVersion() {
int64_t unix_time = rocksdb::Env::Default()->NowMicros();
int64_t unix_time = rocksdb::Env::Default()->NowMicros() / 1000;
if (version_ >= static_cast<uint64_t>(unix_time)) {
version_++;
} else {
Expand Down Expand Up @@ -197,7 +197,7 @@ class ParsedListsMetaValue : public ParsedInternalValue {
}

uint64_t UpdateVersion() {
int64_t unix_time = rocksdb::Env::Default()->NowMicros();
int64_t unix_time = rocksdb::Env::Default()->NowMicros() / 1000;
if (version_ >= static_cast<uint64_t>(unix_time)) {
version_++;
} else {
Expand Down
8 changes: 6 additions & 2 deletions src/storage/src/storage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,7 +1472,9 @@ int64_t Storage::PTTL(const Slice& key) {
int64_t timestamp = 0;
auto& inst = GetDBInstance(key);
Status s = inst->TTL(key, &timestamp);
if (!s.IsNotFound()) {
if (s.ok() || s.IsNotFound()) {
return timestamp;
} else if (!s.IsNotFound()) {
return -3;
}
return timestamp;
Expand All @@ -1482,7 +1484,9 @@ int64_t Storage::TTL(const Slice& key) {
int64_t timestamp = 0;
auto& inst = GetDBInstance(key);
Status s = inst->TTL(key, &timestamp);
if (!s.IsNotFound()) {
if (s.ok() || s.IsNotFound()) {
return timestamp > 0 ? timestamp / 1000 : timestamp;
} else if (!s.IsNotFound()) {
return -3;
}
return timestamp > 0 ? timestamp / 1000 : timestamp;
Expand Down
Loading