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
main
Peter Dillinger 5 years ago committed by Facebook Github Bot
parent f7e7b34ebe
commit ec11eff3bc
  1. 2
      CMakeLists.txt
  2. 2
      TARGETS
  3. 2
      src.mk
  4. 0
      table/block_based/filter_policy.cc

@ -599,6 +599,7 @@ set(SOURCES
table/block_based/data_block_hash_index.cc table/block_based/data_block_hash_index.cc
table/block_based/data_block_footer.cc table/block_based/data_block_footer.cc
table/block_based/filter_block_reader_common.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/flush_block_policy.cc
table/block_based/full_filter_block.cc table/block_based/full_filter_block.cc
table/block_based/index_builder.cc table/block_based/index_builder.cc
@ -638,7 +639,6 @@ set(SOURCES
tools/trace_analyzer_tool.cc tools/trace_analyzer_tool.cc
trace_replay/trace_replay.cc trace_replay/trace_replay.cc
trace_replay/block_cache_tracer.cc trace_replay/block_cache_tracer.cc
util/bloom.cc
util/coding.cc util/coding.cc
util/compaction_job_stats_impl.cc util/compaction_job_stats_impl.cc
util/comparator.cc util/comparator.cc

@ -230,6 +230,7 @@ cpp_library(
"table/block_based/data_block_footer.cc", "table/block_based/data_block_footer.cc",
"table/block_based/data_block_hash_index.cc", "table/block_based/data_block_hash_index.cc",
"table/block_based/filter_block_reader_common.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/flush_block_policy.cc",
"table/block_based/full_filter_block.cc", "table/block_based/full_filter_block.cc",
"table/block_based/index_builder.cc", "table/block_based/index_builder.cc",
@ -265,7 +266,6 @@ cpp_library(
"tools/sst_dump_tool.cc", "tools/sst_dump_tool.cc",
"trace_replay/block_cache_tracer.cc", "trace_replay/block_cache_tracer.cc",
"trace_replay/trace_replay.cc", "trace_replay/trace_replay.cc",
"util/bloom.cc",
"util/build_version.cc", "util/build_version.cc",
"util/coding.cc", "util/coding.cc",
"util/compaction_job_stats_impl.cc", "util/compaction_job_stats_impl.cc",

@ -125,6 +125,7 @@ LIB_SOURCES = \
table/block_based/data_block_hash_index.cc \ table/block_based/data_block_hash_index.cc \
table/block_based/data_block_footer.cc \ table/block_based/data_block_footer.cc \
table/block_based/filter_block_reader_common.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/flush_block_policy.cc \
table/block_based/full_filter_block.cc \ table/block_based/full_filter_block.cc \
table/block_based/index_builder.cc \ table/block_based/index_builder.cc \
@ -157,7 +158,6 @@ LIB_SOURCES = \
tools/dump/db_dump_tool.cc \ tools/dump/db_dump_tool.cc \
trace_replay/trace_replay.cc \ trace_replay/trace_replay.cc \
trace_replay/block_cache_tracer.cc \ trace_replay/block_cache_tracer.cc \
util/bloom.cc \
util/build_version.cc \ util/build_version.cc \
util/coding.cc \ util/coding.cc \
util/compaction_job_stats_impl.cc \ util/compaction_job_stats_impl.cc \

Loading…
Cancel
Save