Skip to content

This put overload fixes a very major bug. #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

This put overload fixes a very major bug. #20

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
439ddc4
This put overload fixes a very major bug.
hrissan Jun 16, 2017
fce8f47
removed a ticking bomb - template get/put which are selected automati…
hrissan Jun 16, 2017
e2e537f
Changed size_t to mdb_size_t to build with MDB_VL32 setting
hrissan Nov 22, 2017
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
48 changes: 28 additions & 20 deletions lmdb++.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ namespace lmdb {
static inline void env_get_flags(MDB_env* env, unsigned int* flags);
static inline void env_get_path(MDB_env* env, const char** path);
static inline void env_get_fd(MDB_env* env, mdb_filehandle_t* fd);
static inline void env_set_mapsize(MDB_env* env, std::size_t size);
static inline void env_set_mapsize(MDB_env* env, mdb_size_t size);
static inline void env_set_max_readers(MDB_env* env, unsigned int count);
static inline void env_get_max_readers(MDB_env* env, unsigned int* count);
static inline void env_set_max_dbs(MDB_env* env, MDB_dbi count);
Expand Down Expand Up @@ -432,7 +432,7 @@ lmdb::env_get_fd(MDB_env* const env,
*/
static inline void
lmdb::env_set_mapsize(MDB_env* const env,
const std::size_t size) {
const mdb_size_t size) {
const int rc = ::mdb_env_set_mapsize(env, size);
if (rc != MDB_SUCCESS) {
error::raise("mdb_env_set_mapsize", rc);
Expand Down Expand Up @@ -812,7 +812,7 @@ namespace lmdb {
static inline bool cursor_get(MDB_cursor* cursor, MDB_val* key, MDB_val* data, MDB_cursor_op op);
static inline void cursor_put(MDB_cursor* cursor, MDB_val* key, MDB_val* data, unsigned int flags);
static inline void cursor_del(MDB_cursor* cursor, unsigned int flags);
static inline void cursor_count(MDB_cursor* cursor, std::size_t& count);
static inline void cursor_count(MDB_cursor* cursor, mdb_size_t& count);
}

/**
Expand Down Expand Up @@ -916,7 +916,7 @@ lmdb::cursor_del(MDB_cursor* const cursor,
*/
static inline void
lmdb::cursor_count(MDB_cursor* const cursor,
std::size_t& count) {
mdb_size_t& count) {
const int rc = ::mdb_cursor_count(cursor, &count);
if (rc != MDB_SUCCESS) {
error::raise("mdb_cursor_count", rc);
Expand Down Expand Up @@ -1213,7 +1213,7 @@ class lmdb::env {
* @param size
* @throws lmdb::error on failure
*/
env& set_mapsize(const std::size_t size) {
env& set_mapsize(const mdb_size_t size) {
lmdb::env_set_mapsize(handle(), size);
return *this;
}
Expand Down Expand Up @@ -1486,7 +1486,7 @@ class lmdb::dbi {
* @param txn a transaction handle
* @throws lmdb::error on failure
*/
std::size_t size(MDB_txn* const txn) const {
mdb_size_t size(MDB_txn* const txn) const {
return stat(txn).ms_entries;
}

Expand Down Expand Up @@ -1534,13 +1534,13 @@ class lmdb::dbi {
* @param key
* @throws lmdb::error on failure
*/
template<typename K>
/* template<typename K>
bool get(MDB_txn* const txn,
const K& key) const {
const lmdb::val k{&key, sizeof(K)};
lmdb::val v{};
return lmdb::dbi_get(txn, handle(), k, v);
}
}*/

/**
* Retrieves a key/value pair from this database.
Expand All @@ -1550,7 +1550,7 @@ class lmdb::dbi {
* @param val
* @throws lmdb::error on failure
*/
template<typename K, typename V>
/* template<typename K, typename V>
bool get(MDB_txn* const txn,
const K& key,
V& val) const {
Expand All @@ -1561,7 +1561,7 @@ class lmdb::dbi {
val = *v.data<const V>();
}
return result;
}
}*/

/**
* Retrieves a key/value pair from this database.
Expand All @@ -1571,7 +1571,7 @@ class lmdb::dbi {
* @param val
* @throws lmdb::error on failure
*/
template<typename V>
/* template<typename V>
bool get(MDB_txn* const txn,
const char* const key,
V& val) const {
Expand All @@ -1582,7 +1582,7 @@ class lmdb::dbi {
val = *v.data<const V>();
}
return result;
}
}*/

/**
* Stores a key/value pair into this database.
Expand All @@ -1600,6 +1600,14 @@ class lmdb::dbi {
return lmdb::dbi_put(txn, handle(), key, data, flags);
}

bool put(MDB_txn* const txn,
const val& key,
const val& data,
const unsigned int flags = default_put_flags) {
val rwdata{data.data(), data.size()};
return lmdb::dbi_put(txn, handle(), key, rwdata, flags);
}

/**
* Stores a key into this database.
*
Expand All @@ -1608,14 +1616,14 @@ class lmdb::dbi {
* @param flags
* @throws lmdb::error on failure
*/
template<typename K>
/* template<typename K>
bool put(MDB_txn* const txn,
const K& key,
const unsigned int flags = default_put_flags) {
const lmdb::val k{&key, sizeof(K)};
lmdb::val v{};
return lmdb::dbi_put(txn, handle(), k, v, flags);
}
}*/

/**
* Stores a key/value pair into this database.
Expand All @@ -1626,15 +1634,15 @@ class lmdb::dbi {
* @param flags
* @throws lmdb::error on failure
*/
template<typename K, typename V>
/* template<typename K, typename V>
bool put(MDB_txn* const txn,
const K& key,
const V& val,
const unsigned int flags = default_put_flags) {
const lmdb::val k{&key, sizeof(K)};
lmdb::val v{&val, sizeof(V)};
return lmdb::dbi_put(txn, handle(), k, v, flags);
}
}*/

/**
* Stores a key/value pair into this database.
Expand All @@ -1645,15 +1653,15 @@ class lmdb::dbi {
* @param flags
* @throws lmdb::error on failure
*/
template<typename V>
/* template<typename V>
bool put(MDB_txn* const txn,
const char* const key,
const V& val,
const unsigned int flags = default_put_flags) {
const lmdb::val k{key, std::strlen(key)};
lmdb::val v{&val, sizeof(V)};
return lmdb::dbi_put(txn, handle(), k, v, flags);
}
}*/

/**
* Stores a key/value pair into this database.
Expand Down Expand Up @@ -1692,12 +1700,12 @@ class lmdb::dbi {
* @param key
* @throws lmdb::error on failure
*/
template<typename K>
/* template<typename K>
bool del(MDB_txn* const txn,
const K& key) {
const lmdb::val k{&key, sizeof(K)};
return lmdb::dbi_del(txn, handle(), k);
}
}*/
};

////////////////////////////////////////////////////////////////////////////////
Expand Down