diff --git a/BASHO_RELEASES b/BASHO_RELEASES index 17583c61..3fb9ab7f 100644 --- a/BASHO_RELEASES +++ b/BASHO_RELEASES @@ -1,5 +1,11 @@ +github.com tag 2.0.33 - November 21, 2016 +----------------------------------------- +mv-bucket-expiry: - partial branch to enable X-Riak-Meta-Expiry-Base-Seconds + property within enterprise edition + github.com tag 2.0.32 - November 8, 2016 ---------------------------------------- + - version shipped with Riak 2.2 ** additional race condition hardening when faced with two threads on same iterator ** (one iterating async_iterator_move() and one closing async_iterator_close()) - wrap async_iterator_move operations with locked CloseMutex @@ -8,7 +14,6 @@ github.com tag 2.0.32 - November 8, 2016 github.com tag 2.0.31 - November 1, 2016 ---------------------------------------- - - version shipped with Riak 2.2 - includes leveldb 2.0.31 (mv-no-md-expiry & mv-tuning8) mv-ref-hardening: - series of thread hardening changes related to AAE use of iterators. Biggest diff --git a/c_src/build_deps.sh b/c_src/build_deps.sh index d9d6bb43..14ad33b4 100755 --- a/c_src/build_deps.sh +++ b/c_src/build_deps.sh @@ -8,7 +8,7 @@ if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then fi unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well -LEVELDB_VSN="2.0.31" +LEVELDB_VSN="2.0.33" SNAPPY_VSN="1.0.4" diff --git a/c_src/eleveldb.cc b/c_src/eleveldb.cc index 5b79cbf1..f8ae599f 100644 --- a/c_src/eleveldb.cc +++ b/c_src/eleveldb.cc @@ -43,7 +43,7 @@ #include "leveldb/perf_count.h" #define LEVELDB_PLATFORM_POSIX #include "util/hot_threads.h" -#include "leveldb_os/expiry_os.h" +#include "util/expiry_os.h" #ifndef INCL_WORKITEMS_H #include "workitems.h" @@ -488,7 +488,7 @@ ERL_NIF_TERM parse_open_option(ErlNifEnv* env, ERL_NIF_TERM item, leveldb::Optio if (option[1] == eleveldb::ATOM_TRUE) { if (NULL==opts.expiry_module.get()) - opts.expiry_module.assign(new leveldb::ExpiryModuleOS); + opts.expiry_module.assign(leveldb::ExpiryModule::CreateExpiryModule()); ((leveldb::ExpiryModuleOS *)opts.expiry_module.get())->expiry_enabled = true; } // if else @@ -503,7 +503,7 @@ ERL_NIF_TERM parse_open_option(ErlNifEnv* env, ERL_NIF_TERM item, leveldb::Optio if (enif_get_ulong(env, option[1], &minutes)) { if (NULL==opts.expiry_module.get()) - opts.expiry_module.assign(new leveldb::ExpiryModuleOS); + opts.expiry_module.assign(leveldb::ExpiryModule::CreateExpiryModule()); ((leveldb::ExpiryModuleOS *)opts.expiry_module.get())->expiry_minutes = minutes; } // if } // else if @@ -512,7 +512,7 @@ ERL_NIF_TERM parse_open_option(ErlNifEnv* env, ERL_NIF_TERM item, leveldb::Optio if (option[1] == eleveldb::ATOM_TRUE) { if (NULL==opts.expiry_module.get()) - opts.expiry_module.assign(new leveldb::ExpiryModuleOS); + opts.expiry_module.assign(leveldb::ExpiryModule::CreateExpiryModule()); ((leveldb::ExpiryModuleOS *)opts.expiry_module.get())->whole_file_expiry = true; } // if else