npm - @nxtedition/rocksdb - Versions diffs - 8.1.7 → 8.1.8 - Mend

@nxtedition/rocksdb 8.1.7 → 8.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (536) hide show

package/deps/rocksdb/rocksdb/utilities/transactions/lock/point/point_lock_manager_test.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/lock/point/point_lock_manager_test.h"
@@ -169,13 +168,3 @@ int main(int argc, char** argv) {
   return RUN_ALL_TESTS();
 }
-#else
-#include <stdio.h>
-int main(int /*argc*/, char** /*argv*/) {
-  fprintf(stderr,
-          "SKIPPED because Transactions are not supported in ROCKSDB_LITE\n");
-  return 0;
-}
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/point/point_lock_tracker.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 // COPYING file in the root directory) and Apache 2.0 License
 // (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/lock/point/point_lock_tracker.h"
@@ -254,4 +253,3 @@ void PointLockTracker::Clear() { tracked_keys_.clear(); }
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/point/point_lock_tracker.h CHANGED Viewed

@@ -4,7 +4,6 @@
 // (found in the LICENSE.Apache file in the root directory).
 #pragma once
-#ifndef ROCKSDB_LITE
 #include <memory>
 #include <string>
@@ -96,4 +95,3 @@ class PointLockTrackerFactory : public LockTrackerFactory {
 };
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_lock_manager.h CHANGED Viewed

