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

support bottom level compression #3634

Merged
merged 4 commits into from
Jan 5, 2022
Merged

support bottom level compression #3634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1847ff
support bottom level compression
panda-sheep Jan 5, 2022
74a4a1e
address liuyu85cn's comments
panda-sheep Jan 5, 2022
4ede47d
Merge branch 'master' into support_bottom_level_compression
panda-sheep Jan 5, 2022
20c1867
Merge branch 'master' into support_bottom_level_compression
panda-sheep Jan 5, 2022
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
19 changes: 17 additions & 2 deletions src/kvstore/RocksEngineConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ DEFINE_bool(enable_partitioned_index_filter, false, "True for partitioned index
DEFINE_string(rocksdb_compression,
"snappy",
"Compression algorithm used by RocksDB, "
"options: no,snappy,lz4,lz4hc,zstd,zlib,bzip2");
"options: no, snappy, lz4, lz4hc, zstd, zlib, bzip2, xpress");

DEFINE_string(rocksdb_bottommost_compression,
"disable",
"Specify the bottommost level compression algorithm"
"options: no, snappy, lz4, lz4hc, zstd, zlib, bzip2, xpress, disable");

DEFINE_string(rocksdb_compression_per_level,
"",
"Specify per level compression algorithm, "
Expand Down Expand Up @@ -142,7 +148,9 @@ static const std::unordered_map<std::string, rocksdb::CompressionType> kCompress
{"lz4hc", rocksdb::kLZ4HCCompression},
{"zstd", rocksdb::kZSTD},
{"zlib", rocksdb::kZlibCompression},
{"bzip2", rocksdb::kBZip2Compression}};
{"bzip2", rocksdb::kBZip2Compression},
{"xpress", rocksdb::kXpressCompression},
{"disable", rocksdb::kDisableCompressionOption}};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the difference between disable and no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kNoCompression means no compression
kDisableCompressionOption is used to disable some compression options.
refer to https://github.com/facebook/rocksdb/blob/fe31dc53ca04a6241a1489be826b20218dff987e/include/rocksdb/compression_type.h#L17

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Awesome job.


static rocksdb::Status initRocksdbCompression(rocksdb::Options& baseOpts) {
// Set the general compression algorithm
Expand All @@ -153,6 +161,13 @@ static rocksdb::Status initRocksdbCompression(rocksdb::Options& baseOpts) {
return rocksdb::Status::InvalidArgument();
}
baseOpts.compression = it->second;

it = kCompressionTypeMap.find(FLAGS_rocksdb_bottommost_compression);
if (it == kCompressionTypeMap.end()) {
LOG(ERROR) << "Unsupported compression type: " << FLAGS_rocksdb_bottommost_compression;
return rocksdb::Status::InvalidArgument();
}
baseOpts.bottommost_compression = it->second;
}
if (FLAGS_rocksdb_compression_per_level.empty()) {
return rocksdb::Status::OK();
Expand Down
1 change: 1 addition & 0 deletions src/kvstore/RocksEngineConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ DECLARE_string(part_man_type);

DECLARE_string(rocksdb_compression_per_level);
DECLARE_string(rocksdb_compression);
DECLARE_string(rocksdb_bottommost_compression);

DECLARE_bool(enable_rocksdb_statistics);
DECLARE_string(rocksdb_stats_level);
Expand Down
20 changes: 20 additions & 0 deletions src/kvstore/test/RocksEngineConfigTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,26 @@ TEST(RocksEngineConfigTest, CompressionConfigTest) {
ASSERT_EQ(rocksdb::Status::kInvalidArgument, status.code());
}

{
FLAGS_rocksdb_compression = "lz4";
FLAGS_rocksdb_compression_per_level = "";
FLAGS_rocksdb_bottommost_compression = "zstd";
rocksdb::Options options;
auto status = initRocksdbOptions(options, 1);
ASSERT_TRUE(status.ok()) << status.ToString();
ASSERT_EQ(rocksdb::kLZ4Compression, options.compression);
ASSERT_EQ(rocksdb::kZSTD, options.bottommost_compression);

rocksdb::DB* db = nullptr;
SCOPE_EXIT {
delete db;
};
options.create_if_missing = true;
fs::TempDir rootPath("/tmp/RocksDBCompressionConfigTest.XXXXXX");
status = rocksdb::DB::Open(options, rootPath.path(), &db);
ASSERT_TRUE(status.ok()) << status.ToString();
}

{
FLAGS_rocksdb_compression = "lz4";
FLAGS_rocksdb_compression_per_level = "no:no::snappy::zstd";
Expand Down