From c1040eba033d297f94b644ac6df08dd6c57d04de Mon Sep 17 00:00:00 2001 From: Alex Gaetano Padula Date: Fri, 21 Mar 2025 03:33:22 -0400 Subject: [PATCH 1/3] Updating library for TidesDB 1 changes. --- README.md | 1 - spec/tidesdb_spec.lua | 19 ++++++------------- src/tidesdb-lua.c | 4 ++-- test_lua.lua | 22 +++++++--------------- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 9c0bb9d..5e16faa 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ code, message = db.create_column_family( true, -- Enable compression db.COMPRESS_SNAPPY, -- Compression algorithm can be NO_COMPRESSION, COMPRESS_SNAPPY, COMPRESS_LZ4, COMPRESS_ZSTD true, -- Enable bloom filter - db.TDB_MEMTABLE_SKIP_LIST, -- Use skip list for memtable ) -- Put key-value pair into the database diff --git a/spec/tidesdb_spec.lua b/spec/tidesdb_spec.lua index 172437f..b594e60 100644 --- a/spec/tidesdb_spec.lua +++ b/spec/tidesdb_spec.lua @@ -37,7 +37,6 @@ local prob_skip_list = 0.24 local enable_compression = true local compression_algo = lib.COMPRESS_SNAPPY local enable_bloom_filter = true -local db_data_struct = lib.TDB_MEMTABLE_SKIP_LIST local key = "key" local key_size = string.len(key) @@ -70,8 +69,7 @@ describe("create and drop column", function() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert.is_equal(0, code) code, message = db:drop_column_family(name) @@ -95,8 +93,7 @@ describe("put and get", function() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert.is_equal(0, code) code, message = db:put(name, key, value, ttl) @@ -127,8 +124,7 @@ describe("put and delete", function() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert.is_equal(0, code) code, message = db:put(name, key, value, ttl) @@ -158,8 +154,7 @@ describe("list column families", function() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert.is_equal(0, code) code, message, list = db:list_column_families() @@ -186,8 +181,7 @@ describe("transactions begin and free", function() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert.is_equal(0, code) code, message, txn = lib.txn_begin(db, name) @@ -217,8 +211,7 @@ describe("transactions put and delete", function() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert.is_equal(0, code) code, message, txn = lib.txn_begin(db, name) diff --git a/src/tidesdb-lua.c b/src/tidesdb-lua.c index e9870e9..11ed568 100644 --- a/src/tidesdb-lua.c +++ b/src/tidesdb-lua.c @@ -141,10 +141,10 @@ static int create_column_family(lua_State *L) const tidesdb_compression_algo_t compression_algo = (tidesdb_compression_algo_t)luaL_checkinteger(L, 7); const bool enable_bloom_filter = lua_toboolean(L, 8); - const tidesdb_memtable_ds_t db_data_struct = (tidesdb_memtable_ds_t)luaL_checkinteger(L, 9); + tidesdb_err_t *ret = tidesdb_create_column_family( db, column_family, flush_threshold, max_skip_level, prob_skip_level, enable_compression, - compression_algo, enable_bloom_filter, db_data_struct); + compression_algo, enable_bloom_filter); LUA_RET_CODE() } static int drop_column_family(lua_State *L) diff --git a/test_lua.lua b/test_lua.lua index ebb8b61..f0f0f15 100644 --- a/test_lua.lua +++ b/test_lua.lua @@ -29,7 +29,6 @@ local prob_skip_list = 0.24 local enable_compression = true local compression_algo = lib.COMPRESS_SNAPPY local enable_bloom_filter = true -local db_data_struct = lib.TDB_MEMTABLE_SKIP_LIST local key = "key" local key_size = string.len(key) @@ -54,8 +53,7 @@ function test_create_and_drop_column() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert(code == 0, message) code, message = db:drop_column_family(name) @@ -75,8 +73,7 @@ function test_put_and_get() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert(code == 0, message) code, message = db:put(name, key, value, ttl) @@ -103,8 +100,7 @@ function test_put_and_delete() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert(code == 0, message) code, message = db:put(name, key, value, ttl) @@ -130,8 +126,7 @@ function test_put_and_compact() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert(code == 0, message) for i=1,20 do @@ -158,8 +153,7 @@ function test_list_column_families() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert(code == 0, message) assert(code == 0, message) @@ -185,8 +179,7 @@ function test_txn_begin_and_free() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert(code == 0, message) code, message, txn = lib.txn_begin(db, name) @@ -211,8 +204,7 @@ function test_txn_put_and_delete() prob_skip_list, enable_compression, compression_algo, - enable_bloom_filter, - db_data_struct) + enable_bloom_filter) assert(code == 0, message) code, message, txn = lib.txn_begin(db, name) From 4c684b16715557c512aea496bac871f0697d529b Mon Sep 17 00:00:00 2001 From: Alex Gaetano Padula Date: Fri, 21 Mar 2025 03:34:55 -0400 Subject: [PATCH 2/3] Format code --- src/tidesdb-lua.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tidesdb-lua.c b/src/tidesdb-lua.c index 11ed568..094b008 100644 --- a/src/tidesdb-lua.c +++ b/src/tidesdb-lua.c @@ -61,7 +61,7 @@ static int create_column_family(lua_State *L); static int drop_column_family(lua_State *L); static int put(lua_State *L); static int get(lua_State *L); -static int delete (lua_State *L); +static int delete(lua_State *L); static int list_column_families(lua_State *L); static int compact_sstables(lua_State *L); @@ -141,7 +141,7 @@ static int create_column_family(lua_State *L) const tidesdb_compression_algo_t compression_algo = (tidesdb_compression_algo_t)luaL_checkinteger(L, 7); const bool enable_bloom_filter = lua_toboolean(L, 8); - + tidesdb_err_t *ret = tidesdb_create_column_family( db, column_family, flush_threshold, max_skip_level, prob_skip_level, enable_compression, compression_algo, enable_bloom_filter); @@ -185,7 +185,7 @@ static int get(lua_State *L) LUA_RET_CODE_AND_VALUE((char *)value, value_size) } -static int delete (lua_State *L) +static int delete(lua_State *L) { lua_getfield(L, 1, "self_db"); tidesdb_t *db = lua_touserdata(L, -1); From 91297d3345ae76176d49f47167e681c2e625e4e8 Mon Sep 17 00:00:00 2001 From: Alex Gaetano Padula Date: Fri, 21 Mar 2025 03:39:58 -0400 Subject: [PATCH 3/3] Format code --- src/tidesdb-lua.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tidesdb-lua.c b/src/tidesdb-lua.c index 094b008..fe0ffbb 100644 --- a/src/tidesdb-lua.c +++ b/src/tidesdb-lua.c @@ -61,7 +61,7 @@ static int create_column_family(lua_State *L); static int drop_column_family(lua_State *L); static int put(lua_State *L); static int get(lua_State *L); -static int delete(lua_State *L); +static int delete (lua_State *L); static int list_column_families(lua_State *L); static int compact_sstables(lua_State *L); @@ -185,7 +185,7 @@ static int get(lua_State *L) LUA_RET_CODE_AND_VALUE((char *)value, value_size) } -static int delete(lua_State *L) +static int delete (lua_State *L) { lua_getfield(L, 1, "self_db"); tidesdb_t *db = lua_touserdata(L, -1);