From 985c8741ad06a6ca9dcfc1ae451e74d2ed9f4553 Mon Sep 17 00:00:00 2001 From: Hui Xiao Date: Mon, 18 Apr 2022 14:16:35 -0700 Subject: [PATCH] Conditionally declare and define variable that is unused in LITE mode (#9854) Summary: Context: As mentioned in https://github.com/facebook/rocksdb/issues/9701, we have the following in LITE=1 make static_lib for v7.0.2 ``` CC file/sequence_file_reader.o CC file/sst_file_manager_impl.o CC file/writable_file_writer.o In file included from file/writable_file_writer.cc:10: ./file/writable_file_writer.h:163:15: error: private field 'temperature_' is not used [-Werror,-Wunused-private-field] Temperature temperature_; ^ 1 error generated. make: *** [file/writable_file_writer.o] Error 1 ``` as titled Pull Request resolved: https://github.com/facebook/rocksdb/pull/9854 Test Plan: - Local `LITE=1 make static_lib` reveals the same error and error is gone after this fix - CI Reviewed By: ajkr, jay-zhuang Differential Revision: D35706585 Pulled By: hx235 fbshipit-source-id: 7743310298231ad6866304ffa2225c8abdc91d9a --- file/writable_file_writer.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/file/writable_file_writer.h b/file/writable_file_writer.h index ede71d218..8eeb06734 100644 --- a/file/writable_file_writer.h +++ b/file/writable_file_writer.h @@ -160,7 +160,9 @@ class WritableFileWriter { bool perform_data_verification_; uint32_t buffered_data_crc32c_checksum_; bool buffered_data_with_checksum_; +#ifndef ROCKSDB_LITE Temperature temperature_; +#endif // ROCKSDB_LITE public: WritableFileWriter( @@ -191,8 +193,10 @@ class WritableFileWriter { checksum_finalized_(false), perform_data_verification_(perform_data_verification), buffered_data_crc32c_checksum_(0), - buffered_data_with_checksum_(buffered_data_with_checksum), - temperature_(options.temperature) { + buffered_data_with_checksum_(buffered_data_with_checksum) { +#ifndef ROCKSDB_LITE + temperature_ = options.temperature; +#endif // ROCKSDB_LITE assert(!use_direct_io() || max_buffer_size_ > 0); TEST_SYNC_POINT_CALLBACK("WritableFileWriter::WritableFileWriter:0", reinterpret_cast(max_buffer_size_));