diff --git a/src/datastore/berkeleydb_datastore.cc b/src/datastore/berkeleydb_datastore.cc index 29a9ef38639725bff58e3e34340708466e0609ba..2083ccf51d02747a4d826e82de164c665afb2edd 100644 --- a/src/datastore/berkeleydb_datastore.cc +++ b/src/datastore/berkeleydb_datastore.cc @@ -139,7 +139,7 @@ void BerkeleyDBDataStore::set_comparison_function(const std::string& name, compa _wrapper->_less = less; } -int BerkeleyDBDataStore::put(const void* key, size_t ksize, const void* val, size_t vsize) { +int BerkeleyDBDataStore::put(const void* key, hg_size_t ksize, const void* val, hg_size_t vsize) { int status = 0; bool success = false; Dbt db_key((void*)key, ksize); @@ -153,14 +153,14 @@ int BerkeleyDBDataStore::put(const void* key, size_t ksize, const void* val, siz return SDSKV_ERR_PUT; }; -int BerkeleyDBDataStore::put_multi(size_t num_items, +int BerkeleyDBDataStore::put_multi(hg_size_t num_items, const void* const* keys, - const size_t* ksizes, + const hg_size_t* ksizes, const void* const* values, - const size_t* vsizes) + const hg_size_t* vsizes) { - size_t sk = 0; - size_t sv = 0; + hg_size_t sk = 0; + hg_size_t sv = 0; for(unsigned i = 0; i < num_items; i++) { sk += ksizes[i]; sv += vsizes[i]+8; @@ -187,7 +187,7 @@ int BerkeleyDBDataStore::put_multi(size_t num_items, DbMultipleDataBuilder keybuilder(mkey); DbMultipleDataBuilder databuilder(mdata); - for(size_t i = 0; i < num_items; i++) { + for(hg_size_t i = 0; i < num_items; i++) { keybuilder.append((void*)keys[i], ksizes[i]); databuilder.append((void*)values[i], vsizes[i]); } @@ -199,7 +199,7 @@ int BerkeleyDBDataStore::put_multi(size_t num_items, return SDSKV_SUCCESS; } -bool BerkeleyDBDataStore::exists(const void* key, size_t size) const { +bool BerkeleyDBDataStore::exists(const void* key, hg_size_t size) const { Dbt db_key((void*)key, size); db_key.set_flags(DB_DBT_USERMEM); int status = _dbm->exists(NULL, &db_key, 0); @@ -274,7 +274,7 @@ void BerkeleyDBDataStore::set_in_memory(bool enable) { }; std::vector BerkeleyDBDataStore::vlist_keys( - const ds_bulk_t &start, size_t count, const ds_bulk_t &prefix) const + const ds_bulk_t &start, hg_size_t count, const ds_bulk_t &prefix) const { std::vector keys; Dbc * cursorp; @@ -324,7 +324,7 @@ std::vector BerkeleyDBDataStore::vlist_keys( } std::vector> BerkeleyDBDataStore::vlist_keyvals( - const ds_bulk_t &start, size_t count, const ds_bulk_t &prefix) const + const ds_bulk_t &start, hg_size_t count, const ds_bulk_t &prefix) const { std::vector> result; Dbc * cursorp; @@ -378,7 +378,7 @@ std::vector> BerkeleyDBDataStore::vlist_keyvals( } std::vector BerkeleyDBDataStore::vlist_key_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys) const { + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys) const { std::vector result; // TODO implement this function throw SDSKV_OP_NOT_IMPL; @@ -386,20 +386,20 @@ std::vector BerkeleyDBDataStore::vlist_key_range( } std::vector> BerkeleyDBDataStore::vlist_keyval_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys) const { + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys) const { std::vector> result; // TODO implement this function throw SDSKV_OP_NOT_IMPL; return result; } -int BerkeleyDBDataStore::compkeys(Db *db, const Dbt *dbt1, const Dbt *dbt2, size_t *locp) { +int BerkeleyDBDataStore::compkeys(Db *db, const Dbt *dbt1, const Dbt *dbt2, hg_size_t *locp) { DbWrapper* _wrapper = (DbWrapper*)(((char*)db) - offsetof(BerkeleyDBDataStore::DbWrapper, _db)); if(_wrapper->_less) { return (_wrapper->_less)(dbt1->get_data(), dbt1->get_size(), dbt2->get_data(), dbt2->get_size()); } else { - size_t s = dbt1->get_size() > dbt2->get_size() ? dbt2->get_size() : dbt1->get_size(); + hg_size_t s = dbt1->get_size() > dbt2->get_size() ? dbt2->get_size() : dbt1->get_size(); int c = std::memcmp(dbt1->get_data(), dbt2->get_data(), s); if(c != 0) return c; if(dbt1->get_size() < dbt2->get_size()) return -1; diff --git a/src/datastore/berkeleydb_datastore.h b/src/datastore/berkeleydb_datastore.h index 3506d99b1a238278f68906cca5c82e37872eeff0..cd9db7ee6c46048224ddd406b61deddfa925bfa8 100644 --- a/src/datastore/berkeleydb_datastore.h +++ b/src/datastore/berkeleydb_datastore.h @@ -22,22 +22,22 @@ class BerkeleyDBDataStore : public AbstractDataStore { _db(std::forward(args)...), _less(nullptr) {} }; - static int compkeys(Db *db, const Dbt *dbt1, const Dbt *dbt2, size_t *locp); + static int compkeys(Db *db, const Dbt *dbt1, const Dbt *dbt2, hg_size_t *locp); public: BerkeleyDBDataStore(); BerkeleyDBDataStore(bool eraseOnGet, bool debug); virtual ~BerkeleyDBDataStore(); virtual bool openDatabase(const std::string& db_name, const std::string& path) override; - virtual int put(const void* key, size_t ksize, const void* value, size_t vsize) override; - virtual int put_multi(size_t num_items, + virtual int put(const void* key, hg_size_t ksize, const void* value, hg_size_t vsize) override; + virtual int put_multi(hg_size_t num_items, const void* const* keys, - const size_t* ksizes, + const hg_size_t* ksizes, const void* const* values, - const size_t* vsizes) override; + const hg_size_t* vsizes) override; virtual bool get(const ds_bulk_t &key, ds_bulk_t &data) override; virtual bool get(const ds_bulk_t &key, std::vector &data) override; - virtual bool exists(const void* key, size_t ksize) const override; + virtual bool exists(const void* key, hg_size_t ksize) const override; virtual bool erase(const ds_bulk_t &key) override; virtual void set_in_memory(bool enable) override; // enable/disable in-memory mode virtual void set_comparison_function(const std::string& name, comparator_fn less) override; @@ -50,13 +50,13 @@ class BerkeleyDBDataStore : public AbstractDataStore { #endif protected: virtual std::vector vlist_keys( - const ds_bulk_t &start, size_t count, const ds_bulk_t &prefix) const override; + const ds_bulk_t &start, hg_size_t count, const ds_bulk_t &prefix) const override; virtual std::vector> vlist_keyvals( - const ds_bulk_t &start_key, size_t count, const ds_bulk_t &) const override; + const ds_bulk_t &start_key, hg_size_t count, const ds_bulk_t &) const override; virtual std::vector vlist_key_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys) const override; + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys) const override; virtual std::vector> vlist_keyval_range( - const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, size_t max_keys) const override; + const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, hg_size_t max_keys) const override; DbEnv *_dbenv = nullptr; Db *_dbm = nullptr; DbWrapper* _wrapper = nullptr; diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h index e3c61e0b94ce55043f6ff06e2754ad6b6a445005..ea28efc53a099ea64f26cfded200c9ec7dbab8cf 100644 --- a/src/datastore/datastore.h +++ b/src/datastore/datastore.h @@ -15,27 +15,27 @@ class AbstractDataStore { public: - typedef int (*comparator_fn)(const void*, size_t, const void*, size_t); + typedef int (*comparator_fn)(const void*, hg_size_t, const void*, hg_size_t); AbstractDataStore(); AbstractDataStore(bool eraseOnGet, bool debug); virtual ~AbstractDataStore(); virtual bool openDatabase(const std::string& db_name, const std::string& path)=0; - virtual int put(const void* kdata, size_t ksize, const void* vdata, size_t vsize)=0; + virtual int put(const void* kdata, hg_size_t ksize, const void* vdata, hg_size_t vsize)=0; virtual int put(const ds_bulk_t &key, const ds_bulk_t &data) { return put(key.data(), key.size(), data.data(), data.size()); } virtual int put(ds_bulk_t&& key, ds_bulk_t&& data) { return put(key.data(), key.size(), data.data(), data.size()); } - virtual int put_multi(size_t num_items, + virtual int put_multi(hg_size_t num_items, const void* const* keys, - const size_t* ksizes, + const hg_size_t* ksizes, const void* const* values, - const size_t* vsizes) + const hg_size_t* vsizes) { int ret = 0; - for(size_t i=0; i < num_items; i++) { + for(hg_size_t i=0; i < num_items; i++) { int r = put(keys[i], ksizes[i], values[i], vsizes[i]); ret = ret == 0 ? r : 0; } @@ -43,7 +43,7 @@ class AbstractDataStore { } virtual bool get(const ds_bulk_t &key, ds_bulk_t &data)=0; virtual bool get(const ds_bulk_t &key, std::vector &data)=0; - virtual bool exists(const void* key, size_t ksize) const = 0; + virtual bool exists(const void* key, hg_size_t ksize) const = 0; virtual bool exists(const ds_bulk_t &key) const { return exists(key.data(), key.size()); } @@ -70,22 +70,22 @@ class AbstractDataStore { } std::vector list_keys( - const ds_bulk_t &start_key, size_t count, const ds_bulk_t& prefix=ds_bulk_t()) const { + const ds_bulk_t &start_key, hg_size_t count, const ds_bulk_t& prefix=ds_bulk_t()) const { return vlist_keys(start_key, count, prefix); } std::vector> list_keyvals( - const ds_bulk_t &start_key, size_t count, const ds_bulk_t& prefix=ds_bulk_t()) const { + const ds_bulk_t &start_key, hg_size_t count, const ds_bulk_t& prefix=ds_bulk_t()) const { return vlist_keyvals(start_key, count, prefix); } std::vector list_key_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys=0) const { + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys=0) const { return vlist_key_range(lower_bound, upper_bound, max_keys); } std::vector> list_keyval_range( - const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, size_t max_keys=0) const { + const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, hg_size_t max_keys=0) const { return vlist_keyval_range(lower_bound, upper_bound, max_keys); } @@ -99,13 +99,13 @@ class AbstractDataStore { bool _in_memory; virtual std::vector vlist_keys( - const ds_bulk_t &start_key, size_t count, const ds_bulk_t& prefix) const = 0; + const ds_bulk_t &start_key, hg_size_t count, const ds_bulk_t& prefix) const = 0; virtual std::vector> vlist_keyvals( - const ds_bulk_t &start_key, size_t count, const ds_bulk_t& prefix) const = 0; + const ds_bulk_t &start_key, hg_size_t count, const ds_bulk_t& prefix) const = 0; virtual std::vector vlist_key_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys) const = 0; + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys) const = 0; virtual std::vector> vlist_keyval_range( - const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, size_t max_keys) const = 0; + const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, hg_size_t max_keys) const = 0; }; #endif // datastore_h diff --git a/src/datastore/leveldb_datastore.cc b/src/datastore/leveldb_datastore.cc index e6cdd5743c80bb9912a756a7498cd8eefbfe553c..fba7d0ed1d90abcce9cf88f325e959f317eaf2c9 100644 --- a/src/datastore/leveldb_datastore.cc +++ b/src/datastore/leveldb_datastore.cc @@ -25,7 +25,7 @@ std::string LevelDBDataStore::toString(const ds_bulk_t &bulk_val) { return str_val; }; -std::string LevelDBDataStore::toString(const char* buf, size_t buf_size) { +std::string LevelDBDataStore::toString(const char* buf, hg_size_t buf_size) { std::string str_val(buf, buf_size); return str_val; }; @@ -74,7 +74,7 @@ void LevelDBDataStore::set_comparison_function(const std::string& name, comparat _less = less; } -int LevelDBDataStore::put(const void* key, size_t ksize, const void* value, size_t vsize) { +int LevelDBDataStore::put(const void* key, hg_size_t ksize, const void* value, hg_size_t vsize) { leveldb::Status status; bool success = false; @@ -95,7 +95,7 @@ bool LevelDBDataStore::erase(const ds_bulk_t &key) { return status.ok(); } -bool LevelDBDataStore::exists(const void* key, size_t ksize) const { +bool LevelDBDataStore::exists(const void* key, hg_size_t ksize) const { leveldb::Status status; std::string value; status = _dbm->Get(leveldb::ReadOptions(), leveldb::Slice((const char*)key, ksize), &value); @@ -140,7 +140,7 @@ void LevelDBDataStore::set_in_memory(bool enable) {}; std::vector LevelDBDataStore::vlist_keys( - const ds_bulk_t &start, size_t count, const ds_bulk_t &prefix) const + const ds_bulk_t &start, hg_size_t count, const ds_bulk_t &prefix) const { std::vector keys; @@ -176,7 +176,7 @@ std::vector LevelDBDataStore::vlist_keys( } std::vector> LevelDBDataStore::vlist_keyvals( - const ds_bulk_t &start, size_t count, const ds_bulk_t &prefix) const + const ds_bulk_t &start, hg_size_t count, const ds_bulk_t &prefix) const { std::vector> result; @@ -215,7 +215,7 @@ std::vector> LevelDBDataStore::vlist_keyvals( } std::vector LevelDBDataStore::vlist_key_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys) const { + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys) const { std::vector result; // TODO implement this function throw SDSKV_OP_NOT_IMPL; @@ -223,7 +223,7 @@ std::vector LevelDBDataStore::vlist_key_range( } std::vector> LevelDBDataStore::vlist_keyval_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys) const { + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys) const { std::vector> result; // TODO implement this function throw SDSKV_OP_NOT_IMPL; diff --git a/src/datastore/leveldb_datastore.h b/src/datastore/leveldb_datastore.h index c88275f3b160b36db064076d4c30b919ebd5e3e4..68179ce659c26749e054bfaf510baa753c7350ad 100644 --- a/src/datastore/leveldb_datastore.h +++ b/src/datastore/leveldb_datastore.h @@ -42,10 +42,10 @@ class LevelDBDataStore : public AbstractDataStore { LevelDBDataStore(bool eraseOnGet, bool debug); virtual ~LevelDBDataStore(); virtual bool openDatabase(const std::string& db_name, const std::string& path) override; - virtual int put(const void* key, size_t ksize, const void* kdata, size_t dsize) override; + virtual int put(const void* key, hg_size_t ksize, const void* kdata, hg_size_t dsize) override; virtual bool get(const ds_bulk_t &key, ds_bulk_t &data) override; virtual bool get(const ds_bulk_t &key, std::vector &data) override; - virtual bool exists(const void* key, size_t ksize) const override; + virtual bool exists(const void* key, hg_size_t ksize) const override; virtual bool erase(const ds_bulk_t &key) override; virtual void set_in_memory(bool enable) override; // not supported, a no-op virtual void set_comparison_function(const std::string& name, comparator_fn less) override; @@ -58,17 +58,17 @@ class LevelDBDataStore : public AbstractDataStore { #endif protected: virtual std::vector vlist_keys( - const ds_bulk_t &start, size_t count, const ds_bulk_t &prefix) const override; + const ds_bulk_t &start, hg_size_t count, const ds_bulk_t &prefix) const override; virtual std::vector> vlist_keyvals( - const ds_bulk_t &start_key, size_t count, const ds_bulk_t &prefix) const override; + const ds_bulk_t &start_key, hg_size_t count, const ds_bulk_t &prefix) const override; virtual std::vector vlist_key_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys) const override; + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys) const override; virtual std::vector> vlist_keyval_range( - const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, size_t max_keys) const override; + const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, hg_size_t max_keys) const override; leveldb::DB *_dbm = NULL; private: static std::string toString(const ds_bulk_t &key); - static std::string toString(const char* bug, size_t buf_size); + static std::string toString(const char* bug, hg_size_t buf_size); static ds_bulk_t fromString(const std::string &keystr); AbstractDataStore::comparator_fn _less; LevelDBDataStoreComparator _keycmp; diff --git a/src/datastore/map_datastore.h b/src/datastore/map_datastore.h index cdae711bfdc83d01715240a3e06f176f342c7ee5..ac4f577aaa446aeae1aa92a33b33bd45fe9789cc 100644 --- a/src/datastore/map_datastore.h +++ b/src/datastore/map_datastore.h @@ -77,7 +77,7 @@ class MapDataStore : public AbstractDataStore { return SDSKV_SUCCESS; } - virtual int put(const void* key, size_t ksize, const void* value, size_t vsize) override { + virtual int put(const void* key, hg_size_t ksize, const void* value, hg_size_t vsize) override { if(vsize != 0) { ds_bulk_t k((const char*)key, ((const char*)key)+ksize); ds_bulk_t v((const char*)value, ((const char*)value)+vsize); @@ -114,7 +114,7 @@ class MapDataStore : public AbstractDataStore { return e; } - virtual bool exists(const void* key, size_t ksize) const override { + virtual bool exists(const void* key, hg_size_t ksize) const override { return exists(ds_bulk_t((const char*)key, ((const char*)key)+ksize)); } @@ -148,7 +148,7 @@ class MapDataStore : public AbstractDataStore { protected: virtual std::vector vlist_keys( - const ds_bulk_t &start_key, size_t count, const ds_bulk_t &prefix) const override { + const ds_bulk_t &start_key, hg_size_t count, const ds_bulk_t &prefix) const override { ABT_rwlock_rdlock(_map_lock); std::vector result; decltype(_map.begin()) it; @@ -173,7 +173,7 @@ class MapDataStore : public AbstractDataStore { } virtual std::vector> vlist_keyvals( - const ds_bulk_t &start_key, size_t count, const ds_bulk_t &prefix) const override { + const ds_bulk_t &start_key, hg_size_t count, const ds_bulk_t &prefix) const override { ABT_rwlock_rdlock(_map_lock); std::vector> result; decltype(_map.begin()) it; @@ -198,7 +198,7 @@ class MapDataStore : public AbstractDataStore { } virtual std::vector vlist_key_range( - const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, size_t max_keys) const override { + const ds_bulk_t &lower_bound, const ds_bulk_t &upper_bound, hg_size_t max_keys) const override { ABT_rwlock_rdlock(_map_lock); std::vector result; decltype(_map.begin()) it, ub; @@ -222,7 +222,7 @@ class MapDataStore : public AbstractDataStore { } virtual std::vector> vlist_keyval_range( - const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, size_t max_keys) const override { + const ds_bulk_t &lower_bound, const ds_bulk_t& upper_bound, hg_size_t max_keys) const override { ABT_rwlock_rdlock(_map_lock); std::vector> result; decltype(_map.begin()) it, ub;