diff options
author | Benety Goh <benety@mongodb.com> | 2018-05-15 20:03:26 -0400 |
---|---|---|
committer | Benety Goh <benety@mongodb.com> | 2018-05-15 20:03:26 -0400 |
commit | cf339b8a8d8708e8b28747fe0cafee7cc79fe9a6 (patch) | |
tree | 7d0861c729b7a87b8576385688136e34cce9fdc8 /src | |
parent | c751a7d30f394fc6daefebfbfe7538db9b1b6c89 (diff) | |
download | mongo-cf339b8a8d8708e8b28747fe0cafee7cc79fe9a6.tar.gz |
SERVER-32335 remove unused batchLimits argument from DataReplicatorExternalState::getNextApplierBatch()
Diffstat (limited to 'src')
6 files changed, 9 insertions, 16 deletions
diff --git a/src/mongo/db/repl/data_replicator_external_state.h b/src/mongo/db/repl/data_replicator_external_state.h index 1a36eadf836..a53ecbcf96b 100644 --- a/src/mongo/db/repl/data_replicator_external_state.h +++ b/src/mongo/db/repl/data_replicator_external_state.h @@ -112,10 +112,8 @@ public: * * This function is a passthrough for OplogApplier::getNextApplierBatch() */ - virtual StatusWith<OplogApplier::Operations> getNextApplierBatch( - OperationContext* opCtx, - OplogBuffer* oplogBuffer, - const OplogApplier::BatchLimits& batchLimits) = 0; + virtual StatusWith<OplogApplier::Operations> getNextApplierBatch(OperationContext* opCtx, + OplogBuffer* oplogBuffer) = 0; /** * Returns the current replica set config if there is one, or an error why there isn't. diff --git a/src/mongo/db/repl/data_replicator_external_state_impl.cpp b/src/mongo/db/repl/data_replicator_external_state_impl.cpp index 98eb0c55c74..22db4d51d5b 100644 --- a/src/mongo/db/repl/data_replicator_external_state_impl.cpp +++ b/src/mongo/db/repl/data_replicator_external_state_impl.cpp @@ -148,7 +148,7 @@ std::unique_ptr<OplogBuffer> DataReplicatorExternalStateImpl::makeInitialSyncOpl } StatusWith<OplogApplier::Operations> DataReplicatorExternalStateImpl::getNextApplierBatch( - OperationContext* opCtx, OplogBuffer* oplogBuffer, const OplogApplier::BatchLimits&) { + OperationContext* opCtx, OplogBuffer* oplogBuffer) { OplogApplier oplogApplier( nullptr, oplogBuffer, nullptr, nullptr, nullptr, nullptr, {}, nullptr); OplogApplier::BatchLimits batchLimits; diff --git a/src/mongo/db/repl/data_replicator_external_state_impl.h b/src/mongo/db/repl/data_replicator_external_state_impl.h index d61a9f079ac..0acacefbb49 100644 --- a/src/mongo/db/repl/data_replicator_external_state_impl.h +++ b/src/mongo/db/repl/data_replicator_external_state_impl.h @@ -59,10 +59,8 @@ public: std::unique_ptr<OplogBuffer> makeInitialSyncOplogBuffer(OperationContext* opCtx) const override; - StatusWith<OplogApplier::Operations> getNextApplierBatch( - OperationContext* opCtx, - OplogBuffer* oplogBuffer, - const OplogApplier::BatchLimits& batchLimits) final; + StatusWith<OplogApplier::Operations> getNextApplierBatch(OperationContext* opCtx, + OplogBuffer* oplogBuffer) final; StatusWith<ReplSetConfig> getCurrentConfig() const override; diff --git a/src/mongo/db/repl/data_replicator_external_state_mock.cpp b/src/mongo/db/repl/data_replicator_external_state_mock.cpp index e18b6022f74..8324e48b833 100644 --- a/src/mongo/db/repl/data_replicator_external_state_mock.cpp +++ b/src/mongo/db/repl/data_replicator_external_state_mock.cpp @@ -82,7 +82,7 @@ std::unique_ptr<OplogBuffer> DataReplicatorExternalStateMock::makeInitialSyncOpl } StatusWith<OplogApplier::Operations> DataReplicatorExternalStateMock::getNextApplierBatch( - OperationContext* opCtx, OplogBuffer* oplogBuffer, const OplogApplier::BatchLimits&) { + OperationContext* opCtx, OplogBuffer* oplogBuffer) { OplogApplier::Operations ops; OplogBuffer::Value op; // For testing only. Return a single batch containing all of the operations in the oplog buffer. diff --git a/src/mongo/db/repl/data_replicator_external_state_mock.h b/src/mongo/db/repl/data_replicator_external_state_mock.h index 2c35004ce44..b59a9c7ec1d 100644 --- a/src/mongo/db/repl/data_replicator_external_state_mock.h +++ b/src/mongo/db/repl/data_replicator_external_state_mock.h @@ -56,10 +56,8 @@ public: std::unique_ptr<OplogBuffer> makeInitialSyncOplogBuffer(OperationContext* opCtx) const override; - StatusWith<OplogApplier::Operations> getNextApplierBatch( - OperationContext* opCtx, - OplogBuffer* oplogBuffer, - const OplogApplier::BatchLimits& batchLimits) final; + StatusWith<OplogApplier::Operations> getNextApplierBatch(OperationContext* opCtx, + OplogBuffer* oplogBuffer) final; StatusWith<ReplSetConfig> getCurrentConfig() const override; diff --git a/src/mongo/db/repl/initial_syncer.cpp b/src/mongo/db/repl/initial_syncer.cpp index b79f3540343..0428e858333 100644 --- a/src/mongo/db/repl/initial_syncer.cpp +++ b/src/mongo/db/repl/initial_syncer.cpp @@ -1448,8 +1448,7 @@ StatusWith<Operations> InitialSyncer::_getNextApplierBatch_inlock() { // Access common batching logic in OplogApplier using passthrough function in // DataReplicatorExternalState. auto opCtx = makeOpCtx(); - return _dataReplicatorExternalState->getNextApplierBatch( - opCtx.get(), _oplogBuffer.get(), _opts.batchLimits); + return _dataReplicatorExternalState->getNextApplierBatch(opCtx.get(), _oplogBuffer.get()); } StatusWith<HostAndPort> InitialSyncer::_chooseSyncSource_inlock() { |