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

Revert "Add kHashSearch to stress tests (#6210)" (#6220)

Browse Source 
Summary:
This reverts commit 54f9092b0c.
It making our daily stress tests fail. Revert it until the issues are fixed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6220

Differential Revision: D19179881

Pulled By: maysamyabandeh

fbshipit-source-id: 99de0eaf776567fa81110b9ad2608234a16083ce
This commit is contained in:
Maysam Yabandeh 2019-12-19 10:45:24 -08:00 committed by Facebook Github Bot
parent 9ff569bdfc
commit 77d5ba7887
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
table/block_based/block_based_table_factory.cc
View File

@ -157,8 +157,6 @@ size_t TailPrefetchStats::GetSuggestedPrefetchSize() {
return std::min(kMaxPrefetchSize, max_qualified_size); return std::min(kMaxPrefetchSize, max_qualified_size);
} }
// TODO(myabandeh): We should return an error instead of silently changing the
// options
BlockBasedTableFactory::BlockBasedTableFactory( BlockBasedTableFactory::BlockBasedTableFactory(
const BlockBasedTableOptions& _table_options) const BlockBasedTableOptions& _table_options)
: table_options_(_table_options) { : table_options_(_table_options) {
@ -186,11 +184,6 @@ BlockBasedTableFactory::BlockBasedTableFactory(
if (table_options_.index_block_restart_interval < 1) { if (table_options_.index_block_restart_interval < 1) {
table_options_.index_block_restart_interval = 1; table_options_.index_block_restart_interval = 1;
} }
if (table_options_.index_type == BlockBasedTableOptions::kHashSearch &&
table_options_.index_block_restart_interval != 1) {
// Currently kHashSearch is incompatible with index_block_restart_interval > 1
table_options_.index_block_restart_interval = 1;
}
if (table_options_.partition_filters && if (table_options_.partition_filters &&
table_options_.index_type != table_options_.index_type !=
BlockBasedTableOptions::kTwoLevelIndexSearch) { BlockBasedTableOptions::kTwoLevelIndexSearch) {

3
table/block_based/index_builder.cc
View File

@ -39,9 +39,6 @@ IndexBuilder* IndexBuilder::CreateIndexBuilder(
table_opt.index_shortening, /* include_first_key */ false); table_opt.index_shortening, /* include_first_key */ false);
} break; } break;
case BlockBasedTableOptions::kHashSearch: { case BlockBasedTableOptions::kHashSearch: {
// Currently kHashSearch is incompatible with index_block_restart_interval
// > 1
assert(table_opt.index_block_restart_interval == 1);
result = new HashIndexBuilder( result = new HashIndexBuilder(
comparator, int_key_slice_transform, comparator, int_key_slice_transform,
table_opt.index_block_restart_interval, table_opt.format_version, table_opt.index_block_restart_interval, table_opt.format_version,

8
tools/db_crashtest.py
View File

@ -47,7 +47,7 @@ default_params = {
"expected_values_path": expected_values_file.name, "expected_values_path": expected_values_file.name,
"flush_one_in": 1000000, "flush_one_in": 1000000,
# Temporarily disable hash index # Temporarily disable hash index
"index_type": lambda: random.randint(0,2), "index_type": lambda: random.choice([0,2]),
"max_background_compactions": 20, "max_background_compactions": 20,
"max_bytes_for_level_base": 10485760, "max_bytes_for_level_base": 10485760,
"max_key": 100000000, "max_key": 100000000,
@ -228,12 +228,6 @@ def finalize_and_sanitize(src_params):
dest_params["partition_filters"] = 0 dest_params["partition_filters"] = 0
else: else:
dest_params["use_block_based_filter"] = 0 dest_params["use_block_based_filter"] = 0
# kHashSearch is incompatible with index_block_restart_interval > 1
if dest_params["index_type"] == 1:
dest_params["index_block_restart_interval"] = 1;
# KHashSearch need prefix_extractor to be set
if dest_params.get("prefix_size", 0) < 1:
dest_params["prefix_size"] = 3;
if dest_params.get("atomic_flush", 0) == 1: if dest_params.get("atomic_flush", 0) == 1:
# disable pipelined write when atomic flush is used. # disable pipelined write when atomic flush is used.
dest_params["enable_pipelined_write"] = 0 dest_params["enable_pipelined_write"] = 0