save

Author: AskAlexSharov

mdbx/mdbxgo.c

@@ -34,12 +34,6 @@ int mdbxgo_del(MDBX_txn *txn, MDBX_dbi dbi, char *kdata, size_t kn, char *vdata,
     return mdbx_del(txn, dbi, &key, NULL);
 }
 
-int mdbxgo_get(MDBX_txn *txn, MDBX_dbi dbi, char *kdata, size_t kn, MDBX_val *val) {
-    MDBX_val key;
-    MDBXGO_SET_VAL(&key, kn, kdata);
-    return mdbx_get(txn, dbi, &key, val);
-}
-
 int mdbxgo_put2(MDBX_txn *txn, MDBX_dbi dbi, char *kdata, size_t kn, char *vdata, size_t vn, MDBX_put_flags_t flags) {
     MDBX_val key, val;
     MDBXGO_SET_VAL(&key, kn, kdata);

mdbx/mdbxgo.h

@@ -7,6 +7,9 @@
 
 #include "../libmdbx/mdbx.h"
 
+#define MDBXGO_SET_VAL(val, size, data) \
+    *(val) = (MDBX_val){ .iov_len = (size), .iov_base = (data) }
+
 /* Proxy functions for lmdb get/put operations. The functions are defined to
  * take char* values instead of void* to keep cgo from cheking their data for
  * nested pointers and causing a couple of allocations per argument.
@@ -18,7 +21,11 @@
  *      https://github.com/bmatsuo/lmdb-go/issues/63
  * */
 int mdbxgo_del(MDBX_txn *txn, MDBX_dbi dbi, char *kdata, size_t kn, char *vdata, size_t vn);
-int mdbxgo_get(MDBX_txn *txn, MDBX_dbi dbi, char *kdata, size_t kn, MDBX_val *val);
+static inline int mdbxgo_get(MDBX_txn *txn, MDBX_dbi dbi, char *kdata, size_t kn, MDBX_val *val) {
+    MDBX_val key;
+    MDBXGO_SET_VAL(&key, kn, kdata);
+    return mdbx_get(txn, dbi, &key, val);
+}
 int mdbxgo_put1(MDBX_txn *txn, MDBX_dbi dbi, char *kdata, size_t kn, MDBX_val *val, MDBX_put_flags_t flags);
 int mdbxgo_put2(MDBX_txn *txn, MDBX_dbi dbi, char *kdata, size_t kn, char *vdata, size_t vn, MDBX_put_flags_t flags);
 int mdbxgo_cursor_put1(MDBX_cursor *cur, char *kdata, size_t kn, MDBX_val *val, MDBX_put_flags_t flags);