diff --git a/db/db_impl.cc b/db/db_impl.cc index 702dade25..a32448f92 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -2513,8 +2513,7 @@ Status DBImpl::DoCompactionWork(CompactionState* compact, // If this is the bottommost level (no files in lower levels) // and the earliest snapshot is larger than this seqno // then we can squash the seqno to zero. - if (options_.compaction_style == kCompactionStyleLevel && - bottommost_level && ikey.sequence < earliest_snapshot && + if (bottommost_level && ikey.sequence < earliest_snapshot && ikey.type != kTypeMerge) { assert(ikey.type != kTypeDeletion); // make a copy because updating in place would cause problems diff --git a/db/version_set.cc b/db/version_set.cc index ae00309e1..9ea9a84ca 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -2276,7 +2276,6 @@ Compaction* VersionSet::CompactRange(int input_level, int output_level, Iterator* VersionSet::MakeInputIterator(Compaction* c) { ReadOptions options; - options.verify_checksums = options_->paranoid_checks; options.fill_cache = false; // Level-0 files have to be merged together. For other levels, diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index e75421d08..453b5cdbb 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -693,7 +693,7 @@ enum ReadTier { struct ReadOptions { // If true, all data read from underlying storage will be // verified against corresponding checksums. - // Default: false + // Default: true bool verify_checksums; // Should the "data block"/"index block"/"filter block" read for this @@ -734,11 +734,13 @@ struct ReadOptions { // Specify to create a tailing iterator -- a special iterator that has a // view of the complete database (i.e. it can also be used to read newly - // added data) and is optimized for sequential reads. + // added data) and is optimized for sequential reads. It will return records + // that were inserted into the database after the creation of the iterator. + // Default: false bool tailing; ReadOptions() - : verify_checksums(false), + : verify_checksums(true), fill_cache(true), prefix_seek(false), snapshot(nullptr),