allow numa >= 2.0.8

Summary:
Allow numa >= 2.0.8 in buck TARGET file.
Closes https://github.com/facebook/rocksdb/pull/2504

Differential Revision: D5330550

Pulled By: yiwu-arbug

fbshipit-source-id: 8ffb6167b4ad913877eac16a20a91023b31f8d41
main
Yi Wu 7 years ago committed by Facebook Github Bot
parent e517bfa2c2
commit b49b371092
  1. 44
      TARGETS
  2. 2
      buckifier/targets_cfg.py

@ -34,7 +34,7 @@ rocksdb_external_deps = [
('lz4', None, 'lz4'), ('lz4', None, 'lz4'),
('zstd', None), ('zstd', None),
('tbb', None), ('tbb', None),
("numa", "2.0.8", "numa"), ("numa", None, "numa"),
("googletest", None, "gtest"), ("googletest", None, "gtest"),
] ]
@ -221,10 +221,10 @@ cpp_library(
"utilities/leveldb_options/leveldb_options.cc", "utilities/leveldb_options/leveldb_options.cc",
"utilities/lua/rocks_lua_compaction_filter.cc", "utilities/lua/rocks_lua_compaction_filter.cc",
"utilities/memory/memory_util.cc", "utilities/memory/memory_util.cc",
"utilities/merge_operators/max.cc",
"utilities/merge_operators/put.cc",
"utilities/merge_operators/cassandra/format.cc", "utilities/merge_operators/cassandra/format.cc",
"utilities/merge_operators/cassandra/merge_operator.cc", "utilities/merge_operators/cassandra/merge_operator.cc",
"utilities/merge_operators/max.cc",
"utilities/merge_operators/put.cc",
"utilities/merge_operators/string_append/stringappend.cc", "utilities/merge_operators/string_append/stringappend.cc",
"utilities/merge_operators/string_append/stringappend2.cc", "utilities/merge_operators/string_append/stringappend2.cc",
"utilities/merge_operators/uint64add.cc", "utilities/merge_operators/uint64add.cc",
@ -273,7 +273,6 @@ cpp_library(
"utilities/col_buf_encoder.cc", "utilities/col_buf_encoder.cc",
"utilities/col_buf_decoder.cc", "utilities/col_buf_decoder.cc",
"utilities/column_aware_encoding_util.cc", "utilities/column_aware_encoding_util.cc",
"utilities/merge_operators/cassandra/test_utils.cc"
], ],
deps = [":rocksdb_lib"], deps = [":rocksdb_lib"],
preprocessor_flags = rocksdb_preprocessor_flags, preprocessor_flags = rocksdb_preprocessor_flags,
@ -311,11 +310,8 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'],
['compaction_picker_test', 'db/compaction_picker_test.cc', 'serial'], ['compaction_picker_test', 'db/compaction_picker_test.cc', 'serial'],
['db_log_iter_test', 'db/db_log_iter_test.cc', 'serial'], ['db_log_iter_test', 'db/db_log_iter_test.cc', 'serial'],
['thread_list_test', 'util/thread_list_test.cc', 'serial'], ['thread_list_test', 'util/thread_list_test.cc', 'serial'],
['table_properties_collector_test',
'db/table_properties_collector_test.cc',
'serial'],
['document_db_test', 'utilities/document/document_db_test.cc', 'serial'], ['document_db_test', 'utilities/document/document_db_test.cc', 'serial'],
['event_logger_test', 'util/event_logger_test.cc', 'serial'], ['db_encryption_test', 'db/db_encryption_test.cc', 'serial'],
['coding_test', 'util/coding_test.cc', 'serial'], ['coding_test', 'util/coding_test.cc', 'serial'],
['statistics_test', 'monitoring/statistics_test.cc', 'serial'], ['statistics_test', 'monitoring/statistics_test.cc', 'serial'],
['options_settable_test', 'options/options_settable_test.cc', 'serial'], ['options_settable_test', 'options/options_settable_test.cc', 'serial'],
@ -325,6 +321,9 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'],
'serial'], 'serial'],
['db_iterator_test', 'db/db_iterator_test.cc', 'serial'], ['db_iterator_test', 'db/db_iterator_test.cc', 'serial'],
['db_sst_test', 'db/db_sst_test.cc', 'parallel'], ['db_sst_test', 'db/db_sst_test.cc', 'parallel'],
['cassandra_merge_test',
'utilities/merge_operators/cassandra/cassandra_merge_test.cc',
'serial'],
['geodb_test', 'utilities/geodb/geodb_test.cc', 'serial'], ['geodb_test', 'utilities/geodb/geodb_test.cc', 'serial'],
['listener_test', 'db/listener_test.cc', 'serial'], ['listener_test', 'db/listener_test.cc', 'serial'],
['write_callback_test', 'db/write_callback_test.cc', 'serial'], ['write_callback_test', 'db/write_callback_test.cc', 'serial'],
@ -341,8 +340,14 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'],
['write_batch_with_index_test', ['write_batch_with_index_test',
'utilities/write_batch_with_index/write_batch_with_index_test.cc', 'utilities/write_batch_with_index/write_batch_with_index_test.cc',
'serial'], 'serial'],
['json_document_test', 'utilities/document/json_document_test.cc', 'serial'], ['util_merge_operators_test',
'utilities/util_merge_operators_test.cc',
'serial'],
['file_reader_writer_test', 'util/file_reader_writer_test.cc', 'serial'], ['file_reader_writer_test', 'util/file_reader_writer_test.cc', 'serial'],
['table_properties_collector_test',
'db/table_properties_collector_test.cc',
'serial'],
['json_document_test', 'utilities/document/json_document_test.cc', 'serial'],
['repair_test', 'db/repair_test.cc', 'serial'], ['repair_test', 'db/repair_test.cc', 'serial'],
['persistent_cache_test', ['persistent_cache_test',
'utilities/persistent_cache/persistent_cache_test.cc', 'utilities/persistent_cache/persistent_cache_test.cc',
@ -361,10 +366,11 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'],
['db_test2', 'db/db_test2.cc', 'serial'], ['db_test2', 'db/db_test2.cc', 'serial'],
['filelock_test', 'util/filelock_test.cc', 'serial'], ['filelock_test', 'util/filelock_test.cc', 'serial'],
['write_controller_test', 'db/write_controller_test.cc', 'serial'], ['write_controller_test', 'db/write_controller_test.cc', 'serial'],
['compaction_iterator_test', 'db/compaction_iterator_test.cc', 'serial'], ['event_logger_test', 'util/event_logger_test.cc', 'serial'],
['spatial_db_test', 'utilities/spatialdb/spatial_db_test.cc', 'serial'], ['spatial_db_test', 'utilities/spatialdb/spatial_db_test.cc', 'serial'],
['c_test', 'db/c_test.c', 'serial'], ['c_test', 'db/c_test.c', 'serial'],
['range_del_aggregator_test', 'db/range_del_aggregator_test.cc', 'serial'], ['range_del_aggregator_test', 'db/range_del_aggregator_test.cc', 'serial'],
['options_util_test', 'utilities/options/options_util_test.cc', 'serial'],
['date_tiered_test', 'utilities/date_tiered/date_tiered_test.cc', 'serial'], ['date_tiered_test', 'utilities/date_tiered/date_tiered_test.cc', 'serial'],
['ldb_cmd_test', 'tools/ldb_cmd_test.cc', 'serial'], ['ldb_cmd_test', 'tools/ldb_cmd_test.cc', 'serial'],
['db_test', 'db/db_test.cc', 'parallel'], ['db_test', 'db/db_test.cc', 'parallel'],
@ -411,18 +417,6 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'],
['stringappend_test', ['stringappend_test',
'utilities/merge_operators/string_append/stringappend_test.cc', 'utilities/merge_operators/string_append/stringappend_test.cc',
'serial'], 'serial'],
['cassandra_format_test',
'utilities/merge_operators/cassandra/format_test.cc',
'serial'],
['cassandra_merge_test',
'utilities/merge_operators/cassandra/cassandra_merge_test.cc',
'serial'],
['cassandra_row_merge_test',
'utilities/merge_operators/cassandra/row_merge_test.cc',
'serial'],
['cassandra_serialize_test',
'utilities/merge_operators/cassandra/serialize_test.cc',
'serial'],
['reduce_levels_test', 'tools/reduce_levels_test.cc', 'serial'], ['reduce_levels_test', 'tools/reduce_levels_test.cc', 'serial'],
['prefix_test', 'db/prefix_test.cc', 'serial'], ['prefix_test', 'db/prefix_test.cc', 'serial'],
['ttl_test', 'utilities/ttl/ttl_test.cc', 'serial'], ['ttl_test', 'utilities/ttl/ttl_test.cc', 'serial'],
@ -443,11 +437,10 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'],
['db_range_del_test', 'db/db_range_del_test.cc', 'serial'], ['db_range_del_test', 'db/db_range_del_test.cc', 'serial'],
['table_test', 'table/table_test.cc', 'parallel'], ['table_test', 'table/table_test.cc', 'parallel'],
['db_tailing_iter_test', 'db/db_tailing_iter_test.cc', 'serial'], ['db_tailing_iter_test', 'db/db_tailing_iter_test.cc', 'serial'],
['compaction_iterator_test', 'db/compaction_iterator_test.cc', 'serial'],
['db_compaction_filter_test', 'db/db_compaction_filter_test.cc', 'parallel'], ['db_compaction_filter_test', 'db/db_compaction_filter_test.cc', 'parallel'],
['options_util_test', 'utilities/options/options_util_test.cc', 'serial'],
['dynamic_bloom_test', 'util/dynamic_bloom_test.cc', 'serial'], ['dynamic_bloom_test', 'util/dynamic_bloom_test.cc', 'serial'],
['db_basic_test', 'db/db_basic_test.cc', 'serial'], ['db_basic_test', 'db/db_basic_test.cc', 'serial'],
['db_encryption_test', 'db/db_encryption_test.cc', 'serial'],
['db_merge_operator_test', 'db/db_merge_operator_test.cc', 'serial'], ['db_merge_operator_test', 'db/db_merge_operator_test.cc', 'serial'],
['manual_compaction_test', 'db/manual_compaction_test.cc', 'parallel'], ['manual_compaction_test', 'db/manual_compaction_test.cc', 'parallel'],
['delete_scheduler_test', 'util/delete_scheduler_test.cc', 'serial'], ['delete_scheduler_test', 'util/delete_scheduler_test.cc', 'serial'],
@ -466,9 +459,6 @@ ROCKS_TESTS = [['merger_test', 'table/merger_test.cc', 'serial'],
'db/db_universal_compaction_test.cc', 'db/db_universal_compaction_test.cc',
'parallel'], 'parallel'],
['histogram_test', 'monitoring/histogram_test.cc', 'serial'], ['histogram_test', 'monitoring/histogram_test.cc', 'serial'],
['util_merge_operators_test',
'utilities/util_merge_operators_test.cc',
'serial'],
['fault_injection_test', 'db/fault_injection_test.cc', 'parallel'], ['fault_injection_test', 'db/fault_injection_test.cc', 'parallel'],
['env_basic_test', 'env/env_basic_test.cc', 'serial'], ['env_basic_test', 'env/env_basic_test.cc', 'serial'],
['iostats_context_test', 'monitoring/iostats_context_test.cc', 'serial'], ['iostats_context_test', 'monitoring/iostats_context_test.cc', 'serial'],

@ -38,7 +38,7 @@ rocksdb_external_deps = [
('lz4', None, 'lz4'), ('lz4', None, 'lz4'),
('zstd', None), ('zstd', None),
('tbb', None), ('tbb', None),
("numa", "2.0.8", "numa"), ("numa", None, "numa"),
("googletest", None, "gtest"), ("googletest", None, "gtest"),
] ]

Loading…
Cancel
Save