@@ -8,7 +8,6 @@
 // Generic definitions for a Range-based Lock Manager
 //
 #pragma once
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/lock/lock_manager.h"
@@ -33,4 +32,3 @@ class RangeLockManagerBase : public LockManager {
 };
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_locking_test.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #include <algorithm>
@@ -447,13 +446,3 @@ int main(int /*argc*/, char** /*argv*/) {
 #endif  // OS_WIN
-#else
-#include <stdio.h>
-int main(int /*argc*/, char** /*argv*/) {
-  fprintf(stderr,
-          "skipped as transactions are not supported in rocksdb_lite\n");
-  return 0;
-}
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/concurrent_tree.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -136,4 +135,3 @@ void concurrent_tree::locked_keyrange::remove_all(void) {
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/keyrange.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -219,4 +218,3 @@ void keyrange::replace_right_key(const DBT *key) {
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/lock_request.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=2:softtabstop=2:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -524,4 +523,3 @@ void lock_request::set_retry_test_callback(void (*f)(void)) {
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=2:softtabstop=2:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -1020,4 +1019,3 @@ DICTIONARY_ID locktree::get_dict_id() const { return m_dict_id; }
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/manager.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -524,4 +523,3 @@ void locktree_manager::kill_waiter(void *extra) {
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/range_buffer.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -262,4 +261,3 @@ void range_buffer::append_point(const DBT *key, bool is_exclusive) {
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/treenode.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -517,4 +516,3 @@ treenode *treenode::child_ptr::get_locked(void) {
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/txnid_set.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -117,4 +116,3 @@ TXNID txnid_set::get(uint32_t i) const {
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/wfg.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -210,4 +209,3 @@ void wfg::node::free(wfg::node *n) {
 } /* namespace toku */
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/standalone_port.cc CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 /*
   This is a dump ground to make Lock Tree work without the rest of TokuDB.
@@ -129,4 +128,3 @@ int toku_builtin_compare_fun(const DBT *a, const DBT *b) {
   return toku_keycompare(a->data, a->size, b->data, b->size);
 }
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/util/dbt.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -150,4 +149,3 @@ bool toku_dbt_equals(const DBT *a, const DBT *b) {
   }
 }
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/lib/util/memarena.cc CHANGED Viewed

@@ -1,6 +1,5 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 // vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #ident "$Id$"
 /*======
@@ -198,4 +197,3 @@ bool memarena::chunk_iterator::more() const {
   return _chunk_idx < _ma->_n_other_chunks;
 }
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #include "utilities/transactions/lock/range/range_tree/range_tree_lock_manager.h"
@@ -500,4 +499,3 @@ LockManager::RangeLockStatus RangeTreeLockManager::GetRangeLockStatus() {
 }  // namespace ROCKSDB_NAMESPACE
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.h CHANGED Viewed

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 #pragma once
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 // For DeadlockInfoBuffer:
@@ -134,4 +133,3 @@ void wait_callback_for_locktree(void* cdata, toku::lock_wait_infos* infos);
 }  // namespace ROCKSDB_NAMESPACE
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #ifndef OS_WIN
 #include "utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.h"
@@ -153,4 +152,3 @@ void RangeLockList::ReplaceLocks(const toku::locktree *lt,
 }  // namespace ROCKSDB_NAMESPACE
 #endif  // OS_WIN
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/optimistic_transaction.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/optimistic_transaction.h"
@@ -193,4 +192,3 @@ Status OptimisticTransaction::SetName(const TransactionName& /* unused */) {
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/optimistic_transaction.h CHANGED Viewed

@@ -5,7 +5,6 @@
 #pragma once
-#ifndef ROCKSDB_LITE
 #include <stack>
 #include <string>
@@ -98,4 +97,3 @@ class OptimisticTransactionCallback : public WriteCallback {
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/optimistic_transaction_db_impl.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/optimistic_transaction_db_impl.h"
@@ -108,4 +107,3 @@ void OptimisticTransactionDBImpl::ReinitializeTransaction(
 }
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/optimistic_transaction_db_impl.h CHANGED Viewed

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 #pragma once
-#ifndef ROCKSDB_LITE
 #include <algorithm>
 #include <mutex>
@@ -85,4 +84,3 @@ class OptimisticTransactionDBImpl : public OptimisticTransactionDB {
 };
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/optimistic_transaction_test.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include <functional>
 #include <string>
@@ -1478,14 +1477,3 @@ int main(int argc, char** argv) {
   return RUN_ALL_TESTS();
 }
-#else
-#include <stdio.h>
-int main(int /*argc*/, char** /*argv*/) {
-  fprintf(
-      stderr,
-      "SKIPPED as optimistic_transaction is not supported in ROCKSDB_LITE\n");
-  return 0;
-}
-#endif  // !ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/pessimistic_transaction.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/pessimistic_transaction.h"
@@ -1172,4 +1171,3 @@ Status PessimisticTransaction::SetName(const TransactionName& name) {
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/pessimistic_transaction.h CHANGED Viewed

@@ -5,7 +5,6 @@
 #pragma once
-#ifndef ROCKSDB_LITE
 #include <algorithm>
 #include <atomic>
@@ -310,4 +309,3 @@ class WriteCommittedTxn : public PessimisticTransaction {
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/pessimistic_transaction_db.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/pessimistic_transaction_db.h"
@@ -779,4 +778,3 @@ Status SnapshotCreationCallback::operator()(SequenceNumber seq,
 }
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/pessimistic_transaction_db.h CHANGED Viewed

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 #pragma once
-#ifndef ROCKSDB_LITE
 #include <mutex>
 #include <queue>
@@ -315,4 +314,3 @@ class SnapshotCreationCallback : public PostMemTableCallback {
 };
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/snapshot_checker.cc CHANGED Viewed

@@ -5,27 +5,12 @@
 #include "db/snapshot_checker.h"
-#ifdef ROCKSDB_LITE
-#include <assert.h>
-#endif  // ROCKSDB_LITE
 #include "port/lang.h"
 #include "utilities/transactions/write_prepared_txn_db.h"
 namespace ROCKSDB_NAMESPACE {
-#ifdef ROCKSDB_LITE
-WritePreparedSnapshotChecker::WritePreparedSnapshotChecker(
-    WritePreparedTxnDB* /*txn_db*/) {}
-SnapshotCheckerResult WritePreparedSnapshotChecker::CheckInSnapshot(
-    SequenceNumber /*sequence*/, SequenceNumber /*snapshot_sequence*/) const {
-  // Should never be called in LITE mode.
-  assert(false);
-  return SnapshotCheckerResult::kInSnapshot;
-}
-#else
 WritePreparedSnapshotChecker::WritePreparedSnapshotChecker(
     WritePreparedTxnDB* txn_db)
@@ -44,7 +29,6 @@ SnapshotCheckerResult WritePreparedSnapshotChecker::CheckInSnapshot(
                      : SnapshotCheckerResult::kNotInSnapshot;
 }
-#endif  // ROCKSDB_LITE
 DisableGCSnapshotChecker* DisableGCSnapshotChecker::Instance() {
   STATIC_AVOID_DESTRUCTION(DisableGCSnapshotChecker, instance);

package/deps/rocksdb/rocksdb/utilities/transactions/timestamped_snapshot_test.cc CHANGED Viewed

@@ -3,14 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifdef ROCKSDB_LITE
-#include <cstdio>
-int main(int /*argc*/, char** /*argv*/) {
-  fprintf(stderr, "SKIPPED as Transactions are not supported in LITE mode\n");
-  return 0;
-}
-#else  // ROCKSDB_LITE
 #include <cassert>
 #include "util/cast_util.h"
@@ -463,4 +455,3 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
-#endif  // !ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/transaction_base.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/transaction_base.h"
@@ -728,4 +727,3 @@ WriteBatch* TransactionBaseImpl::GetCommitTimeWriteBatch() {
 }
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/transaction_base.h CHANGED Viewed

@@ -5,7 +5,6 @@
 #pragma once
-#ifndef ROCKSDB_LITE
 #include <stack>
 #include <string>
@@ -381,4 +380,3 @@ class TransactionBaseImpl : public Transaction {
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/transaction_db_mutex_impl.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/transaction_db_mutex_impl.h"
@@ -132,4 +131,3 @@ Status TransactionDBCondVarImpl::WaitFor(
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/transaction_db_mutex_impl.h CHANGED Viewed

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 #pragma once
-#ifndef ROCKSDB_LITE
 #include "rocksdb/utilities/transaction_db_mutex.h"
@@ -23,4 +22,3 @@ class TransactionDBMutexFactoryImpl : public TransactionDBMutexFactory {
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/transaction_test.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/transaction_test.h"
@@ -6641,6 +6640,108 @@ TEST_P(TransactionTest, StallTwoWriteQueues) {
   ASSERT_TRUE(t2_completed);
 }
+// Make sure UnlockWAL does not return until the stall it controls is cleared.
+TEST_P(TransactionTest, UnlockWALStallCleared) {
+  auto dbimpl = static_cast_with_check<DBImpl>(db->GetRootDB());
+  for (bool external_stall : {false, true}) {
+    WriteOptions wopts;
+    wopts.sync = true;
+    wopts.disableWAL = false;
+    ASSERT_OK(db->Put(wopts, "k1", "val1"));
+    // Stall writes
+    ASSERT_OK(db->LockWAL());
+    std::unique_ptr<WriteControllerToken> token;
+    if (external_stall) {
+      // Also make sure UnlockWAL can return despite another stall being in
+      // effect.
+      token = dbimpl->TEST_write_controler().GetStopToken();
+    }
+    SyncPoint::GetInstance()->DisableProcessing();
+    std::vector<SyncPoint::SyncPointPair> sync_deps;
+    sync_deps.push_back(
+        {"DBImpl::DelayWrite:Wait",
+         "TransactionTest::UnlockWALStallCleared:BeforeUnlockWAL1"});
+    if (options.two_write_queues &&
+        txn_db_options.write_policy == WRITE_COMMITTED) {
+      sync_deps.push_back(
+          {"DBImpl::DelayWrite:NonmemWait",
+           "TransactionTest::UnlockWALStallCleared:BeforeUnlockWAL2"});
+    }
+    SyncPoint::GetInstance()->LoadDependency(sync_deps);
+    SyncPoint::GetInstance()->SetCallBack(
+        "DBImpl::DelayWrite:AfterWait", [](void* arg) {
+          auto& mu = *static_cast<CacheAlignedInstrumentedMutex*>(arg);
+          mu.AssertHeld();
+          // Pretend we are slow waking up from bg_cv_, to give a chance for the
+          // bug to occur if it can. Randomly prefer one queue over the other.
+          mu.Unlock();
+          if (Random::GetTLSInstance()->OneIn(2)) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+          } else {
+            std::this_thread::yield();
+          }
+          mu.Lock();
+        });
+    SyncPoint::GetInstance()->EnableProcessing();
+    // Create blocking writes (for both queues) in background and use
+    // sync point dependency to get the stall into the write queue(s)
+    std::atomic<bool> t1_completed{false};
+    port::Thread t1{[&]() {
+      ASSERT_OK(db->Put(wopts, "k2", "val2"));
+      t1_completed = true;
+    }};
+    std::atomic<bool> t2_completed{false};
+    port::Thread t2{[&]() {
+      std::unique_ptr<Transaction> txn0{db->BeginTransaction(wopts, {})};
+      ASSERT_OK(txn0->SetName("x1"));
+      ASSERT_OK(txn0->Put("k3", "val3"));
+      ASSERT_OK(txn0->Prepare());  // nonmem
+      ASSERT_OK(txn0->Commit());
+    }};
+    // Be sure the test is set up appropriately
+    TEST_SYNC_POINT("TransactionTest::UnlockWALStallCleared:BeforeUnlockWAL1");
+    TEST_SYNC_POINT("TransactionTest::UnlockWALStallCleared:BeforeUnlockWAL2");
+    ASSERT_FALSE(t1_completed.load());
+    ASSERT_FALSE(t2_completed.load());
+    // Clear the stall
+    ASSERT_OK(db->UnlockWAL());
+    WriteOptions wopts2 = wopts;
+    if (external_stall) {
+      // We did not deadlock in UnlockWAL, so now async clear the external
+      // stall and then do a blocking write.
+      // DB mutex acquire+release is needed to ensure we don't reset token and
+      // signal while DelayWrite() is between IsStopped() and
+      // BeginWriteStall().
+      token.reset();
+      dbimpl->TEST_LockMutex();
+      dbimpl->TEST_UnlockMutex();
+      dbimpl->TEST_SignalAllBgCv();
+    } else {
+      // To verify the LockWAL stall is guaranteed cleared, do a non-blocking
+      // write that is attempting to catch a bug by attempting to come before
+      // the thread that did BeginWriteStall() can do EndWriteStall()
+      wopts2.no_slowdown = true;
+    }
+    std::unique_ptr<Transaction> txn0{db->BeginTransaction(wopts2, {})};
+    ASSERT_OK(txn0->SetName("x2"));
+    ASSERT_OK(txn0->Put("k1", "val4"));
+    ASSERT_OK(txn0->Prepare());  // nonmem
+    ASSERT_OK(txn0->Commit());
+    t1.join();
+    t2.join();
+  }
+}
 }  // namespace ROCKSDB_NAMESPACE
 int main(int argc, char** argv) {
@@ -6649,13 +6750,3 @@ int main(int argc, char** argv) {
   return RUN_ALL_TESTS();
 }
-#else
-#include <stdio.h>
-int main(int /*argc*/, char** /*argv*/) {
-  fprintf(stderr,
-          "SKIPPED as Transactions are not supported in ROCKSDB_LITE\n");
-  return 0;
-}
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/utilities/transactions/transaction_util.cc CHANGED Viewed

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
-#ifndef ROCKSDB_LITE
 #include "utilities/transactions/transaction_util.h"
@@ -203,4 +202,3 @@ Status TransactionUtil::CheckKeysForConflicts(DBImpl* db_impl,
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE