diff --git a/include/rocksdb/utilities/write_batch_with_index.h b/include/rocksdb/utilities/write_batch_with_index.h index 26fb795176ec27ead272c863da42a9b47e97f20e..a0b3bac99dff3727cdf627e0950de6fd264b8e57 100644 --- a/include/rocksdb/utilities/write_batch_with_index.h +++ b/include/rocksdb/utilities/write_batch_with_index.h @@ -166,7 +166,7 @@ class WriteBatchWithIndex : public WriteBatchBase { // called. Iterator* NewIteratorWithBase(ColumnFamilyHandle* column_family, Iterator* base_iterator, - const ReadOptions *opts = nullptr); + const ReadOptions* opts = nullptr); // default column family Iterator* NewIteratorWithBase(Iterator* base_iterator); diff --git a/table/block_based/block_based_table_reader.cc b/table/block_based/block_based_table_reader.cc index 0189df36c78c6049ca19e8efeebe5c2904ce5691..082a0ef864f8b52fccce2e6cba2379b82e03428c 100644 --- a/table/block_based/block_based_table_reader.cc +++ b/table/block_based/block_based_table_reader.cc @@ -1201,28 +1201,29 @@ Status BlockBasedTable::Open( rep->compression_dict_handle = BlockHandle::NullBlockHandle(); // Read metaindex - std::unique_ptr meta; - std::unique_ptr meta_iter; - s = new_table->ReadMetaBlock(prefetch_buffer.get(), &meta, &meta_iter); + std::unique_ptr metaindex; + std::unique_ptr metaindex_iter; + s = new_table->ReadMetaIndexBlock(prefetch_buffer.get(), &metaindex, + &metaindex_iter); if (!s.ok()) { return s; } // Populates table_properties and some fields that depend on it, // such as index_type. - s = new_table->ReadPropertiesBlock(prefetch_buffer.get(), meta_iter.get(), - largest_seqno); + s = new_table->ReadPropertiesBlock(prefetch_buffer.get(), + metaindex_iter.get(), largest_seqno); if (!s.ok()) { return s; } - s = new_table->ReadRangeDelBlock(prefetch_buffer.get(), meta_iter.get(), + s = new_table->ReadRangeDelBlock(prefetch_buffer.get(), metaindex_iter.get(), internal_comparator, &lookup_context); if (!s.ok()) { return s; } s = new_table->PrefetchIndexAndFilterBlocks( - prefetch_buffer.get(), meta_iter.get(), new_table.get(), prefetch_all, - table_options, level, &lookup_context); + prefetch_buffer.get(), metaindex_iter.get(), new_table.get(), + prefetch_all, table_options, level, &lookup_context); if (s.ok()) { // Update tail prefetch stats @@ -1634,17 +1635,19 @@ size_t BlockBasedTable::ApproximateMemoryUsage() const { return usage; } -// Load the meta-block from the file. On success, return the loaded meta block -// and its iterator. -Status BlockBasedTable::ReadMetaBlock(FilePrefetchBuffer* prefetch_buffer, - std::unique_ptr* meta_block, - std::unique_ptr* iter) { +// Load the meta-index-block from the file. On success, return the loaded +// metaindex +// block and its iterator. +Status BlockBasedTable::ReadMetaIndexBlock( + FilePrefetchBuffer* prefetch_buffer, + std::unique_ptr* metaindex_block, + std::unique_ptr* iter) { // TODO(sanjay): Skip this if footer.metaindex_handle() size indicates // it is an empty block. - std::unique_ptr meta; + std::unique_ptr metaindex; Status s = ReadBlockFromFile( rep_->file.get(), prefetch_buffer, rep_->footer, ReadOptions(), - rep_->footer.metaindex_handle(), &meta, rep_->ioptions, + rep_->footer.metaindex_handle(), &metaindex, rep_->ioptions, true /* decompress */, true /*maybe_compressed*/, BlockType::kMetaIndex, UncompressionDict::GetEmptyDict(), rep_->persistent_cache_options, kDisableGlobalSequenceNumber, 0 /* read_amp_bytes_per_bit */, @@ -1659,10 +1662,10 @@ Status BlockBasedTable::ReadMetaBlock(FilePrefetchBuffer* prefetch_buffer, return s; } - *meta_block = std::move(meta); + *metaindex_block = std::move(metaindex); // meta block uses bytewise comparator. - iter->reset(meta_block->get()->NewDataIterator(BytewiseComparator(), - BytewiseComparator())); + iter->reset(metaindex_block->get()->NewDataIterator(BytewiseComparator(), + BytewiseComparator())); return Status::OK(); } @@ -3743,11 +3746,12 @@ Status BlockBasedTable::VerifyChecksum(const ReadOptions& read_options, TableReaderCaller caller) { Status s; // Check Meta blocks - std::unique_ptr meta; - std::unique_ptr meta_iter; - s = ReadMetaBlock(nullptr /* prefetch buffer */, &meta, &meta_iter); + std::unique_ptr metaindex; + std::unique_ptr metaindex_iter; + s = ReadMetaIndexBlock(nullptr /* prefetch buffer */, &metaindex, + &metaindex_iter); if (s.ok()) { - s = VerifyChecksumInMetaBlocks(meta_iter.get()); + s = VerifyChecksumInMetaBlocks(metaindex_iter.get()); if (!s.ok()) { return s; } @@ -3938,11 +3942,12 @@ Status BlockBasedTable::CreateIndexReader( index_reader); } case BlockBasedTableOptions::kHashSearch: { - std::unique_ptr meta_guard; - std::unique_ptr meta_iter_guard; + std::unique_ptr metaindex_guard; + std::unique_ptr metaindex_iter_guard; auto meta_index_iter = preloaded_meta_index_iter; if (meta_index_iter == nullptr) { - auto s = ReadMetaBlock(prefetch_buffer, &meta_guard, &meta_iter_guard); + auto s = ReadMetaIndexBlock(prefetch_buffer, &metaindex_guard, + &metaindex_iter_guard); if (!s.ok()) { // we simply fall back to binary search in case there is any // problem with prefix hash index loading. @@ -3953,7 +3958,7 @@ Status BlockBasedTable::CreateIndexReader( use_cache, prefetch, pin, lookup_context, index_reader); } - meta_index_iter = meta_iter_guard.get(); + meta_index_iter = metaindex_iter_guard.get(); } return HashIndexReader::Create(this, prefetch_buffer, meta_index_iter, @@ -4110,31 +4115,33 @@ Status BlockBasedTable::DumpTable(WritableFile* out_file) { out_file->Append( "Metaindex Details:\n" "--------------------------------------\n"); - std::unique_ptr meta; - std::unique_ptr meta_iter; - Status s = ReadMetaBlock(nullptr /* prefetch_buffer */, &meta, &meta_iter); + std::unique_ptr metaindex; + std::unique_ptr metaindex_iter; + Status s = ReadMetaIndexBlock(nullptr /* prefetch_buffer */, &metaindex, + &metaindex_iter); if (s.ok()) { - for (meta_iter->SeekToFirst(); meta_iter->Valid(); meta_iter->Next()) { - s = meta_iter->status(); + for (metaindex_iter->SeekToFirst(); metaindex_iter->Valid(); + metaindex_iter->Next()) { + s = metaindex_iter->status(); if (!s.ok()) { return s; } - if (meta_iter->key() == rocksdb::kPropertiesBlock) { + if (metaindex_iter->key() == rocksdb::kPropertiesBlock) { out_file->Append(" Properties block handle: "); - out_file->Append(meta_iter->value().ToString(true).c_str()); + out_file->Append(metaindex_iter->value().ToString(true).c_str()); out_file->Append("\n"); - } else if (meta_iter->key() == rocksdb::kCompressionDictBlock) { + } else if (metaindex_iter->key() == rocksdb::kCompressionDictBlock) { out_file->Append(" Compression dictionary block handle: "); - out_file->Append(meta_iter->value().ToString(true).c_str()); + out_file->Append(metaindex_iter->value().ToString(true).c_str()); out_file->Append("\n"); - } else if (strstr(meta_iter->key().ToString().c_str(), + } else if (strstr(metaindex_iter->key().ToString().c_str(), "filter.rocksdb.") != nullptr) { out_file->Append(" Filter block handle: "); - out_file->Append(meta_iter->value().ToString(true).c_str()); + out_file->Append(metaindex_iter->value().ToString(true).c_str()); out_file->Append("\n"); - } else if (meta_iter->key() == rocksdb::kRangeDelBlock) { + } else if (metaindex_iter->key() == rocksdb::kRangeDelBlock) { out_file->Append(" Range deletion block handle: "); - out_file->Append(meta_iter->value().ToString(true).c_str()); + out_file->Append(metaindex_iter->value().ToString(true).c_str()); out_file->Append("\n"); } } diff --git a/table/block_based/block_based_table_reader.h b/table/block_based/block_based_table_reader.h index dd496d35466acf956d229b316979edbf9b57e8fd..68c76ddb78afbce89823d91ff2433ed9c970079e 100644 --- a/table/block_based/block_based_table_reader.h +++ b/table/block_based/block_based_table_reader.h @@ -413,9 +413,9 @@ class BlockBasedTable : public TableReader { TailPrefetchStats* tail_prefetch_stats, const bool prefetch_all, const bool preload_all, std::unique_ptr* prefetch_buffer); - Status ReadMetaBlock(FilePrefetchBuffer* prefetch_buffer, - std::unique_ptr* meta_block, - std::unique_ptr* iter); + Status ReadMetaIndexBlock(FilePrefetchBuffer* prefetch_buffer, + std::unique_ptr* metaindex_block, + std::unique_ptr* iter); Status TryReadPropertiesWithGlobalSeqno(FilePrefetchBuffer* prefetch_buffer, const Slice& handle_value, TableProperties** table_properties); diff --git a/utilities/write_batch_with_index/write_batch_with_index.cc b/utilities/write_batch_with_index/write_batch_with_index.cc index 3eb14ebe8d7b321dd148f5a7d9f6148c4477f9a2..4cc6b9bca031c07aba0ed858707017fe773bfc7c 100644 --- a/utilities/write_batch_with_index/write_batch_with_index.cc +++ b/utilities/write_batch_with_index/write_batch_with_index.cc @@ -42,9 +42,8 @@ class BaseDeltaIterator : public Iterator { base_iterator_(base_iterator), delta_iterator_(delta_iterator), comparator_(comparator), - iterate_upper_bound_(read_options? read_options->iterate_upper_bound : - nullptr) - {} + iterate_upper_bound_(read_options ? read_options->iterate_upper_bound + : nullptr) {} ~BaseDeltaIterator() override {} @@ -284,8 +283,8 @@ class BaseDeltaIterator : public Iterator { return; } if (iterate_upper_bound_) { - if (comparator_->Compare(delta_entry.key, - *iterate_upper_bound_) >= 0) { + if (comparator_->Compare(delta_entry.key, *iterate_upper_bound_) >= + 0) { // out of upper bound -> finished. return; } @@ -660,7 +659,7 @@ WBWIIterator* WriteBatchWithIndex::NewIterator( Iterator* WriteBatchWithIndex::NewIteratorWithBase( ColumnFamilyHandle* column_family, Iterator* base_iterator, - const ReadOptions *read_options) { + const ReadOptions* read_options) { if (rep->overwrite_key == false) { assert(false); return nullptr;