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

simplify include directive involving inttypes (#5402)

Browse Source 
Summary:
When using `PRIu64` type of printf specifier, current code base does the following:
```
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
```
However, this can be simplified to
```
#include <cinttypes>
```
as long as flag `-std=c++11` is used.
This should solve issues like https://github.com/facebook/rocksdb/issues/5159
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5402

Differential Revision: D15701195

Pulled By: miasantreble

fbshipit-source-id: 6dac0a05f52aadb55e9728038599d3d2e4b59d03
This commit is contained in:
Zhongyi Xie 2019-06-06 13:52:39 -07:00 committed by Facebook Github Bot
parent bee2f48a66
commit d68f9f4580
93 changed files with 79 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cache/cache_bench.cc vendored
View File

@ -3,9 +3,6 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#ifndef GFLAGS #ifndef GFLAGS
#include <cstdio> #include <cstdio>
int main() { int main() {
@ -14,7 +11,7 @@ int main() {
} }
#else #else
#include <inttypes.h> #include <cinttypes>
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>

4
cache/lru_cache.cc vendored
View File

@ -7,10 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "cache/lru_cache.h" #include "cache/lru_cache.h"
#include <assert.h> #include <assert.h>

4
cache/sharded_cache.cc vendored
View File

@ -7,10 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "cache/sharded_cache.h" #include "cache/sharded_cache.h"
#include <string> #include <string>

6
db/column_family.cc
View File

@ -9,11 +9,7 @@
#include "db/column_family.h" #include "db/column_family.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <vector> #include <vector>
#include <string> #include <string>
#include <algorithm> #include <algorithm>

6
db/compaction/compaction.cc
View File

@ -7,11 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"

7
db/compaction/compaction_job.cc
View File

@ -7,12 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include <cinttypes>
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

6
db/compaction/compaction_job_stats_test.cc
View File

@ -7,11 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <mutex> #include <mutex>

6
db/compaction/compaction_job_test.cc
View File

@ -5,11 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <map> #include <map>

6
db/compaction/compaction_picker.cc
View File

@ -9,11 +9,7 @@
#include "db/compaction/compaction_picker.h" #include "db/compaction/compaction_picker.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <limits> #include <limits>
#include <queue> #include <queue>
#include <string> #include <string>

6
db/compaction/compaction_picker_fifo.cc
View File

@ -10,11 +10,7 @@
#include "db/compaction/compaction_picker_fifo.h" #include "db/compaction/compaction_picker_fifo.h"
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"

4
db/compaction/compaction_picker_level.cc
View File

@ -7,10 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>

6
db/compaction/compaction_picker_universal.cc
View File

@ -10,11 +10,7 @@
#include "db/compaction/compaction_picker_universal.h" #include "db/compaction/compaction_picker_universal.h"
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <limits> #include <limits>
#include <queue> #include <queue>
#include <string> #include <string>

2
db/corruption_test.cc
View File

@ -13,7 +13,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h> #include <cinttypes>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"

6
db/db_filesnapshot.cc
View File

@ -6,11 +6,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <algorithm> #include <algorithm>
#include <string> #include <string>

3
db/db_impl/db_impl.cc
View File

@ -8,9 +8,6 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <stdint.h> #include <stdint.h>
#ifdef OS_SOLARIS #ifdef OS_SOLARIS
#include <alloca.h> #include <alloca.h>

5
db/db_impl/db_impl_compaction_flush.cc
View File

@ -8,10 +8,7 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "db/builder.h" #include "db/builder.h"
#include "db/error_handler.h" #include "db/error_handler.h"

6
db/db_impl/db_impl_experimental.cc
View File

@ -9,11 +9,7 @@
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"

5
db/db_impl/db_impl_files.cc
View File

@ -8,10 +8,7 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <set> #include <set>
#include <unordered_set> #include <unordered_set>
#include "db/event_helpers.h" #include "db/event_helpers.h"

5
db/db_impl/db_impl_open.cc
View File

@ -8,10 +8,7 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "db/builder.h" #include "db/builder.h"
#include "db/error_handler.h" #include "db/error_handler.h"

5
db/db_impl/db_impl_secondary.cc
View File

@ -5,10 +5,7 @@
#include "db/db_impl/db_impl_secondary.h" #include "db/db_impl/db_impl_secondary.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "db/db_iter.h" #include "db/db_iter.h"
#include "db/merge_context.h" #include "db/merge_context.h"

5
db/db_impl/db_impl_write.cc
View File

@ -8,10 +8,7 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "db/error_handler.h" #include "db/error_handler.h"
#include "db/event_helpers.h" #include "db/event_helpers.h"
#include "monitoring/perf_context_imp.h" #include "monitoring/perf_context_imp.h"

6
db/db_info_dumper.cc
View File

@ -3,13 +3,9 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "db/db_info_dumper.h" #include "db/db_info_dumper.h"
#include <inttypes.h> #include <cinttypes>
#include <stdio.h> #include <stdio.h>
#include <string> #include <string>
#include <algorithm> #include <algorithm>

6
db/db_test_util.h
View File

@ -9,12 +9,8 @@
#pragma once #pragma once
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h> #include <cinttypes>
#include <algorithm> #include <algorithm>
#include <map> #include <map>

6
db/dbformat.cc
View File

@ -8,11 +8,7 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/dbformat.h" #include "db/dbformat.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include "monitoring/perf_context_imp.h" #include "monitoring/perf_context_imp.h"
#include "port/port.h" #include "port/port.h"

6
db/external_sst_file_ingestion_job.cc
View File

@ -7,11 +7,7 @@
#include "db/external_sst_file_ingestion_job.h" #include "db/external_sst_file_ingestion_job.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <vector> #include <vector>

6
db/flush_job.cc
View File

@ -9,11 +9,7 @@
#include "db/flush_job.h" #include "db/flush_job.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>

4
db/forward_iterator_bench.cc
View File

@ -3,10 +3,6 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#if !defined(GFLAGS) || defined(ROCKSDB_LITE) #if !defined(GFLAGS) || defined(ROCKSDB_LITE)
#include <cstdio> #include <cstdio>
int main() { int main() {

6
db/internal_stats.cc
View File

@ -10,11 +10,7 @@
#include "db/internal_stats.h" #include "db/internal_stats.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#include <string> #include <string>

6
db/memtable_list.cc
View File

@ -5,11 +5,7 @@
// //
#include "db/memtable_list.h" #include "db/memtable_list.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <limits> #include <limits>
#include <queue> #include <queue>
#include <string> #include <string>

2
db/range_tombstone_fragmenter.cc
View File

@ -9,7 +9,7 @@
#include <functional> #include <functional>
#include <set> #include <set>
#include <inttypes.h> #include <cinttypes>
#include <stdio.h> #include <stdio.h>
#include "util/autovector.h" #include "util/autovector.h"

6
db/repair.cc
View File

@ -60,11 +60,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "db/builder.h" #include "db/builder.h"
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"

5
db/transaction_log_impl.cc
View File

@ -4,12 +4,9 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "db/transaction_log_impl.h" #include "db/transaction_log_impl.h"
#include <inttypes.h> #include <cinttypes>
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "util/file_reader_writer.h" #include "util/file_reader_writer.h"

6
db/version_builder.cc
View File

@ -9,11 +9,7 @@
#include "db/version_builder.h" #include "db/version_builder.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <functional> #include <functional>

6
db/version_set.cc
View File

@ -9,11 +9,7 @@
#include "db/version_set.h" #include "db/version_set.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <algorithm> #include <algorithm>
#include <array> #include <array>

6
db/wal_manager.cc
View File

@ -9,11 +9,7 @@
#include "db/wal_manager.h" #include "db/wal_manager.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <memory> #include <memory>

2
examples/multi_processes_example.cc
View File

@ -14,7 +14,7 @@
// run for a while, tailing the logs of the primary. After process with primary // run for a while, tailing the logs of the primary. After process with primary
// instance exits, this process will keep running until you hit 'CTRL+C'. // instance exits, this process will keep running until you hit 'CTRL+C'.
#include <inttypes.h> #include <cinttypes>
#include <chrono> #include <chrono>
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>

6
file/delete_scheduler_test.cc
View File

@ -3,11 +3,7 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <atomic> #include <atomic>
#include <thread> #include <thread>
#include <vector> #include <vector>

6
file/filename.cc
View File

@ -6,12 +6,8 @@
// Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "file/filename.h" #include "file/filename.h"
#include <inttypes.h> #include <cinttypes>
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>

6
file/sst_file_manager_impl.cc
View File

@ -5,11 +5,7 @@
#include "file/sst_file_manager_impl.h" #include "file/sst_file_manager_impl.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <vector> #include <vector>
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"

6
include/rocksdb/utilities/backupable_db.h
View File

@ -10,11 +10,7 @@
#pragma once #pragma once
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <functional> #include <functional>
#include <map> #include <map>
#include <string> #include <string>

6
logging/event_logger.cc
View File

@ -3,13 +3,9 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "logging/event_logger.h" #include "logging/event_logger.h"
#include <inttypes.h> #include <cinttypes>
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>
#include <string> #include <string>

4
memtable/memtablerep_bench.cc
View File

@ -7,10 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#ifndef GFLAGS #ifndef GFLAGS
#include <cstdio> #include <cstdio>
int main() { int main() {

6
monitoring/histogram.cc
View File

@ -7,13 +7,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "monitoring/histogram.h" #include "monitoring/histogram.h"
#include <inttypes.h> #include <cinttypes>
#include <cassert> #include <cassert>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>

6
monitoring/statistics.cc
View File

@ -5,11 +5,7 @@
// //
#include "monitoring/statistics.h" #include "monitoring/statistics.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "rocksdb/statistics.h" #include "rocksdb/statistics.h"
#include "port/likely.h" #include "port/likely.h"
#include <algorithm> #include <algorithm>

6
options/cf_options.cc
View File

@ -5,11 +5,7 @@
#include "options/cf_options.h" #include "options/cf_options.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <cassert> #include <cassert>
#include <limits> #include <limits>
#include <string> #include <string>

6
options/db_options.cc
View File

@ -5,11 +5,7 @@
#include "options/db_options.h" #include "options/db_options.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "logging/logging.h" #include "logging/logging.h"
#include "port/port.h" #include "port/port.h"

6
options/options.cc
View File

@ -9,11 +9,7 @@
#include "rocksdb/options.h" #include "rocksdb/options.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <limits> #include <limits>
#include "monitoring/statistics.h" #include "monitoring/statistics.h"

4
options/options_settable_test.cc
View File

@ -7,10 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <cstring> #include <cstring>
#include "options/options_helper.h" #include "options/options_helper.h"

6
options/options_test.cc
View File

@ -7,14 +7,10 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <cctype> #include <cctype>
#include <cstring> #include <cstring>
#include <unordered_map> #include <unordered_map>
#include <inttypes.h> #include <cinttypes>
#include "cache/lru_cache.h" #include "cache/lru_cache.h"
#include "cache/sharded_cache.h" #include "cache/sharded_cache.h"

7
table/block_based/block_based_table_factory.cc
View File

@ -7,12 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include <cinttypes>
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <memory> #include <memory>

2
table/block_based/index_builder.cc
View File

@ -10,7 +10,7 @@
#include "table/block_based/index_builder.h" #include "table/block_based/index_builder.h"
#include <assert.h> #include <assert.h>
#include <inttypes.h> #include <cinttypes>
#include <list> #include <list>
#include <string> #include <string>

2
table/block_based/index_builder.h
View File

@ -10,7 +10,7 @@
#pragma once #pragma once
#include <assert.h> #include <assert.h>
#include <inttypes.h> #include <cinttypes>
#include <list> #include <list>
#include <string> #include <string>

2
table/block_fetcher.cc
View File

@ -9,7 +9,7 @@
#include "table/block_fetcher.h" #include "table/block_fetcher.h"
#include <inttypes.h> #include <cinttypes>
#include <string> #include <string>
#include "logging/logging.h" #include "logging/logging.h"

6
table/cuckoo/cuckoo_table_reader_test.cc
View File

@ -13,11 +13,7 @@ int main() {
} }
#else #else
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <vector> #include <vector>
#include <string> #include <string>
#include <map> #include <map>

2
table/format.cc
View File

@ -9,7 +9,7 @@
#include "table/format.h" #include "table/format.h"
#include <inttypes.h> #include <cinttypes>
#include <string> #include <string>
#include "block_fetcher.h" #include "block_fetcher.h"

6
table/plain/plain_table_index.cc
View File

@ -5,11 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "table/plain/plain_table_index.h" #include "table/plain/plain_table_index.h"
#include "util/coding.h" #include "util/coding.h"

2
table/sst_file_reader_test.cc
View File

@ -5,7 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include <inttypes.h> #include <cinttypes>
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/sst_file_reader.h" #include "rocksdb/sst_file_reader.h"

6
test_util/transaction_test_util.cc
View File

@ -4,13 +4,9 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "test_util/transaction_test_util.h" #include "test_util/transaction_test_util.h"
#include <inttypes.h> #include <cinttypes>
#include <algorithm> #include <algorithm>
#include <numeric> #include <numeric>
#include <random> #include <random>

4
tools/db_bench.cc
View File

@ -7,10 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#ifndef GFLAGS #ifndef GFLAGS
#include <cstdio> #include <cstdio>
int main() { int main() {

6
tools/db_bench_tool.cc
View File

@ -7,10 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#ifdef GFLAGS #ifdef GFLAGS
#ifdef NUMA #ifdef NUMA
#include <numa.h> #include <numa.h>
@ -20,7 +16,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h> #include <cinttypes>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

6
tools/db_stress.cc
View File

@ -28,12 +28,8 @@ int main() {
} }
#else #else
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif // __STDC_FORMAT_MACROS
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h> #include <cinttypes>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>

6
tools/dump/db_dump_tool.cc
View File

@ -5,11 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <iostream> #include <iostream>
#include "rocksdb/db.h" #include "rocksdb/db.h"

6
tools/ldb_cmd.cc
View File

@ -7,11 +7,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "rocksdb/utilities/ldb_cmd.h" #include "rocksdb/utilities/ldb_cmd.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"

6
tools/sst_dump_tool.cc
View File

@ -8,11 +8,7 @@
#include "tools/sst_dump_tool_imp.h" #include "tools/sst_dump_tool_imp.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <memory> #include <memory>

4
tools/trace_analyzer_tool.cc
View File

@ -6,10 +6,6 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#ifdef GFLAGS #ifdef GFLAGS
#ifdef NUMA #ifdef NUMA
#include <numa.h> #include <numa.h>

6
tools/write_stress.cc
View File

@ -56,11 +56,7 @@ int main() {
} }
#else #else
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif // __STDC_FORMAT_MACROS
#include <inttypes.h>
#include <atomic> #include <atomic>
#include <random> #include <random>
#include <set> #include <set>

2
util/crc32c_arm64.h
View File

@ -6,7 +6,7 @@
#ifndef UTIL_CRC32C_ARM64_H #ifndef UTIL_CRC32C_ARM64_H
#define UTIL_CRC32C_ARM64_H #define UTIL_CRC32C_ARM64_H
#include <inttypes.h> #include <cinttypes>
#if defined(__aarch64__) || defined(__AARCH64__) #if defined(__aarch64__) || defined(__AARCH64__)
#ifdef __ARM_FEATURE_CRC32 #ifdef __ARM_FEATURE_CRC32

2
util/crc32c_ppc.c
View File

@ -6,7 +6,7 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#define CRC_TABLE #define CRC_TABLE
#include <inttypes.h> #include <cinttypes>
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <strings.h>
#include "util/crc32c_ppc_constants.h" #include "util/crc32c_ppc_constants.h"

6
util/duplicate_detector.h
View File

@ -5,11 +5,7 @@
#pragma once #pragma once
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "util/set_comparator.h" #include "util/set_comparator.h"

6
util/dynamic_bloom_test.cc
View File

@ -11,11 +11,7 @@ int main() {
} }
#else #else
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <functional> #include <functional>

6
util/rate_limiter_test.cc
View File

@ -7,13 +7,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "util/rate_limiter.h" #include "util/rate_limiter.h"
#include <inttypes.h> #include <cinttypes>
#include <chrono> #include <chrono>
#include <limits> #include <limits>

6
util/string_util.cc
View File

@ -5,12 +5,8 @@
// //
#include "util/string_util.h" #include "util/string_util.h"
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <cinttypes>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

6
utilities/backupable/backupable_db.cc
View File

@ -23,11 +23,7 @@
#include "util/string_util.h" #include "util/string_util.h"
#include "utilities/checkpoint/checkpoint_impl.h" #include "utilities/checkpoint/checkpoint_impl.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif // __STDC_FORMAT_MACROS
#include <inttypes.h>
#include <stdlib.h> #include <stdlib.h>
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>

6
utilities/blob_db/blob_db.cc
View File

@ -5,13 +5,9 @@
// //
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/blob_db/blob_db.h" #include "utilities/blob_db/blob_db.h"
#include <inttypes.h> #include <cinttypes>
#include "utilities/blob_db/blob_db_impl.h" #include "utilities/blob_db/blob_db_impl.h"
namespace rocksdb { namespace rocksdb {

6
utilities/blob_db/blob_dump_tool.cc
View File

@ -4,12 +4,8 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/blob_db/blob_dump_tool.h" #include "utilities/blob_db/blob_dump_tool.h"
#include <inttypes.h> #include <cinttypes>
#include <stdio.h> #include <stdio.h>
#include <iostream> #include <iostream>
#include <memory> #include <memory>

6
utilities/blob_db/blob_file.cc
View File

@ -6,11 +6,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "utilities/blob_db/blob_file.h" #include "utilities/blob_db/blob_file.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <algorithm> #include <algorithm>

6
utilities/checkpoint/checkpoint_impl.cc
View File

@ -11,11 +11,7 @@
#include "utilities/checkpoint/checkpoint_impl.h" #include "utilities/checkpoint/checkpoint_impl.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <vector> #include <vector>

5
utilities/options/options_util_test.cc
View File

@ -4,11 +4,8 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h> #include <cinttypes>
#include <cctype> #include <cctype>
#include <unordered_map> #include <unordered_map>

7
utilities/persistent_cache/persistent_cache_tier.cc
View File

@ -5,14 +5,9 @@
// //
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/persistent_cache/persistent_cache_tier.h" #include "utilities/persistent_cache/persistent_cache_tier.h"
#include "inttypes.h" #include <cinttypes>
#include <string> #include <string>
#include <sstream> #include <sstream>

6
utilities/transactions/pessimistic_transaction_db.cc
View File

@ -5,13 +5,9 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/pessimistic_transaction_db.h" #include "utilities/transactions/pessimistic_transaction_db.h"
#include <inttypes.h> #include <cinttypes>
#include <string> #include <string>
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>

6
utilities/transactions/transaction_base.cc
View File

@ -7,11 +7,7 @@
#include "utilities/transactions/transaction_base.h" #include "utilities/transactions/transaction_base.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"

6
utilities/transactions/transaction_lock_mgr.cc
View File

@ -5,13 +5,9 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/transaction_lock_mgr.h" #include "utilities/transactions/transaction_lock_mgr.h"
#include <inttypes.h> #include <cinttypes>
#include <algorithm> #include <algorithm>
#include <condition_variable> #include <condition_variable>

4
utilities/transactions/transaction_test.cc
View File

@ -5,10 +5,6 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/transaction_test.h" #include "utilities/transactions/transaction_test.h"
#include <algorithm> #include <algorithm>

6
utilities/transactions/transaction_test.h
View File

@ -5,11 +5,7 @@
#pragma once #pragma once
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <string> #include <string>

6
utilities/transactions/transaction_util.cc
View File

@ -5,13 +5,9 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/transaction_util.h" #include "utilities/transactions/transaction_util.h"
#include <inttypes.h> #include <cinttypes>
#include <string> #include <string>
#include <vector> #include <vector>

6
utilities/transactions/write_prepared_transaction_test.cc
View File

@ -5,13 +5,9 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/transaction_test.h" #include "utilities/transactions/transaction_test.h"
#include <inttypes.h> #include <cinttypes>
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <functional> #include <functional>

6
utilities/transactions/write_prepared_txn.cc
View File

@ -7,11 +7,7 @@
#include "utilities/transactions/write_prepared_txn.h" #include "utilities/transactions/write_prepared_txn.h"
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <map> #include <map>
#include <set> #include <set>

6
utilities/transactions/write_prepared_txn_db.cc
View File

@ -5,13 +5,9 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/write_prepared_txn_db.h" #include "utilities/transactions/write_prepared_txn_db.h"
#include <inttypes.h> #include <cinttypes>
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <unordered_set> #include <unordered_set>

6
utilities/transactions/write_prepared_txn_db.h
View File

@ -6,11 +6,7 @@
#pragma once #pragma once
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #include <cinttypes>
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#include <mutex> #include <mutex>
#include <queue> #include <queue>
#include <set> #include <set>

4
utilities/transactions/write_unprepared_transaction_test.cc
View File

@ -5,10 +5,6 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/transaction_test.h" #include "utilities/transactions/transaction_test.h"
#include "utilities/transactions/write_unprepared_txn.h" #include "utilities/transactions/write_unprepared_txn.h"
#include "utilities/transactions/write_unprepared_txn_db.h" #include "utilities/transactions/write_unprepared_txn_db.h"

4
utilities/transactions/write_unprepared_txn.cc
View File

@ -10,10 +10,6 @@
#include "util/cast_util.h" #include "util/cast_util.h"
#include "utilities/transactions/write_unprepared_txn_db.h" #include "utilities/transactions/write_unprepared_txn_db.h"
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
namespace rocksdb { namespace rocksdb {
bool WriteUnpreparedTxnReadCallback::IsVisibleFullCheck(SequenceNumber seq) { bool WriteUnpreparedTxnReadCallback::IsVisibleFullCheck(SequenceNumber seq) {

4
utilities/transactions/write_unprepared_txn_db.cc
View File

@ -5,10 +5,6 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/write_unprepared_txn_db.h" #include "utilities/transactions/write_unprepared_txn_db.h"
#include "rocksdb/utilities/transaction_db.h" #include "rocksdb/utilities/transaction_db.h"
#include "util/cast_util.h" #include "util/cast_util.h"

4
utilities/transactions/write_unprepared_txn_db.h
View File

@ -6,10 +6,6 @@
#pragma once #pragma once
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include "utilities/transactions/write_prepared_txn_db.h" #include "utilities/transactions/write_prepared_txn_db.h"
#include "utilities/transactions/write_unprepared_txn.h" #include "utilities/transactions/write_unprepared_txn.h"