From db818d2d1af4c206748ade9f510bf07c455ad6dc Mon Sep 17 00:00:00 2001 From: Siying Dong Date: Mon, 12 Jun 2017 06:32:01 -0700 Subject: [PATCH] Fix RocksDB Lite build with CLANG Summary: Closes https://github.com/facebook/rocksdb/pull/2419 Differential Revision: D5193976 Pulled By: siying fbshipit-source-id: 62d115edee6043237e9d6ad3c2a05481e162c9eb --- db/compaction_iterator.cc | 2 ++ db/compaction_iterator.h | 2 ++ util/file_reader_writer.h | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/db/compaction_iterator.cc b/db/compaction_iterator.cc index 5c1e6bbe8..a89d16fcc 100644 --- a/db/compaction_iterator.cc +++ b/db/compaction_iterator.cc @@ -71,7 +71,9 @@ CompactionIterator::CompactionIterator( range_del_agg_(range_del_agg), compaction_(std::move(compaction)), compaction_filter_(compaction_filter), +#ifndef ROCKSDB_LITE compaction_listener_(compaction_listener), +#endif // ROCKSDB_LITE shutting_down_(shutting_down), ignore_snapshots_(false), merge_out_iter_(merge_helper_) { diff --git a/db/compaction_iterator.h b/db/compaction_iterator.h index b89fe088d..10f13fd13 100644 --- a/db/compaction_iterator.h +++ b/db/compaction_iterator.h @@ -134,7 +134,9 @@ class CompactionIterator { RangeDelAggregator* range_del_agg_; std::unique_ptr compaction_; const CompactionFilter* compaction_filter_; +#ifndef ROCKSDB_LITE CompactionEventListener* compaction_listener_; +#endif // ROCKSDB_LITE const std::atomic* shutting_down_; bool bottommost_level_; bool valid_ = false; diff --git a/util/file_reader_writer.h b/util/file_reader_writer.h index 8de41a203..2823463e0 100644 --- a/util/file_reader_writer.h +++ b/util/file_reader_writer.h @@ -118,10 +118,12 @@ class WritableFileWriter { // Actually written data size can be used for truncate // not counting padding data uint64_t filesize_; +#ifndef ROCKSDB_LITE // This is necessary when we use unbuffered access // and writes must happen on aligned offsets // so we need to go back and write that page again uint64_t next_write_offset_; +#endif // ROCKSDB_LITE bool pending_sync_; uint64_t last_sync_size_; uint64_t bytes_per_sync_; @@ -135,7 +137,9 @@ class WritableFileWriter { buf_(), max_buffer_size_(options.writable_file_max_buffer_size), filesize_(0), +#ifndef ROCKSDB_LITE next_write_offset_(0), +#endif // ROCKSDB_LITE pending_sync_(false), last_sync_size_(0), bytes_per_sync_(options.bytes_per_sync),