From e7612798b52b6d8561908dab35b1f8bc349cc2f5 Mon Sep 17 00:00:00 2001 From: Aaron Gao Date: Wed, 24 May 2017 11:49:35 -0700 Subject: update buckifer/TARGETS Summary: update targets file for release Closes https://github.com/facebook/rocksdb/pull/2358 Differential Revision: D5115705 Pulled By: lightmark fbshipit-source-id: 96a3c7e15b5807b5d0f5a9bb73850b92754b5794 --- TARGETS | 10 ++++++---- buckifier/targets_cfg.py | 3 +++ build_tools/fbcode_config.sh | 2 +- build_tools/fbcode_config4.8.1.sh | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/TARGETS b/TARGETS index 2dc861081..29d566963 100644 --- a/TARGETS +++ b/TARGETS @@ -248,6 +248,7 @@ cpp_library( "tools/ldb_cmd.cc", "tools/ldb_tool.cc", "tools/sst_dump_tool.cc", + "utilities/blob_db/blob_dump_tool.cc", ], deps = [], preprocessor_flags = rocksdb_preprocessor_flags, @@ -303,7 +304,7 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['cache_test', 'cache/cache_test.cc', 'serial'], ['options_file_test', 'db/options_file_test.cc', 'serial'], ['compaction_picker_test', 'db/compaction_picker_test.cc', 'serial'], - ['corruption_test', 'db/corruption_test.cc', 'serial'], + ['db_log_iter_test', 'db/db_log_iter_test.cc', 'serial'], ['thread_list_test', 'util/thread_list_test.cc', 'serial'], ['table_properties_collector_test', 'db/table_properties_collector_test.cc', @@ -406,6 +407,7 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['ttl_test', 'utilities/ttl/ttl_test.cc', 'serial'], ['merge_helper_test', 'db/merge_helper_test.cc', 'serial'], ['file_indexer_test', 'db/file_indexer_test.cc', 'serial'], + ['db_statistics_test', 'db/db_statistics_test.cc', 'serial'], ['memory_test', 'utilities/memory/memory_test.cc', 'serial'], ['log_test', 'db/log_test.cc', 'serial'], ['env_timed_test', 'utilities/env_timed_test.cc', 'serial'], @@ -429,12 +431,13 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['delete_scheduler_test', 'util/delete_scheduler_test.cc', 'serial'], ['transaction_test', 'utilities/transactions/transaction_test.cc', 'serial'], ['db_io_failure_test', 'db/db_io_failure_test.cc', 'serial'], - ['db_log_iter_test', 'db/db_log_iter_test.cc', 'serial'], + ['corruption_test', 'db/corruption_test.cc', 'serial'], ['compact_on_deletion_collector_test', 'utilities/table_properties_collectors/compact_on_deletion_collector_test.cc', 'serial'], ['env_test', 'env/env_test.cc', 'serial'], ['db_wal_test', 'db/db_wal_test.cc', 'parallel'], + ['timer_queue_test', 'util/timer_queue_test.cc', 'serial'], ['sim_cache_test', 'utilities/simulator_cache/sim_cache_test.cc', 'serial'], ['db_memtable_test', 'db/db_memtable_test.cc', 'serial'], ['db_universal_compaction_test', @@ -453,8 +456,7 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'], ['version_edit_test', 'db/version_edit_test.cc', 'serial'], ['skiplist_test', 'memtable/skiplist_test.cc', 'serial'], ['lru_cache_test', 'cache/lru_cache_test.cc', 'serial'], - ['plain_table_db_test', 'db/plain_table_db_test.cc', 'serial'], - ['db_statistics_test', 'db/db_statistics_test.cc', 'serial']] + ['plain_table_db_test', 'db/plain_table_db_test.cc', 'serial']] # Generate a test rule for each entry in ROCKS_TESTS diff --git a/buckifier/targets_cfg.py b/buckifier/targets_cfg.py index e61943ea0..2bf2d8583 100644 --- a/buckifier/targets_cfg.py +++ b/buckifier/targets_cfg.py @@ -13,6 +13,9 @@ rocksdb_compiler_flags = [ "-DROCKSDB_LIB_IO_POSIX", "-DROCKSDB_FALLOCATE_PRESENT", "-DROCKSDB_MALLOC_USABLE_SIZE", + "-DROCKSDB_RANGESYNC_PRESENT", + "-DROCKSDB_SCHED_GETCPU_PRESENT", + "-DROCKSDB_SUPPORT_THREAD_LOCAL", "-DOS_LINUX", # Flags to enable libs we include "-DSNAPPY", diff --git a/build_tools/fbcode_config.sh b/build_tools/fbcode_config.sh index 8f60839b1..1138dae3f 100644 --- a/build_tools/fbcode_config.sh +++ b/build_tools/fbcode_config.sh @@ -128,7 +128,7 @@ else fi CFLAGS+=" $DEPS_INCLUDE" -CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_SCHED_GETCPU_PRESENT" +CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_SCHED_GETCPU_PRESENT -DROCKSDB_SUPPORT_THREAD_LOCAL" CXXFLAGS+=" $CFLAGS" EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $TBB_LIBS" diff --git a/build_tools/fbcode_config4.8.1.sh b/build_tools/fbcode_config4.8.1.sh index 008cfe7a8..58b7ae25b 100644 --- a/build_tools/fbcode_config4.8.1.sh +++ b/build_tools/fbcode_config4.8.1.sh @@ -93,7 +93,7 @@ else fi CFLAGS+=" $DEPS_INCLUDE" -CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_SCHED_GETCPU_PRESENT" +CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_SCHED_GETCPU_PRESENT -DROCKSDB_SUPPORT_THREAD_LOCAL" CFLAGS+=" -DSNAPPY -DGFLAGS=google -DZLIB -DBZIP2 -DLZ4 -DZSTD -DNUMA -DTBB" CXXFLAGS+=" $CFLAGS" -- cgit v1.2.3-70-g09d2