From 589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79 Mon Sep 17 00:00:00 2001 From: Maria van Keulen Date: Tue, 7 Mar 2017 12:00:08 -0500 Subject: SERVER-27938 Rename all OperationContext variables to opCtx This commit is an automated rename of all whole word instances of txn, _txn, and txnPtr to opCtx, _opCtx, and opCtxPtr, respectively in all .cpp and .h files in src/mongo. --- .../replication_coordinator_external_state_mock.h | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/mongo/db/repl/replication_coordinator_external_state_mock.h') diff --git a/src/mongo/db/repl/replication_coordinator_external_state_mock.h b/src/mongo/db/repl/replication_coordinator_external_state_mock.h index 1b575ede697..c33044a2510 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_mock.h +++ b/src/mongo/db/repl/replication_coordinator_external_state_mock.h @@ -58,46 +58,46 @@ public: virtual ~ReplicationCoordinatorExternalStateMock(); virtual void startThreads(const ReplSettings& settings) override; virtual void startInitialSync(OnInitialSyncFinishedFn finished) override; - virtual void startSteadyStateReplication(OperationContext* txn, + virtual void startSteadyStateReplication(OperationContext* opCtx, ReplicationCoordinator* replCoord) override; - virtual void stopDataReplication(OperationContext* txn) override; - virtual void runOnInitialSyncThread(stdx::function run) override; - virtual bool isInitialSyncFlagSet(OperationContext* txn) override; + virtual void stopDataReplication(OperationContext* opCtx) override; + virtual void runOnInitialSyncThread(stdx::function run) override; + virtual bool isInitialSyncFlagSet(OperationContext* opCtx) override; virtual void startMasterSlave(OperationContext*); - virtual void shutdown(OperationContext* txn); + virtual void shutdown(OperationContext* opCtx); virtual executor::TaskExecutor* getTaskExecutor() const override; virtual OldThreadPool* getDbWorkThreadPool() const override; - virtual Status runRepairOnLocalDB(OperationContext* txn) override; - virtual Status initializeReplSetStorage(OperationContext* txn, const BSONObj& config); - void onDrainComplete(OperationContext* txn) override; - OpTime onTransitionToPrimary(OperationContext* txn, bool isV1ElectionProtocol) override; + virtual Status runRepairOnLocalDB(OperationContext* opCtx) override; + virtual Status initializeReplSetStorage(OperationContext* opCtx, const BSONObj& config); + void onDrainComplete(OperationContext* opCtx) override; + OpTime onTransitionToPrimary(OperationContext* opCtx, bool isV1ElectionProtocol) override; virtual void forwardSlaveProgress(); virtual OID ensureMe(OperationContext*); virtual bool isSelf(const HostAndPort& host, ServiceContext* service); - virtual HostAndPort getClientHostAndPort(const OperationContext* txn); - virtual StatusWith loadLocalConfigDocument(OperationContext* txn); - virtual Status storeLocalConfigDocument(OperationContext* txn, const BSONObj& config); - virtual StatusWith loadLocalLastVoteDocument(OperationContext* txn); - virtual Status storeLocalLastVoteDocument(OperationContext* txn, const LastVote& lastVote); + virtual HostAndPort getClientHostAndPort(const OperationContext* opCtx); + virtual StatusWith loadLocalConfigDocument(OperationContext* opCtx); + virtual Status storeLocalConfigDocument(OperationContext* opCtx, const BSONObj& config); + virtual StatusWith loadLocalLastVoteDocument(OperationContext* opCtx); + virtual Status storeLocalLastVoteDocument(OperationContext* opCtx, const LastVote& lastVote); virtual void setGlobalTimestamp(ServiceContext* service, const Timestamp& newTime); - virtual StatusWith loadLastOpTime(OperationContext* txn); - virtual void cleanUpLastApplyBatch(OperationContext* txn); + virtual StatusWith loadLastOpTime(OperationContext* opCtx); + virtual void cleanUpLastApplyBatch(OperationContext* opCtx); virtual void closeConnections(); - virtual void killAllUserOperations(OperationContext* txn); + virtual void killAllUserOperations(OperationContext* opCtx); virtual void shardingOnStepDownHook(); virtual void signalApplierToChooseNewSyncSource(); virtual void stopProducer(); virtual void startProducerIfStopped(); virtual void dropAllSnapshots(); virtual void updateCommittedSnapshot(SnapshotName newCommitPoint); - virtual void createSnapshot(OperationContext* txn, SnapshotName name); + virtual void createSnapshot(OperationContext* opCtx, SnapshotName name); virtual void forceSnapshotCreation(); virtual bool snapshotsEnabled() const; virtual void notifyOplogMetadataWaiters(); virtual double getElectionTimeoutOffsetLimitFraction() const; - virtual bool isReadCommittedSupportedByStorageEngine(OperationContext* txn) const; - virtual StatusWith multiApply(OperationContext* txn, + virtual bool isReadCommittedSupportedByStorageEngine(OperationContext* opCtx) const; + virtual StatusWith multiApply(OperationContext* opCtx, MultiApplier::Operations ops, MultiApplier::ApplyOperationFn applyOperation) override; virtual Status multiSyncApply(MultiApplier::OperationPtrs* ops) override; @@ -105,9 +105,9 @@ public: const HostAndPort& source, AtomicUInt32* fetchCount) override; virtual std::unique_ptr makeInitialSyncOplogBuffer( - OperationContext* txn) const override; + OperationContext* opCtx) const override; virtual std::unique_ptr makeSteadyStateOplogBuffer( - OperationContext* txn) const override; + OperationContext* opCtx) const override; virtual bool shouldUseDataReplicatorInitialSync() const override; virtual std::size_t getOplogFetcherMaxFetcherRestarts() const override; -- cgit v1.2.1