From 131260c4a9faebc8bc46b97d2601f0ca613531c3 Mon Sep 17 00:00:00 2001 From: Tony Ivanov Date: Fri, 11 Sep 2026 14:14:03 +0200 Subject: [PATCH 1/3] add option `ColumnFamiliyOptions::write_buffer_size` --- include/rocksdb.h | 5 ++++- src/rocksdb.cc | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/rocksdb.h b/include/rocksdb.h index 165ce6f..2443738 100644 --- a/include/rocksdb.h +++ b/include/rocksdb.h @@ -200,7 +200,7 @@ struct rocksdb_filter_policy_s { }; }; -/** @version 5 */ +/** @version 6 */ struct rocksdb_column_family_options_s { int version; @@ -260,6 +260,9 @@ struct rocksdb_column_family_options_s { /** @since 5 */ double blob_garbage_collection_force_threshold; + + /** @since 6 */ + uint64_t write_buffer_size; }; /** @version 1 */ diff --git a/src/rocksdb.cc b/src/rocksdb.cc index cfe59c8..de78609 100644 --- a/src/rocksdb.cc +++ b/src/rocksdb.cc @@ -181,7 +181,7 @@ static const rocksdb_options_t rocksdb__default_options = { }; static const rocksdb_column_family_options_t rocksdb__default_column_family_options = { - .version = 5, + .version = 6, .compaction_style = rocksdb_level_compaction, .enable_blob_files = false, .min_blob_size = 0, @@ -202,7 +202,8 @@ static const rocksdb_column_family_options_t rocksdb__default_column_family_opti .num_levels = 7, .max_write_buffer_number = 2, .blob_garbage_collection_age_cutoff = 0.25, - .blob_garbage_collection_force_threshold = 1.0 + .blob_garbage_collection_force_threshold = 1.0, + .write_buffer_size = 64 << 20, }; static const rocksdb_iterator_options_t rocksdb__default_iterator_options = { @@ -358,6 +359,8 @@ rocksdb__options_size(int version) { return offsetof(rocksdb_column_family_options_t, optimize_filters_for_hits); case 4: return offsetof(rocksdb_column_family_options_t, blob_garbage_collection_age_cutoff); + case 5: + return offsetof(rocksdb_column_family_options_t, write_buffer_size); default: return sizeof(rocksdb_column_family_options_t); } @@ -1074,6 +1077,10 @@ rocksdb__on_open(uv_work_t *handle) { &column_family.options, 5 ); + options.write_buffer_size = rocksdb__option<&rocksdb_column_family_options_t::write_buffer_size, uint64_t>( + &column_family.options, 6 + ); + options.table_factory = std::shared_ptr(NewBlockBasedTableFactory(table_options)); column_families[i] = ColumnFamilyDescriptor(column_family.name, options); From 42ca32e5746cbc5afe9687dc2bbf9b4bb0804db9 Mon Sep 17 00:00:00 2001 From: Tony Ivanov Date: Fri, 11 Sep 2026 14:35:20 +0200 Subject: [PATCH 2/3] add test --- test/CMakeLists.txt | 1 + test/column-family-write-buffer-size.c | 108 +++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 test/column-family-write-buffer-size.c diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ad25154..dd8cf52 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,5 +1,6 @@ list(APPEND tests approximate-size + column-family-write-buffer-size compact compact-range compact-range-blobs diff --git a/test/column-family-write-buffer-size.c b/test/column-family-write-buffer-size.c new file mode 100644 index 0000000..560359a --- /dev/null +++ b/test/column-family-write-buffer-size.c @@ -0,0 +1,108 @@ +#include +#include +#include +#include + +#include "../include/rocksdb.h" + +static uv_loop_t *loop; + +static rocksdb_t db; +static rocksdb_column_family_t *family; + +static rocksdb_column_family_options_t family_options; + +static void +on_close(rocksdb_close_t *req, int status) { + assert(status == 0); + + assert(req->error == NULL); + + rocksdb_close_cleanup(req); +} + +static void +on_read(rocksdb_read_batch_t *req, int status) { + int e; + + assert(status == 0); + + assert(req->len == 1); + + rocksdb_read_t read = req->reads[0]; + + assert(strcmp(read.value.data, "world") == 0); + + e = rocksdb_column_family_destroy(&db, family); + assert(e == 0); + + static rocksdb_close_t close; + e = rocksdb_close(&db, &close, NULL, on_close); + assert(e == 0); + + rocksdb_read_cleanup(req); +} + +static void +on_write(rocksdb_write_batch_t *req, int status) { + int e; + + assert(status == 0); + + static rocksdb_read_t read; + read.type = rocksdb_get; + read.column_family = family; + read.key = rocksdb_slice_init("hello", 5); + read.value = rocksdb_slice_empty(); + + static rocksdb_read_batch_t batch; + e = rocksdb_read(&db, &batch, &read, 1, NULL, on_read); + assert(e == 0); + + rocksdb_write_cleanup(req); +} + +static void +on_open(rocksdb_open_t *req, int status) { + int e; + + assert(status == 0); + + assert(req->error == NULL); + + static rocksdb_write_t write; + write.type = rocksdb_put; + write.column_family = family; + write.key = rocksdb_slice_init("hello", 5); + write.value = rocksdb_slice_init("world", 6); + + static rocksdb_write_batch_t batch; + e = rocksdb_write(&db, &batch, &write, 1, NULL, on_write); + assert(e == 0); + + rocksdb_open_cleanup(req); +} + +int +main() { + int e; + + loop = uv_default_loop(); + + rocksdb_options_t options = { + .create_if_missing = true, + }; + + rocksdb_column_family_options_init(&family_options, 6); + + family_options.write_buffer_size = 1 * 1024 * 1024; // one mega-byte + + rocksdb_column_family_descriptor_t descriptor = rocksdb_column_family_descriptor("default", &family_options); + + static rocksdb_open_t open; + e = rocksdb_open(loop, &db, &open, "test/fixtures/column-family-write-buffer-size.db", &options, &descriptor, &family, 1, NULL, on_open); + assert(e == 0); + + e = uv_run(loop, UV_RUN_DEFAULT); + assert(e == 0); +} From fbfef5c85b15511b20b98468857ff5843d298f40 Mon Sep 17 00:00:00 2001 From: Tony Ivanov Date: Fri, 11 Sep 2026 23:38:29 +0200 Subject: [PATCH 3/3] Update src/rocksdb.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Kasper Isager Dalsgarð --- src/rocksdb.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rocksdb.cc b/src/rocksdb.cc index de78609..dd87c9e 100644 --- a/src/rocksdb.cc +++ b/src/rocksdb.cc @@ -203,7 +203,7 @@ static const rocksdb_column_family_options_t rocksdb__default_column_family_opti .max_write_buffer_number = 2, .blob_garbage_collection_age_cutoff = 0.25, .blob_garbage_collection_force_threshold = 1.0, - .write_buffer_size = 64 << 20, + .write_buffer_size = 64 * 1024 * 1024, }; static const rocksdb_iterator_options_t rocksdb__default_iterator_options = {