Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion include/rocksdb.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ struct rocksdb_filter_policy_s {
};
};

/** @version 5 */
/** @version 6 */
struct rocksdb_column_family_options_s {
int version;

Expand Down Expand Up @@ -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 */
Expand Down
11 changes: 9 additions & 2 deletions src/rocksdb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 * 1024 * 1024,
};

static const rocksdb_iterator_options_t rocksdb__default_iterator_options = {
Expand Down Expand Up @@ -358,6 +359,8 @@ rocksdb__options_size<rocksdb_column_family_options_t>(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);
}
Expand Down Expand Up @@ -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<TableFactory>(NewBlockBasedTableFactory(table_options));

column_families[i] = ColumnFamilyDescriptor(column_family.name, options);
Expand Down
1 change: 1 addition & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
list(APPEND tests
approximate-size
column-family-write-buffer-size
compact
compact-range
compact-range-blobs
Expand Down
108 changes: 108 additions & 0 deletions test/column-family-write-buffer-size.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
#include <assert.h>
#include <stdbool.h>
#include <string.h>
#include <uv.h>

#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);
}
Loading