[Commits] cc3ead4e3: Remove Endpoints as a separate data format

Sergei Petrunia psergey at askmonty.org
Sun Apr 7 21:54:52 EEST 2019


revision-id: cc3ead4e33a8637e51c72ecb91256d52285979f5 (v5.8-1029-gcc3ead4e3)
parent(s): 8eb09c8598238945560b9750425b2a64238bec1d
author: Sergei Petrunia
committer: Sergei Petrunia
timestamp: 2019-04-07 21:54:52 +0300
message:

Remove Endpoints as a separate data format

Part #2: make the patch usable from MyRocks

---
 include/rocksdb/utilities/transaction.h        | 3 +++
 utilities/transactions/transaction_lock_mgr.cc | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/rocksdb/utilities/transaction.h b/include/rocksdb/utilities/transaction.h
index 18ae4726c..9dbba3df7 100644
--- a/include/rocksdb/utilities/transaction.h
+++ b/include/rocksdb/utilities/transaction.h
@@ -64,6 +64,9 @@ class Endpoint {
   Slice slice;
   bool inf_suffix;
 
+  Endpoint(const Slice &slice_arg, bool inf_suffix_arg=false) :
+    slice(slice_arg), inf_suffix(inf_suffix_arg) {}
+
   Endpoint(const char* s, bool inf_suffix_arg=false) :
     slice(s), inf_suffix(inf_suffix_arg) {}
 
diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc
index d6c221cc7..8b5907bc5 100644
--- a/utilities/transactions/transaction_lock_mgr.cc
+++ b/utilities/transactions/transaction_lock_mgr.cc
@@ -1010,12 +1010,10 @@ void RangeLockMgr::UnLockAll(const PessimisticTransaction* txn, Env*) {
 }
 
 
-
-
 int RangeLockMgr::compare_dbt_endpoints(__toku_db*, void *arg,
                                         const DBT *a_key,
                                         const DBT *b_key) {
-  RangeLockMgr* mgr= (RangeLockMgr*) arg;
+  //RangeLockMgr* mgr= (RangeLockMgr*) arg;
   // TODO: this should compare endpoints using the user-provided comparator +
   // endpoint encoding.
   // (just use one from any column family)


More information about the commits mailing list