diff --git a/env/env.cc b/env/env.cc index 54802ef5da7..683771e7236 100644 --- a/env/env.cc +++ b/env/env.cc @@ -1087,8 +1087,6 @@ void AssignEnvOptions(EnvOptions* env_options, const DBOptions& options) { env_options->set_fd_cloexec = options.is_fd_close_on_exec; env_options->bytes_per_sync = options.bytes_per_sync; env_options->compaction_readahead_size = options.compaction_readahead_size; - env_options->random_access_max_buffer_size = - options.random_access_max_buffer_size; env_options->rate_limiter = options.rate_limiter.get(); env_options->writable_file_max_buffer_size = options.writable_file_max_buffer_size; diff --git a/examples/rocksdb_option_file_example.ini b/examples/rocksdb_option_file_example.ini index 351890e51ed..4a00ec60575 100644 --- a/examples/rocksdb_option_file_example.ini +++ b/examples/rocksdb_option_file_example.ini @@ -48,7 +48,6 @@ table_cache_numshardbits=4 max_file_opening_threads=1 writable_file_max_buffer_size=1048576 - random_access_max_buffer_size=1048576 use_fsync=false max_total_wal_size=0 max_open_files=-1 diff --git a/include/rocksdb/env.h b/include/rocksdb/env.h index 5f299ee1a76..5ad313ce3e7 100644 --- a/include/rocksdb/env.h +++ b/include/rocksdb/env.h @@ -133,9 +133,6 @@ struct EnvOptions { // See DBOptions doc size_t compaction_readahead_size = 0; - // See DBOptions doc - size_t random_access_max_buffer_size = 0; - // See DBOptions doc size_t writable_file_max_buffer_size = 1024 * 1024; diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index f34e34e59cc..2a4ec9831d7 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -1065,23 +1065,6 @@ struct DBOptions { // Dynamically changeable through SetDBOptions() API. size_t compaction_readahead_size = 2 * 1024 * 1024; - // This is a maximum buffer size that is used by WinMmapReadableFile in - // unbuffered disk I/O mode. We need to maintain an aligned buffer for - // reads. We allow the buffer to grow until the specified value and then - // for bigger requests allocate one shot buffers. In unbuffered mode we - // always bypass read-ahead buffer at ReadaheadRandomAccessFile - // When read-ahead is required we then make use of compaction_readahead_size - // value and always try to read ahead. With read-ahead we always - // pre-allocate buffer to the size instead of growing it up to a limit. - // - // This option is currently honored only on Windows - // - // Default: 1 Mb - // - // Special value: 0 - means do not maintain per instance buffer. Allocate - // per request buffer and avoid locking. - size_t random_access_max_buffer_size = 1024 * 1024; - // This is the maximum buffer size that is used by WritableFileWriter. // With direct IO, we need to maintain an aligned buffer for writes. // We allow the buffer to grow until it's size hits the limit in buffered diff --git a/java/rocksjni/env_options.cc b/java/rocksjni/env_options.cc index 9312ec2d6b4..c3a9ae825da 100644 --- a/java/rocksjni/env_options.cc +++ b/java/rocksjni/env_options.cc @@ -249,26 +249,6 @@ jlong Java_org_rocksdb_EnvOptions_compactionReadaheadSize(JNIEnv *, jclass, return ENV_OPTIONS_GET(jhandle, compaction_readahead_size); } -/* - * Class: org_rocksdb_EnvOptions - * Method: setRandomAccessMaxBufferSize - * Signature: (JJ)V - */ -void Java_org_rocksdb_EnvOptions_setRandomAccessMaxBufferSize( - JNIEnv *, jclass, jlong jhandle, jlong random_access_max_buffer_size) { - ENV_OPTIONS_SET_SIZE_T(jhandle, random_access_max_buffer_size); -} - -/* - * Class: org_rocksdb_EnvOptions - * Method: randomAccessMaxBufferSize - * Signature: (J)J - */ -jlong Java_org_rocksdb_EnvOptions_randomAccessMaxBufferSize(JNIEnv *, jclass, - jlong jhandle) { - return ENV_OPTIONS_GET(jhandle, random_access_max_buffer_size); -} - /* * Class: org_rocksdb_EnvOptions * Method: setWritableFileMaxBufferSize diff --git a/java/rocksjni/options.cc b/java/rocksjni/options.cc index 2ae82f90da1..c986511a3f2 100644 --- a/java/rocksjni/options.cc +++ b/java/rocksjni/options.cc @@ -1577,29 +1577,6 @@ jlong Java_org_rocksdb_Options_compactionReadaheadSize(JNIEnv*, jclass, return static_cast(opt->compaction_readahead_size); } -/* - * Class: org_rocksdb_Options - * Method: setRandomAccessMaxBufferSize - * Signature: (JJ)V - */ -void Java_org_rocksdb_Options_setRandomAccessMaxBufferSize( - JNIEnv*, jclass, jlong jhandle, jlong jrandom_access_max_buffer_size) { - auto* opt = reinterpret_cast(jhandle); - opt->random_access_max_buffer_size = - static_cast(jrandom_access_max_buffer_size); -} - -/* - * Class: org_rocksdb_Options - * Method: randomAccessMaxBufferSize - * Signature: (J)J - */ -jlong Java_org_rocksdb_Options_randomAccessMaxBufferSize(JNIEnv*, jclass, - jlong jhandle) { - auto* opt = reinterpret_cast(jhandle); - return static_cast(opt->random_access_max_buffer_size); -} - /* * Class: org_rocksdb_Options * Method: setWritableFileMaxBufferSize @@ -7112,29 +7089,6 @@ jlong Java_org_rocksdb_DBOptions_compactionReadaheadSize(JNIEnv*, jclass, return static_cast(opt->compaction_readahead_size); } -/* - * Class: org_rocksdb_DBOptions - * Method: setRandomAccessMaxBufferSize - * Signature: (JJ)V - */ -void Java_org_rocksdb_DBOptions_setRandomAccessMaxBufferSize( - JNIEnv*, jclass, jlong jhandle, jlong jrandom_access_max_buffer_size) { - auto* opt = reinterpret_cast(jhandle); - opt->random_access_max_buffer_size = - static_cast(jrandom_access_max_buffer_size); -} - -/* - * Class: org_rocksdb_DBOptions - * Method: randomAccessMaxBufferSize - * Signature: (J)J - */ -jlong Java_org_rocksdb_DBOptions_randomAccessMaxBufferSize(JNIEnv*, jclass, - jlong jhandle) { - auto* opt = reinterpret_cast(jhandle); - return static_cast(opt->random_access_max_buffer_size); -} - /* * Class: org_rocksdb_DBOptions * Method: setWritableFileMaxBufferSize diff --git a/java/src/main/java/org/rocksdb/DBOptions.java b/java/src/main/java/org/rocksdb/DBOptions.java index 161203d26c8..0221a63fba0 100644 --- a/java/src/main/java/org/rocksdb/DBOptions.java +++ b/java/src/main/java/org/rocksdb/DBOptions.java @@ -772,19 +772,6 @@ public String dailyOffpeakTimeUTC() { return dailyOffpeakTimeUTC(nativeHandle_); } - @Override - public DBOptions setRandomAccessMaxBufferSize(final long randomAccessMaxBufferSize) { - assert (isOwningHandle()); - setRandomAccessMaxBufferSize(nativeHandle_, randomAccessMaxBufferSize); - return this; - } - - @Override - public long randomAccessMaxBufferSize() { - assert (isOwningHandle()); - return randomAccessMaxBufferSize(nativeHandle_); - } - @Override public DBOptions setWritableFileMaxBufferSize(final long writableFileMaxBufferSize) { assert(isOwningHandle()); @@ -1364,9 +1351,6 @@ private static native void setCompactionReadaheadSize( private static native void setDailyOffpeakTimeUTC( final long handle, final String dailyOffpeakTimeUTC); private static native String dailyOffpeakTimeUTC(final long handle); - private static native void setRandomAccessMaxBufferSize( - final long handle, final long randomAccessMaxBufferSize); - private static native long randomAccessMaxBufferSize(final long handle); private static native void setWritableFileMaxBufferSize( final long handle, final long writableFileMaxBufferSize); private static native long writableFileMaxBufferSize(final long handle); diff --git a/java/src/main/java/org/rocksdb/DBOptionsInterface.java b/java/src/main/java/org/rocksdb/DBOptionsInterface.java index 348b1137c41..bc9d9acbd65 100644 --- a/java/src/main/java/org/rocksdb/DBOptionsInterface.java +++ b/java/src/main/java/org/rocksdb/DBOptionsInterface.java @@ -938,54 +938,6 @@ public interface DBOptionsInterface> { */ long dbWriteBufferSize(); - /** - * This is a maximum buffer size that is used by WinMmapReadableFile in - * unbuffered disk I/O mode. We need to maintain an aligned buffer for - * reads. We allow the buffer to grow until the specified value and then - * for bigger requests allocate one shot buffers. In unbuffered mode we - * always bypass read-ahead buffer at ReadaheadRandomAccessFile - * When read-ahead is required we then make use of - * {@link MutableDBOptionsInterface#compactionReadaheadSize()} value and - * always try to read ahead. - * With read-ahead we always pre-allocate buffer to the size instead of - * growing it up to a limit. - * - * This option is currently honored only on Windows - * - * Default: 1 Mb - * - * Special value: 0 - means do not maintain per instance buffer. Allocate - * per request buffer and avoid locking. - * - * @param randomAccessMaxBufferSize the maximum size of the random access - * buffer - * - * @return the reference to the current options. - */ - T setRandomAccessMaxBufferSize(long randomAccessMaxBufferSize); - - /** - * This is a maximum buffer size that is used by WinMmapReadableFile in - * unbuffered disk I/O mode. We need to maintain an aligned buffer for - * reads. We allow the buffer to grow until the specified value and then - * for bigger requests allocate one shot buffers. In unbuffered mode we - * always bypass read-ahead buffer at ReadaheadRandomAccessFile - * When read-ahead is required we then make use of - * {@link MutableDBOptionsInterface#compactionReadaheadSize()} value and - * always try to read ahead. With read-ahead we always pre-allocate buffer - * to the size instead of growing it up to a limit. - * - * This option is currently honored only on Windows - * - * Default: 1 Mb - * - * Special value: 0 - means do not maintain per instance buffer. Allocate - * per request buffer and avoid locking. - * - * @return the maximum size of the random access buffer - */ - long randomAccessMaxBufferSize(); - /** * Use adaptive mutex, which spins in the user space before resorting * to kernel. This could reduce context switch when the mutex is not diff --git a/java/src/main/java/org/rocksdb/EnvOptions.java b/java/src/main/java/org/rocksdb/EnvOptions.java index 85c2dac37cd..f31e6aa2b77 100644 --- a/java/src/main/java/org/rocksdb/EnvOptions.java +++ b/java/src/main/java/org/rocksdb/EnvOptions.java @@ -250,28 +250,6 @@ public long compactionReadaheadSize() { return compactionReadaheadSize(nativeHandle_); } - /** - * See {@link DBOptions#setRandomAccessMaxBufferSize(long)}. - * - * @param randomAccessMaxBufferSize the max buffer size for random access. - * - * @return the reference to these options. - */ - public EnvOptions setRandomAccessMaxBufferSize(final long randomAccessMaxBufferSize) { - setRandomAccessMaxBufferSize(nativeHandle_, randomAccessMaxBufferSize); - return this; - } - - /** - * See {@link DBOptions#randomAccessMaxBufferSize()}. - * - * @return the max buffer size for random access. - */ - public long randomAccessMaxBufferSize() { - assert (isOwningHandle()); - return randomAccessMaxBufferSize(nativeHandle_); - } - /** * See {@link DBOptions#setWritableFileMaxBufferSize(long)}. * @@ -350,9 +328,6 @@ private static native void setFallocateWithKeepSize( private static native void setCompactionReadaheadSize( final long handle, final long compactionReadaheadSize); private static native long compactionReadaheadSize(final long handle); - private static native void setRandomAccessMaxBufferSize( - final long handle, final long randomAccessMaxBufferSize); - private static native long randomAccessMaxBufferSize(final long handle); private static native void setWritableFileMaxBufferSize( final long handle, final long writableFileMaxBufferSize); private static native long writableFileMaxBufferSize(final long handle); diff --git a/java/src/main/java/org/rocksdb/Options.java b/java/src/main/java/org/rocksdb/Options.java index df2aabd7f05..c184e140f60 100644 --- a/java/src/main/java/org/rocksdb/Options.java +++ b/java/src/main/java/org/rocksdb/Options.java @@ -860,19 +860,6 @@ public String dailyOffpeakTimeUTC() { return dailyOffpeakTimeUTC(nativeHandle_); } - @Override - public Options setRandomAccessMaxBufferSize(final long randomAccessMaxBufferSize) { - assert (isOwningHandle()); - setRandomAccessMaxBufferSize(nativeHandle_, randomAccessMaxBufferSize); - return this; - } - - @Override - public long randomAccessMaxBufferSize() { - assert (isOwningHandle()); - return randomAccessMaxBufferSize(nativeHandle_); - } - @Override public Options setWritableFileMaxBufferSize(final long writableFileMaxBufferSize) { assert(isOwningHandle()); @@ -2271,9 +2258,6 @@ private static native void setCompactionReadaheadSize( private static native long compactionReadaheadSize(final long handle); private static native void setDailyOffpeakTimeUTC(final long handle, final String offpeakTimeUTC); private static native String dailyOffpeakTimeUTC(final long handle); - private static native void setRandomAccessMaxBufferSize( - final long handle, final long randomAccessMaxBufferSize); - private static native long randomAccessMaxBufferSize(final long handle); private static native void setWritableFileMaxBufferSize( final long handle, final long writableFileMaxBufferSize); private static native long writableFileMaxBufferSize(final long handle); diff --git a/java/src/test/java/org/rocksdb/DBOptionsTest.java b/java/src/test/java/org/rocksdb/DBOptionsTest.java index 888e022a1a1..a71345f744a 100644 --- a/java/src/test/java/org/rocksdb/DBOptionsTest.java +++ b/java/src/test/java/org/rocksdb/DBOptionsTest.java @@ -462,15 +462,6 @@ public void compactionReadaheadSize() { } } - @Test - public void randomAccessMaxBufferSize() { - try (final DBOptions opt = new DBOptions()) { - final long longValue = rand.nextLong(); - opt.setRandomAccessMaxBufferSize(longValue); - assertThat(opt.randomAccessMaxBufferSize()).isEqualTo(longValue); - } - } - @Test public void writableFileMaxBufferSize() { try(final DBOptions opt = new DBOptions()) { diff --git a/java/src/test/java/org/rocksdb/EnvOptionsTest.java b/java/src/test/java/org/rocksdb/EnvOptionsTest.java index 0f3d8e23428..67d75c9f3d5 100644 --- a/java/src/test/java/org/rocksdb/EnvOptionsTest.java +++ b/java/src/test/java/org/rocksdb/EnvOptionsTest.java @@ -111,15 +111,6 @@ public void compactionReadaheadSize() { } } - @Test - public void randomAccessMaxBufferSize() { - try (final EnvOptions envOptions = new EnvOptions()) { - final int intValue = rand.nextInt(2147483647); - envOptions.setRandomAccessMaxBufferSize(intValue); - assertThat(envOptions.randomAccessMaxBufferSize()).isEqualTo(intValue); - } - } - @Test public void writableFileMaxBufferSize() { try (final EnvOptions envOptions = new EnvOptions()) { diff --git a/java/src/test/java/org/rocksdb/OptionsTest.java b/java/src/test/java/org/rocksdb/OptionsTest.java index 79837db206c..6615b676147 100644 --- a/java/src/test/java/org/rocksdb/OptionsTest.java +++ b/java/src/test/java/org/rocksdb/OptionsTest.java @@ -708,15 +708,6 @@ public void compactionReadaheadSize() { } } - @Test - public void randomAccessMaxBufferSize() { - try (final Options opt = new Options()) { - final long longValue = rand.nextLong(); - opt.setRandomAccessMaxBufferSize(longValue); - assertThat(opt.randomAccessMaxBufferSize()).isEqualTo(longValue); - } - } - @Test public void writableFileMaxBufferSize() { try (final Options opt = new Options()) { diff --git a/options/db_options.cc b/options/db_options.cc index 29e7632473a..ea8f4b22d7b 100644 --- a/options/db_options.cc +++ b/options/db_options.cc @@ -254,8 +254,7 @@ static std::unordered_map {0, OptionType::kBoolean, OptionVerificationType::kDeprecated, OptionTypeFlags::kNone}}, {"random_access_max_buffer_size", - {offsetof(struct ImmutableDBOptions, random_access_max_buffer_size), - OptionType::kSizeT, OptionVerificationType::kNormal, + {0, OptionType::kSizeT, OptionVerificationType::kDeprecated, OptionTypeFlags::kNone}}, {"use_adaptive_mutex", {offsetof(struct ImmutableDBOptions, use_adaptive_mutex), @@ -755,7 +754,6 @@ ImmutableDBOptions::ImmutableDBOptions(const DBOptions& options) advise_random_on_open(options.advise_random_on_open), db_write_buffer_size(options.db_write_buffer_size), write_buffer_manager(options.write_buffer_manager), - random_access_max_buffer_size(options.random_access_max_buffer_size), use_adaptive_mutex(options.use_adaptive_mutex), listeners(options.listeners), enable_thread_tracking(options.enable_thread_tracking), @@ -905,9 +903,6 @@ void ImmutableDBOptions::Dump(Logger* log) const { db_write_buffer_size); ROCKS_LOG_HEADER(log, " Options.write_buffer_manager: %p", write_buffer_manager.get()); - ROCKS_LOG_HEADER( - log, " Options.random_access_max_buffer_size: %" ROCKSDB_PRIszt, - random_access_max_buffer_size); ROCKS_LOG_HEADER(log, " Options.use_adaptive_mutex: %d", use_adaptive_mutex); ROCKS_LOG_HEADER(log, " Options.rate_limiter: %p", diff --git a/options/db_options.h b/options/db_options.h index 25318ec1a61..df0854f1dd6 100644 --- a/options/db_options.h +++ b/options/db_options.h @@ -62,7 +62,6 @@ struct ImmutableDBOptions { bool advise_random_on_open; size_t db_write_buffer_size; std::shared_ptr write_buffer_manager; - size_t random_access_max_buffer_size; bool use_adaptive_mutex; std::vector> listeners; bool enable_thread_tracking; diff --git a/options/options_helper.cc b/options/options_helper.cc index 0e9b0199a44..bc28470129a 100644 --- a/options/options_helper.cc +++ b/options/options_helper.cc @@ -124,8 +124,6 @@ void BuildDBOptions(const ImmutableDBOptions& immutable_db_options, options.write_buffer_manager = immutable_db_options.write_buffer_manager; options.compaction_readahead_size = mutable_db_options.compaction_readahead_size; - options.random_access_max_buffer_size = - immutable_db_options.random_access_max_buffer_size; options.writable_file_max_buffer_size = mutable_db_options.writable_file_max_buffer_size; options.use_adaptive_mutex = immutable_db_options.use_adaptive_mutex; diff --git a/options/options_settable_test.cc b/options/options_settable_test.cc index d5d92838308..d6660908d8b 100644 --- a/options/options_settable_test.cc +++ b/options/options_settable_test.cc @@ -430,7 +430,6 @@ TEST_F(OptionsSettableTest, DBOptionsAllFieldsSettable) { "use_direct_reads=false;" "use_direct_io_for_flush_and_compaction=false;" "max_log_file_size=4607;" - "random_access_max_buffer_size=1048576;" "advise_random_on_open=true;" "fail_if_options_file_error=false;" "enable_pipelined_write=false;" diff --git a/options/options_test.cc b/options/options_test.cc index ef5e62c3fed..46690403a61 100644 --- a/options/options_test.cc +++ b/options/options_test.cc @@ -178,7 +178,6 @@ TEST_F(OptionsTest, GetOptionsFromMapTest) { {"advise_random_on_open", "true"}, {"use_adaptive_mutex", "false"}, {"compaction_readahead_size", "100"}, - {"random_access_max_buffer_size", "3145728"}, {"writable_file_max_buffer_size", "314159"}, {"bytes_per_sync", "47"}, {"wal_bytes_per_sync", "48"}, @@ -362,7 +361,6 @@ TEST_F(OptionsTest, GetOptionsFromMapTest) { ASSERT_EQ(new_db_opt.advise_random_on_open, true); ASSERT_EQ(new_db_opt.use_adaptive_mutex, false); ASSERT_EQ(new_db_opt.compaction_readahead_size, 100); - ASSERT_EQ(new_db_opt.random_access_max_buffer_size, 3145728); ASSERT_EQ(new_db_opt.writable_file_max_buffer_size, 314159); ASSERT_EQ(new_db_opt.bytes_per_sync, static_cast(47)); ASSERT_EQ(new_db_opt.wal_bytes_per_sync, static_cast(48)); @@ -2486,7 +2484,6 @@ TEST_F(OptionsOldApiTest, GetOptionsFromMapTest) { {"advise_random_on_open", "true"}, {"use_adaptive_mutex", "false"}, {"compaction_readahead_size", "100"}, - {"random_access_max_buffer_size", "3145728"}, {"writable_file_max_buffer_size", "314159"}, {"bytes_per_sync", "47"}, {"wal_bytes_per_sync", "48"}, @@ -2674,7 +2671,6 @@ TEST_F(OptionsOldApiTest, GetOptionsFromMapTest) { ASSERT_EQ(new_db_opt.advise_random_on_open, true); ASSERT_EQ(new_db_opt.use_adaptive_mutex, false); ASSERT_EQ(new_db_opt.compaction_readahead_size, 100); - ASSERT_EQ(new_db_opt.random_access_max_buffer_size, 3145728); ASSERT_EQ(new_db_opt.writable_file_max_buffer_size, 314159); ASSERT_EQ(new_db_opt.bytes_per_sync, static_cast(47)); ASSERT_EQ(new_db_opt.wal_bytes_per_sync, static_cast(48)); diff --git a/tools/advisor/test/input_files/OPTIONS-000005 b/tools/advisor/test/input_files/OPTIONS-000005 index 009edb04d0f..584dd1e0709 100644 --- a/tools/advisor/test/input_files/OPTIONS-000005 +++ b/tools/advisor/test/input_files/OPTIONS-000005 @@ -13,7 +13,6 @@ allow_ingest_behind=false db_write_buffer_size=0 db_log_dir= - random_access_max_buffer_size=1048576 [CFOptions "default"] ttl=0 diff --git a/tools/advisor/test/input_files/test_rules.ini b/tools/advisor/test/input_files/test_rules.ini index 97b9374fc05..46ef7a0240c 100644 --- a/tools/advisor/test/input_files/test_rules.ini +++ b/tools/advisor/test/input_files/test_rules.ini @@ -10,10 +10,6 @@ conditions=log-1-true:log-2-true:log-3-true suggestions=inc-bg-flush conditions=log-1-true:log-4-false:log-3-true -[Rule "multiple-conds-all-false"] -suggestions=l0-l1-ratio-health-check -conditions=log-4-false:options-1-false - [Condition "log-1-true"] source=LOG regex=Stopping writes because we have \d+ immutable memtables \(waiting for flush\), max_write_buffer_number is set to \d+ @@ -30,11 +26,6 @@ regex=Stopping writes because we have \d+ level-0 files source=LOG regex=Stalling writes because of estimated pending compaction bytes \d+ -[Condition "options-1-false"] -source=OPTIONS -options=CFOptions.level0_file_num_compaction_trigger:CFOptions.write_buffer_size:DBOptions.random_access_max_buffer_size -evaluate=int(options[0])*int(options[1])-int(options[2])<0 # should evaluate to a boolean - [Suggestion "inc-bg-flush"] option=DBOptions.max_background_flushes action=increase diff --git a/tools/advisor/test/test_rule_parser.py b/tools/advisor/test/test_rule_parser.py index 4ea4ca159f1..398442db5f9 100644 --- a/tools/advisor/test/test_rule_parser.py +++ b/tools/advisor/test/test_rule_parser.py @@ -125,7 +125,7 @@ def test_condition_conjunctions(self): # Check for the conditions conds_triggered = ["log-1-true", "log-2-true", "log-3-true"] - conds_not_triggered = ["log-4-false", "options-1-false"] + conds_not_triggered = ["log-4-false"] for cond in conds_triggered: self.assertTrue(conditions_dict[cond].is_triggered(), repr(cond)) for cond in conds_not_triggered: @@ -136,7 +136,6 @@ def test_condition_conjunctions(self): rules_not_triggered = [ "single-condition-false", "multiple-conds-one-false", - "multiple-conds-all-false", ] for rule_name in rules_triggered: rule = rules_dict[rule_name] diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc index 66aacd23098..3703a9260a2 100644 --- a/tools/db_bench_tool.cc +++ b/tools/db_bench_tool.cc @@ -761,9 +761,6 @@ DEFINE_uint64(compaction_readahead_size, DEFINE_int32(log_readahead_size, 0, "WAL and manifest readahead size"); -DEFINE_int32(random_access_max_buffer_size, 1024 * 1024, - "Maximum windows randomaccess buffer size"); - DEFINE_int32(writable_file_max_buffer_size, 1024 * 1024, "Maximum write buffer for Writable File"); @@ -4307,7 +4304,6 @@ class Benchmark { options.max_file_opening_threads = FLAGS_file_opening_threads; options.compaction_readahead_size = FLAGS_compaction_readahead_size; options.log_readahead_size = FLAGS_log_readahead_size; - options.random_access_max_buffer_size = FLAGS_random_access_max_buffer_size; options.writable_file_max_buffer_size = FLAGS_writable_file_max_buffer_size; options.use_fsync = FLAGS_use_fsync; options.num_levels = FLAGS_num_levels; diff --git a/tools/db_bench_tool_test.cc b/tools/db_bench_tool_test.cc index 1668dfb8836..e2546ff1c17 100644 --- a/tools/db_bench_tool_test.cc +++ b/tools/db_bench_tool_test.cc @@ -222,7 +222,6 @@ const std::string options_file_content = R"OPTIONS_FILE( stats_dump_period_sec=600 allow_fallocate=true max_log_file_size=83886080 - random_access_max_buffer_size=1048576 advise_random_on_open=true dump_malloc_stats=true diff --git a/unreleased_history/public_api_changes/cleanup_random_access_max_buffer_size_references.md b/unreleased_history/public_api_changes/cleanup_random_access_max_buffer_size_references.md new file mode 100644 index 00000000000..4ab7f21d451 --- /dev/null +++ b/unreleased_history/public_api_changes/cleanup_random_access_max_buffer_size_references.md @@ -0,0 +1 @@ +Clean up all the references to `random_access_max_buffer_size`, related rules and all the clients wrappers. This option has been officially deprecated in 5.4.0.