codex-storage
/
nim-leveldb
mirror of https://github.com/codex-storage/nim-leveldb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from xyb/csizet 

csize is deprecated in nim 1.2
This commit is contained in:
Xie Yanbo 2020-07-20 00:52:23 +08:00 committed by GitHub
parent e4aa273ee3 9709b0a905
commit e8a6d00e59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -5,3 +5,6 @@ tests/packagetest/packagetest
src/leveldb src/leveldb
tests/test tests/test
src/htmldocs/ src/htmldocs/
leveldbtool
*.html
*.css

26
src/leveldb.nim
View File

@ -161,16 +161,16 @@ proc open*(path: string, create = true, reuse = true, paranoidChecks = true,
else: else:
leveldb_options_set_paranoid_checks(options, levelDbFalse) leveldb_options_set_paranoid_checks(options, levelDbFalse)
leveldb_options_set_write_buffer_size(options, writeBufferSize) leveldb_options_set_write_buffer_size(options, writeBufferSize.csize_t)
leveldb_options_set_block_size(options, blockSize) leveldb_options_set_block_size(options, blockSize.csize_t)
leveldb_options_set_max_open_files(options, cast[cint](maxOpenFiles)) leveldb_options_set_max_open_files(options, cast[cint](maxOpenFiles))
leveldb_options_set_max_file_size(options, maxFileSize) leveldb_options_set_max_file_size(options, maxFileSize.csize_t)
leveldb_options_set_block_restart_interval(options, leveldb_options_set_block_restart_interval(options,
cast[cint](blockRestartInterval)) cast[cint](blockRestartInterval))
leveldb_options_set_compression(options, cast[cint](compressionType.ord)) leveldb_options_set_compression(options, cast[cint](compressionType.ord))
if cacheCapacity > 0: if cacheCapacity > 0:
let cache = leveldb_cache_create_lru(cacheCapacity) let cache = leveldb_cache_create_lru(cacheCapacity.csize_t)
leveldb_options_set_cache(options, cache) leveldb_options_set_cache(options, cache)
result.cache = cache result.cache = cache
@ -197,10 +197,10 @@ proc put*(self: LevelDb, key: string, value: string, sync = false) =
var errPtr: cstring = nil var errPtr: cstring = nil
let writeOptions = if sync: self.syncWriteOptions else: self.asyncWriteOptions let writeOptions = if sync: self.syncWriteOptions else: self.asyncWriteOptions
leveldb_put(self.db, writeOptions, leveldb_put(self.db, writeOptions,
key, key.len.csize, value, value.len.csize, addr errPtr) key, key.len.csize_t, value, value.len.csize_t, addr errPtr)
checkError(errPtr) checkError(errPtr)
proc newString(cstr: cstring, length: csize): string = proc newString(cstr: cstring, length: csize_t): string =
if length > 0: if length > 0:
result = newString(length) result = newString(length)
copyMem(unsafeAddr result[0], cstr, length) copyMem(unsafeAddr result[0], cstr, length)
@ -218,9 +218,9 @@ proc get*(self: LevelDb, key: string): Option[string] =
echo db.get("hello") echo db.get("hello")
db.close() db.close()
var size: csize var size: csize_t
var errPtr: cstring = nil var errPtr: cstring = nil
let s = leveldb_get(self.db, self.readOptions, key, key.len, addr size, addr errPtr) let s = leveldb_get(self.db, self.readOptions, key, key.len.csize_t, addr size, addr errPtr)
checkError(errPtr) checkError(errPtr)
if s == nil: if s == nil:
@ -252,7 +252,7 @@ proc delete*(self: LevelDb, key: string, sync = false) =
## * `delete proc <#delete%2CLevelDbWriteBatch%2Cstring>`_ ## * `delete proc <#delete%2CLevelDbWriteBatch%2Cstring>`_
var errPtr: cstring = nil var errPtr: cstring = nil
let writeOptions = if sync: self.syncWriteOptions else: self.asyncWriteOptions let writeOptions = if sync: self.syncWriteOptions else: self.asyncWriteOptions
leveldb_delete(self.db, writeOptions, key, key.len, addr errPtr) leveldb_delete(self.db, writeOptions, key, key.len.csize_t, addr errPtr)
checkError(errPtr) checkError(errPtr)
proc destroy*(self: LevelDbWriteBatch) = proc destroy*(self: LevelDbWriteBatch) =
@ -296,7 +296,7 @@ proc put*(self: LevelDbWriteBatch, key: string, value: string, sync = false) =
## See also: ## See also:
## * `put proc <#put%2CLevelDb%2Cstring%2Cstring>`_ ## * `put proc <#put%2CLevelDb%2Cstring%2Cstring>`_
## * `newBatch proc <#newBatch>`_ ## * `newBatch proc <#newBatch>`_
leveldb_writebatch_put(self.batch, key, key.len.csize, value, value.len.csize) leveldb_writebatch_put(self.batch, key, key.len.csize_t, value, value.len.csize_t)
proc append*(self, source: LevelDbWriteBatch) = proc append*(self, source: LevelDbWriteBatch) =
## Merges the `source` batch into this batch. ## Merges the `source` batch into this batch.
@ -313,7 +313,7 @@ proc delete*(self: LevelDbWriteBatch, key: string) =
## See also: ## See also:
## * `delete proc <#delete%2CLevelDb%2Cstring>`_ ## * `delete proc <#delete%2CLevelDb%2Cstring>`_
## * `newBatch proc <#newBatch>`_ ## * `newBatch proc <#newBatch>`_
leveldb_writebatch_delete(self.batch, key, key.len.csize) leveldb_writebatch_delete(self.batch, key, key.len.csize_t)
proc clear*(self: LevelDbWriteBatch) = proc clear*(self: LevelDbWriteBatch) =
## Clear all updates buffered in this batch. ## Clear all updates buffered in this batch.
@ -332,7 +332,7 @@ proc write*(self: LevelDb, batch: LevelDbWriteBatch) =
checkError(errPtr) checkError(errPtr)
proc getIterData(iterPtr: ptr leveldb_iterator_t): (string, string) = proc getIterData(iterPtr: ptr leveldb_iterator_t): (string, string) =
var len: csize var len: csize_t
var str: cstring var str: cstring
str = leveldb_iter_key(iterPtr, addr len) str = leveldb_iter_key(iterPtr, addr len)
@ -355,7 +355,7 @@ iterator iter*(self: LevelDb, seek: string = "", reverse: bool = false): (
defer: leveldb_iter_destroy(iterPtr) defer: leveldb_iter_destroy(iterPtr)
if seek.len > 0: if seek.len > 0:
leveldb_iter_seek(iterPtr, seek, seek.len) leveldb_iter_seek(iterPtr, seek, seek.len.csize_t)
else: else:
if reverse: if reverse:
leveldb_iter_seek_to_last(iterPtr) leveldb_iter_seek_to_last(iterPtr)

46
src/leveldb/raw.nim
View File

@ -60,16 +60,16 @@ type
proc leveldb_open*(options: ptr leveldb_options_t; name: cstring; errptr: ptr cstring): ptr leveldb_t {.importc.} proc leveldb_open*(options: ptr leveldb_options_t; name: cstring; errptr: ptr cstring): ptr leveldb_t {.importc.}
proc leveldb_close*(db: ptr leveldb_t) {.importc.} proc leveldb_close*(db: ptr leveldb_t) {.importc.}
proc leveldb_put*(db: ptr leveldb_t; options: ptr leveldb_writeoptions_t; key: cstring; proc leveldb_put*(db: ptr leveldb_t; options: ptr leveldb_writeoptions_t; key: cstring;
keylen: csize; val: cstring; vallen: csize; errptr: ptr cstring) {.importc.} keylen: csize_t; val: cstring; vallen: csize_t; errptr: ptr cstring) {.importc.}
proc leveldb_delete*(db: ptr leveldb_t; options: ptr leveldb_writeoptions_t; proc leveldb_delete*(db: ptr leveldb_t; options: ptr leveldb_writeoptions_t;
key: cstring; keylen: csize; errptr: ptr cstring) {.importc.} key: cstring; keylen: csize_t; errptr: ptr cstring) {.importc.}
proc leveldb_write*(db: ptr leveldb_t; options: ptr leveldb_writeoptions_t; proc leveldb_write*(db: ptr leveldb_t; options: ptr leveldb_writeoptions_t;
batch: ptr leveldb_writebatch_t; errptr: ptr cstring) {.importc.} batch: ptr leveldb_writebatch_t; errptr: ptr cstring) {.importc.}
## Returns NULL if not found. A malloc()ed array otherwise. ## Returns NULL if not found. A malloc()ed array otherwise.
## Stores the length of the array in \*vallen. ## Stores the length of the array in \*vallen.
proc leveldb_get*(db: ptr leveldb_t; options: ptr leveldb_readoptions_t; key: cstring; proc leveldb_get*(db: ptr leveldb_t; options: ptr leveldb_readoptions_t; key: cstring;
keylen: csize; vallen: ptr csize; errptr: ptr cstring): cstring {.importc.} keylen: csize_t; vallen: ptr csize_t; errptr: ptr cstring): cstring {.importc.}
proc leveldb_create_iterator*(db: ptr leveldb_t; options: ptr leveldb_readoptions_t): ptr leveldb_iterator_t {.importc.} proc leveldb_create_iterator*(db: ptr leveldb_t; options: ptr leveldb_readoptions_t): ptr leveldb_iterator_t {.importc.}
proc leveldb_create_snapshot*(db: ptr leveldb_t): ptr leveldb_snapshot_t {.importc.} proc leveldb_create_snapshot*(db: ptr leveldb_t): ptr leveldb_snapshot_t {.importc.}
proc leveldb_release_snapshot*(db: ptr leveldb_t; snapshot: ptr leveldb_snapshot_t) {.importc.} proc leveldb_release_snapshot*(db: ptr leveldb_t; snapshot: ptr leveldb_snapshot_t) {.importc.}
@ -79,12 +79,12 @@ proc leveldb_release_snapshot*(db: ptr leveldb_t; snapshot: ptr leveldb_snapshot
proc leveldb_property_value*(db: ptr leveldb_t; propname: cstring): cstring {.importc.} proc leveldb_property_value*(db: ptr leveldb_t; propname: cstring): cstring {.importc.}
proc leveldb_approximate_sizes*(db: ptr leveldb_t; num_ranges: cint; proc leveldb_approximate_sizes*(db: ptr leveldb_t; num_ranges: cint;
range_start_key: ptr cstring; range_start_key: ptr cstring;
range_start_key_len: ptr csize; range_start_key_len: ptr csize_t;
range_limit_key: ptr cstring; range_limit_key: ptr cstring;
range_limit_key_len: ptr csize; sizes: ptr uint64) {.importc.} range_limit_key_len: ptr csize_t; sizes: ptr uint64) {.importc.}
proc leveldb_compact_range*(db: ptr leveldb_t; start_key: cstring; proc leveldb_compact_range*(db: ptr leveldb_t; start_key: cstring;
start_key_len: csize; limit_key: cstring; start_key_len: csize_t; limit_key: cstring;
limit_key_len: csize) {.importc.} limit_key_len: csize_t) {.importc.}
## Management operations ## Management operations
proc leveldb_destroy_db*(options: ptr leveldb_options_t; name: cstring; proc leveldb_destroy_db*(options: ptr leveldb_options_t; name: cstring;
@ -97,24 +97,24 @@ proc leveldb_iter_destroy*(a1: ptr leveldb_iterator_t) {.importc.}
proc leveldb_iter_valid*(a1: ptr leveldb_iterator_t): uint8 {.importc.} proc leveldb_iter_valid*(a1: ptr leveldb_iterator_t): uint8 {.importc.}
proc leveldb_iter_seek_to_first*(a1: ptr leveldb_iterator_t) {.importc.} proc leveldb_iter_seek_to_first*(a1: ptr leveldb_iterator_t) {.importc.}
proc leveldb_iter_seek_to_last*(a1: ptr leveldb_iterator_t) {.importc.} proc leveldb_iter_seek_to_last*(a1: ptr leveldb_iterator_t) {.importc.}
proc leveldb_iter_seek*(a1: ptr leveldb_iterator_t; k: cstring; klen: csize) {.importc.} proc leveldb_iter_seek*(a1: ptr leveldb_iterator_t; k: cstring; klen: csize_t) {.importc.}
proc leveldb_iter_next*(a1: ptr leveldb_iterator_t) {.importc.} proc leveldb_iter_next*(a1: ptr leveldb_iterator_t) {.importc.}
proc leveldb_iter_prev*(a1: ptr leveldb_iterator_t) {.importc.} proc leveldb_iter_prev*(a1: ptr leveldb_iterator_t) {.importc.}
proc leveldb_iter_key*(a1: ptr leveldb_iterator_t; klen: ptr csize): cstring {.importc.} proc leveldb_iter_key*(a1: ptr leveldb_iterator_t; klen: ptr csize_t): cstring {.importc.}
proc leveldb_iter_value*(a1: ptr leveldb_iterator_t; vlen: ptr csize): cstring {.importc.} proc leveldb_iter_value*(a1: ptr leveldb_iterator_t; vlen: ptr csize_t): cstring {.importc.}
proc leveldb_iter_get_error*(a1: ptr leveldb_iterator_t; errptr: ptr cstring) {.importc.} proc leveldb_iter_get_error*(a1: ptr leveldb_iterator_t; errptr: ptr cstring) {.importc.}
## Write batch ## Write batch
proc leveldb_writebatch_create*(): ptr leveldb_writebatch_t {.importc.} proc leveldb_writebatch_create*(): ptr leveldb_writebatch_t {.importc.}
proc leveldb_writebatch_destroy*(a1: ptr leveldb_writebatch_t) {.importc.} proc leveldb_writebatch_destroy*(a1: ptr leveldb_writebatch_t) {.importc.}
proc leveldb_writebatch_clear*(a1: ptr leveldb_writebatch_t) {.importc.} proc leveldb_writebatch_clear*(a1: ptr leveldb_writebatch_t) {.importc.}
proc leveldb_writebatch_put*(a1: ptr leveldb_writebatch_t; key: cstring; klen: csize; proc leveldb_writebatch_put*(a1: ptr leveldb_writebatch_t; key: cstring; klen: csize_t;
val: cstring; vlen: csize) {.importc.} val: cstring; vlen: csize_t) {.importc.}
proc leveldb_writebatch_delete*(a1: ptr leveldb_writebatch_t; key: cstring; proc leveldb_writebatch_delete*(a1: ptr leveldb_writebatch_t; key: cstring;
klen: csize) {.importc.} klen: csize_t) {.importc.}
proc leveldb_writebatch_iterate*(a1: ptr leveldb_writebatch_t; state: pointer; put: proc ( proc leveldb_writebatch_iterate*(a1: ptr leveldb_writebatch_t; state: pointer; put: proc (
a1: pointer; k: cstring; klen: csize; v: cstring; vlen: csize); deleted: proc ( a1: pointer; k: cstring; klen: csize_t; v: cstring; vlen: csize_t); deleted: proc (
a1: pointer; k: cstring; klen: csize)) {.importc.} a1: pointer; k: cstring; klen: csize_t)) {.importc.}
proc leveldb_writebatch_append*(destination: ptr leveldb_writebatch_t; proc leveldb_writebatch_append*(destination: ptr leveldb_writebatch_t;
source: ptr leveldb_writebatch_t) {.importc.} source: ptr leveldb_writebatch_t) {.importc.}
## Options ## Options
@ -131,12 +131,12 @@ proc leveldb_options_set_paranoid_checks*(a1: ptr leveldb_options_t; a2: uint8)
proc leveldb_options_set_env*(a1: ptr leveldb_options_t; a2: ptr leveldb_env_t) {.importc.} proc leveldb_options_set_env*(a1: ptr leveldb_options_t; a2: ptr leveldb_env_t) {.importc.}
proc leveldb_options_set_info_log*(a1: ptr leveldb_options_t; proc leveldb_options_set_info_log*(a1: ptr leveldb_options_t;
a2: ptr leveldb_logger_t) {.importc.} a2: ptr leveldb_logger_t) {.importc.}
proc leveldb_options_set_write_buffer_size*(a1: ptr leveldb_options_t; a2: csize) {.importc.} proc leveldb_options_set_write_buffer_size*(a1: ptr leveldb_options_t; a2: csize_t) {.importc.}
proc leveldb_options_set_max_open_files*(a1: ptr leveldb_options_t; a2: cint) {.importc.} proc leveldb_options_set_max_open_files*(a1: ptr leveldb_options_t; a2: cint) {.importc.}
proc leveldb_options_set_cache*(a1: ptr leveldb_options_t; a2: ptr leveldb_cache_t) {.importc.} proc leveldb_options_set_cache*(a1: ptr leveldb_options_t; a2: ptr leveldb_cache_t) {.importc.}
proc leveldb_options_set_block_size*(a1: ptr leveldb_options_t; a2: csize) {.importc.} proc leveldb_options_set_block_size*(a1: ptr leveldb_options_t; a2: csize_t) {.importc.}
proc leveldb_options_set_block_restart_interval*(a1: ptr leveldb_options_t; a2: cint) {.importc.} proc leveldb_options_set_block_restart_interval*(a1: ptr leveldb_options_t; a2: cint) {.importc.}
proc leveldb_options_set_max_file_size*(a1: ptr leveldb_options_t; a2: csize) {.importc.} proc leveldb_options_set_max_file_size*(a1: ptr leveldb_options_t; a2: csize_t) {.importc.}
const const
leveldb_no_compression* = 0 leveldb_no_compression* = 0
leveldb_snappy_compression* = 1 leveldb_snappy_compression* = 1
@ -145,16 +145,16 @@ proc leveldb_options_set_compression*(a1: ptr leveldb_options_t; a2: cint) {.imp
## Comparator ## Comparator
proc leveldb_comparator_create*(state: pointer; destructor: proc (a1: pointer); compare: proc ( proc leveldb_comparator_create*(state: pointer; destructor: proc (a1: pointer); compare: proc (
a1: pointer; a: cstring; alen: csize; b: cstring; blen: csize): cint; a1: pointer; a: cstring; alen: csize_t; b: cstring; blen: csize_t): cint;
name: proc (a1: pointer): cstring): ptr leveldb_comparator_t {.importc.} name: proc (a1: pointer): cstring): ptr leveldb_comparator_t {.importc.}
proc leveldb_comparator_destroy*(a1: ptr leveldb_comparator_t) {.importc.} proc leveldb_comparator_destroy*(a1: ptr leveldb_comparator_t) {.importc.}
## Filter policy ## Filter policy
proc leveldb_filterpolicy_create*(state: pointer; destructor: proc (a1: pointer); proc leveldb_filterpolicy_create*(state: pointer; destructor: proc (a1: pointer);
create_filter: proc (a1: pointer; key_array: ptr cstring; create_filter: proc (a1: pointer; key_array: ptr cstring;
key_length_array: ptr csize; num_keys: cint; key_length_array: ptr csize_t; num_keys: cint;
filter_length: ptr csize): cstring; key_may_match: proc ( filter_length: ptr csize_t): cstring; key_may_match: proc (
a1: pointer; key: cstring; length: csize; filter: cstring; filter_length: csize): uint8; a1: pointer; key: cstring; length: csize_t; filter: cstring; filter_length: csize_t): uint8;
name: proc (a1: pointer): cstring): ptr leveldb_filterpolicy_t {.importc.} name: proc (a1: pointer): cstring): ptr leveldb_filterpolicy_t {.importc.}
proc leveldb_filterpolicy_destroy*(a1: ptr leveldb_filterpolicy_t) {.importc.} proc leveldb_filterpolicy_destroy*(a1: ptr leveldb_filterpolicy_t) {.importc.}
proc leveldb_filterpolicy_create_bloom*(bits_per_key: cint): ptr leveldb_filterpolicy_t {.importc.} proc leveldb_filterpolicy_create_bloom*(bits_per_key: cint): ptr leveldb_filterpolicy_t {.importc.}
@ -174,7 +174,7 @@ proc leveldb_writeoptions_destroy*(a1: ptr leveldb_writeoptions_t) {.importc.}
proc leveldb_writeoptions_set_sync*(a1: ptr leveldb_writeoptions_t; a2: uint8) {.importc.} proc leveldb_writeoptions_set_sync*(a1: ptr leveldb_writeoptions_t; a2: uint8) {.importc.}
## Cache ## Cache
proc leveldb_cache_create_lru*(capacity: csize): ptr leveldb_cache_t {.importc.} proc leveldb_cache_create_lru*(capacity: csize_t): ptr leveldb_cache_t {.importc.}
proc leveldb_cache_destroy*(cache: ptr leveldb_cache_t) {.importc.} proc leveldb_cache_destroy*(cache: ptr leveldb_cache_t) {.importc.}
## Env ## Env