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

[2.1 backport] table: Always check key ordering when inserting to an SST #48

Merged
merged 1 commit into from
Sep 12, 2019
Merged

[2.1 backport] table: Always check key ordering when inserting to an SST #48

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
9 changes: 8 additions & 1 deletion table/block_based_table_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,14 @@ void BlockBasedTableBuilder::Add(const Slice& key, const Slice& value) {
ValueType value_type = ExtractValueType(key);
if (IsValueType(value_type)) {
if (r->props.num_entries > 0) {
assert(r->internal_comparator.Compare(key, Slice(r->last_key)) > 0);
if (r->internal_comparator.Compare(key, Slice(r->last_key)) <= 0) {
// We were about to insert keys out of order. Abort.
ROCKS_LOG_ERROR(r->ioptions.info_log,
"Out-of-order key insertion into block based table");
r->status =
Status::Corruption("Out-of-order key insertion into table");
return;
}
}

auto should_flush = r->flush_block_policy->Update(key, value);
Expand Down