summaryrefslogtreecommitdiff
path: root/src/mongo/db/commands
diff options
context:
space:
mode:
authorKevin Pulo <kevin.pulo@mongodb.com>2020-09-15 11:44:54 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-09-17 04:31:08 +0000
commit686ee776666ebcfa15f3744142f74b6f1d59e617 (patch)
tree4b03cae9999243359291acc931eaae8daa2b5869 /src/mongo/db/commands
parent8213debcbf8b9495c0e336d98a8bf75df7f088c5 (diff)
downloadmongo-686ee776666ebcfa15f3744142f74b6f1d59e617.tar.gz
SERVER-48433 Remove LogicalClock facade
Diffstat (limited to 'src/mongo/db/commands')
-rw-r--r--src/mongo/db/commands/dbhash.cpp1
-rw-r--r--src/mongo/db/commands/drop_indexes.cpp4
-rw-r--r--src/mongo/db/commands/snapshot_management.cpp4
3 files changed, 4 insertions, 5 deletions
diff --git a/src/mongo/db/commands/dbhash.cpp b/src/mongo/db/commands/dbhash.cpp
index ad150d7c116..be9243982ca 100644
--- a/src/mongo/db/commands/dbhash.cpp
+++ b/src/mongo/db/commands/dbhash.cpp
@@ -44,7 +44,6 @@
#include "mongo/db/commands/test_commands_enabled.h"
#include "mongo/db/db_raii.h"
#include "mongo/db/exec/working_set_common.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/namespace_string.h"
#include "mongo/db/query/internal_plans.h"
#include "mongo/db/repl/replication_coordinator.h"
diff --git a/src/mongo/db/commands/drop_indexes.cpp b/src/mongo/db/commands/drop_indexes.cpp
index eebf122c494..b0d2a25e7e6 100644
--- a/src/mongo/db/commands/drop_indexes.cpp
+++ b/src/mongo/db/commands/drop_indexes.cpp
@@ -47,10 +47,10 @@
#include "mongo/db/db_raii.h"
#include "mongo/db/index/index_descriptor.h"
#include "mongo/db/index_builds_coordinator.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/op_observer.h"
#include "mongo/db/service_context.h"
#include "mongo/db/storage/durable_catalog.h"
+#include "mongo/db/vector_clock.h"
#include "mongo/db/views/view_catalog.h"
#include "mongo/logv2/log.h"
#include "mongo/util/exit_code.h"
@@ -262,7 +262,7 @@ public:
// This was also done when dropAllIndexes() committed, but we need to ensure that no one
// tries to read in the intermediate state where all indexes are newer than the current
// snapshot so are unable to be used.
- auto clusterTime = LogicalClock::getClusterTimeForReplicaSet(opCtx).asTimestamp();
+ auto clusterTime = VectorClock::getClusterTimeForReplicaSet(opCtx).asTimestamp();
collection.getWritableCollection()->setMinimumVisibleSnapshot(clusterTime);
collection.commitToCatalog();
diff --git a/src/mongo/db/commands/snapshot_management.cpp b/src/mongo/db/commands/snapshot_management.cpp
index be2e432c243..43e2a07e01a 100644
--- a/src/mongo/db/commands/snapshot_management.cpp
+++ b/src/mongo/db/commands/snapshot_management.cpp
@@ -34,11 +34,11 @@
#include "mongo/db/commands.h"
#include "mongo/db/commands/test_commands_enabled.h"
#include "mongo/db/concurrency/d_concurrency.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/operation_context.h"
#include "mongo/db/repl/replication_coordinator.h"
#include "mongo/db/service_context.h"
#include "mongo/db/storage/snapshot_manager.h"
+#include "mongo/db/vector_clock.h"
namespace mongo {
class CmdMakeSnapshot final : public BasicCommand {
@@ -77,7 +77,7 @@ public:
Lock::GlobalLock lk(opCtx, MODE_IX);
- auto name = LogicalClock::getClusterTimeForReplicaSet(opCtx).asTimestamp();
+ auto name = VectorClock::getClusterTimeForReplicaSet(opCtx).asTimestamp();
result.append("name", static_cast<long long>(name.asULL()));
return true;