From ec11eff3bc15b8df3c038021ca0a0180da5eac9b Mon Sep 17 00:00:00 2001 From: Peter Dillinger Date: Thu, 24 Oct 2019 15:43:27 -0700 Subject: [PATCH] FilterPolicy consolidation, part 2/2 (#5966) Summary: The parts that are used to implement FilterPolicy / NewBloomFilterPolicy and not used other than for the block-based table should be consolidated under table/block_based/filter_policy*. This change is step 2 of 2: mv util/bloom.cc table/block_based/filter_policy.cc This gets its own PR so that git has the best chance of following the rename for blame purposes. Note that low-level shared implementation details of Bloom filters remain in util/bloom_impl.h, and util/bloom_test.cc remains where it is for now. Pull Request resolved: https://github.com/facebook/rocksdb/pull/5966 Test Plan: make check Differential Revision: D18124930 Pulled By: pdillinger fbshipit-source-id: 823bc09025b3395f092ef46a46aa5ba92a914d84 --- CMakeLists.txt | 2 +- TARGETS | 2 +- src.mk | 2 +- util/bloom.cc => table/block_based/filter_policy.cc | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename util/bloom.cc => table/block_based/filter_policy.cc (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff09290f09..45693df502 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -599,6 +599,7 @@ set(SOURCES table/block_based/data_block_hash_index.cc table/block_based/data_block_footer.cc table/block_based/filter_block_reader_common.cc + table/block_based/filter_policy.cc table/block_based/flush_block_policy.cc table/block_based/full_filter_block.cc table/block_based/index_builder.cc @@ -638,7 +639,6 @@ set(SOURCES tools/trace_analyzer_tool.cc trace_replay/trace_replay.cc trace_replay/block_cache_tracer.cc - util/bloom.cc util/coding.cc util/compaction_job_stats_impl.cc util/comparator.cc diff --git a/TARGETS b/TARGETS index 68d645a3d2..267b3cea8a 100644 --- a/TARGETS +++ b/TARGETS @@ -230,6 +230,7 @@ cpp_library( "table/block_based/data_block_footer.cc", "table/block_based/data_block_hash_index.cc", "table/block_based/filter_block_reader_common.cc", + "table/block_based/filter_policy.cc", "table/block_based/flush_block_policy.cc", "table/block_based/full_filter_block.cc", "table/block_based/index_builder.cc", @@ -265,7 +266,6 @@ cpp_library( "tools/sst_dump_tool.cc", "trace_replay/block_cache_tracer.cc", "trace_replay/trace_replay.cc", - "util/bloom.cc", "util/build_version.cc", "util/coding.cc", "util/compaction_job_stats_impl.cc", diff --git a/src.mk b/src.mk index 85fd83c24a..19f0312373 100644 --- a/src.mk +++ b/src.mk @@ -125,6 +125,7 @@ LIB_SOURCES = \ table/block_based/data_block_hash_index.cc \ table/block_based/data_block_footer.cc \ table/block_based/filter_block_reader_common.cc \ + table/block_based/filter_policy.cc \ table/block_based/flush_block_policy.cc \ table/block_based/full_filter_block.cc \ table/block_based/index_builder.cc \ @@ -157,7 +158,6 @@ LIB_SOURCES = \ tools/dump/db_dump_tool.cc \ trace_replay/trace_replay.cc \ trace_replay/block_cache_tracer.cc \ - util/bloom.cc \ util/build_version.cc \ util/coding.cc \ util/compaction_job_stats_impl.cc \ diff --git a/util/bloom.cc b/table/block_based/filter_policy.cc similarity index 100% rename from util/bloom.cc rename to table/block_based/filter_policy.cc