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

Jump to bottom

FIFO Compaction with TTL #2480

Closed
wants to merge 11 commits into from
+507 −39
Closed

FIFO Compaction with TTL #2480

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
353da0e
FIFO Compaction with TTL.
sagar0 Jun 22, 2017
2d87ed4
Remove accidental additions to TableFileCreationReason enum.
sagar0 Jun 22, 2017
5d8f184
Cleaned up FIFO compaction with TTL logic, and added tests.
sagar0 Jun 25, 2017
3a90501
Added creation_time to the tables built during repair and recovery.
sagar0 Jun 25, 2017
20514a9
Add ttl param to the end in CompactionOptionsFIFO constructor.
sagar0 Jun 25, 2017
ee95191
Add to HISTORY.md and update score based on TTL.
sagar0 Jun 26, 2017
e6fc920
Return MaxInputFileCreationTime irrespective of compaction.
sagar0 Jun 26, 2017
7c096ef
Move log message to the right place.
sagar0 Jun 26, 2017
a87140a
Support FIFO-Compaction-with-TTL only with unlimited open files.
sagar0 Jun 26, 2017
05bf810
Add tests to check the compatiblity of FIFO-with-TTL with other options.
sagar0 Jun 27, 2017
12a5eda
Pick only continguous files for deletion based on TTL.
sagar0 Jun 27, 2017
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
3 changes: 2 additions & 1 deletion db/compaction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,8 @@ bool Compaction::ShouldFormSubcompactions() const {
uint64_t Compaction::MaxInputFileCreationTime() const {
uint64_t max_creation_time = 0;
for (const auto& file : inputs_[0].files) {
if (file->fd.table_reader != nullptr) {
if (file->fd.table_reader != nullptr &&
file->fd.table_reader->GetTableProperties() != nullptr) {
uint64_t creation_time =
file->fd.table_reader->GetTableProperties()->creation_time;
sagar0 marked this conversation as resolved.
Show resolved Hide resolved
max_creation_time = std::max(max_creation_time, creation_time);
Expand Down
12 changes: 7 additions & 5 deletions db/compaction_picker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1442,15 +1442,17 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(

for (auto ritr = level_files.rbegin(); ritr != level_files.rend(); ++ritr) {
auto f = *ritr;
if (f->fd.table_reader != nullptr) {
if (f->fd.table_reader != nullptr &&
f->fd.table_reader->GetTableProperties() != nullptr) {
auto creation_time =
f->fd.table_reader->GetTableProperties()->creation_time;
if (creation_time > 0 &&
creation_time <
if (creation_time == 0 ||
creation_time >=
(current_time - ioptions_.compaction_options_fifo.ttl)) {
total_size -= f->compensated_file_size;
inputs[0].files.push_back(f);
break;
}
total_size -= f->compensated_file_size;
inputs[0].files.push_back(f);
}
}

Expand Down
42 changes: 41 additions & 1 deletion db/db_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2808,7 +2808,47 @@ TEST_F(DBTest, FIFOCompactionTestWithCompaction) {
options.compaction_options_fifo.max_table_files_size);
}

TEST_F(DBTest, FIFOCompactionTestWithTTL) {
// Check that FIFO-with-TTL is not supported with max_open_files != -1.
TEST_F(DBTest, FIFOCompactionWithTTLAndMaxOpenFilesTest) {
Options options;
options.compaction_style = kCompactionStyleFIFO;
options.create_if_missing = true;
options.compaction_options_fifo.ttl = 600; // seconds

// Check that it is not supported with max_open_files != -1.
options.max_open_files = 100;
options = CurrentOptions(options);
ASSERT_TRUE(TryReopen(options).IsNotSupported());

options.max_open_files = -1;
ASSERT_OK(TryReopen(options));
}

// Check that FIFO-with-TTL is supported only with BlockBasedTableFactory.
TEST_F(DBTest, FIFOCompactionWithTTLAndVariousTableFormatsTest) {
Options options;
options.compaction_style = kCompactionStyleFIFO;
options.create_if_missing = true;
options.compaction_options_fifo.ttl = 600; // seconds

options = CurrentOptions(options);
options.table_factory.reset(NewBlockBasedTableFactory());
ASSERT_OK(TryReopen(options));

Destroy(options);
options.table_factory.reset(NewPlainTableFactory());
ASSERT_TRUE(TryReopen(options).IsNotSupported());

Destroy(options);
options.table_factory.reset(NewCuckooTableFactory());
ASSERT_TRUE(TryReopen(options).IsNotSupported());

Destroy(options);
options.table_factory.reset(NewAdaptiveTableFactory());
ASSERT_TRUE(TryReopen(options).IsNotSupported());
}

TEST_F(DBTest, FIFOCompactionWithTTLTest) {
Options options;
options.compaction_style = kCompactionStyleFIFO;
options.write_buffer_size = 10 << 10; // 10KB
Expand Down
3 changes: 2 additions & 1 deletion db/version_set.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,8 @@ uint32_t GetExpiredTtlFilesCount(const ImmutableCFOptions& ioptions,
if (status.ok()) {
const uint64_t current_time = static_cast<uint64_t>(_current_time);
for (auto f : files) {
if (!f->being_compacted && f->fd.table_reader != nullptr) {
if (!f->being_compacted && f->fd.table_reader != nullptr &&
f->fd.table_reader->GetTableProperties() != nullptr) {
auto creation_time =
f->fd.table_reader->GetTableProperties()->creation_time;
if (creation_time > 0 &&
Expand Down