andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Conditionally declare and define variable that is unused in LITE mode (#9854)

Browse Source 
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
This commit is contained in:
Hui Xiao 2022-04-18 14:16:35 -07:00
parent 3345d12a1d
commit 3d15d07740
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
file/writable_file_writer.h
View File

@ -160,7 +160,9 @@ class WritableFileWriter {
bool perform_data_verification_; bool perform_data_verification_;
uint32_t buffered_data_crc32c_checksum_; uint32_t buffered_data_crc32c_checksum_;
bool buffered_data_with_checksum_; bool buffered_data_with_checksum_;
#ifndef ROCKSDB_LITE
Temperature temperature_; Temperature temperature_;
#endif // ROCKSDB_LITE
public: public:
WritableFileWriter( WritableFileWriter(
@ -191,8 +193,10 @@ class WritableFileWriter {
checksum_finalized_(false), checksum_finalized_(false),
perform_data_verification_(perform_data_verification), perform_data_verification_(perform_data_verification),
buffered_data_crc32c_checksum_(0), buffered_data_crc32c_checksum_(0),
buffered_data_with_checksum_(buffered_data_with_checksum), buffered_data_with_checksum_(buffered_data_with_checksum) {
temperature_(options.temperature) { #ifndef ROCKSDB_LITE
temperature_ = options.temperature;
#endif // ROCKSDB_LITE
assert(!use_direct_io() || max_buffer_size_ > 0); assert(!use_direct_io() || max_buffer_size_ > 0);
TEST_SYNC_POINT_CALLBACK("WritableFileWriter::WritableFileWriter:0", TEST_SYNC_POINT_CALLBACK("WritableFileWriter::WritableFileWriter:0",
reinterpret_cast<void*>(max_buffer_size_)); reinterpret_cast<void*>(max_buffer_size_));