summaryrefslogtreecommitdiff
path: root/src/mongo/s/write_ops
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/s/write_ops')
-rw-r--r--src/mongo/s/write_ops/batch_upconvert.cpp5
-rw-r--r--src/mongo/s/write_ops/batch_write_exec.h1
-rw-r--r--src/mongo/s/write_ops/batch_write_exec_test.cpp5
-rw-r--r--src/mongo/s/write_ops/batch_write_op.h3
-rw-r--r--src/mongo/s/write_ops/batched_command_request.h7
-rw-r--r--src/mongo/s/write_ops/batched_command_response.h7
-rw-r--r--src/mongo/s/write_ops/batched_delete_request.h3
-rw-r--r--src/mongo/s/write_ops/batched_insert_request.h3
-rw-r--r--src/mongo/s/write_ops/batched_request_metadata.cpp2
-rw-r--r--src/mongo/s/write_ops/batched_request_metadata.h3
-rw-r--r--src/mongo/s/write_ops/batched_update_request.h3
-rw-r--r--src/mongo/s/write_ops/write_op.h7
-rw-r--r--src/mongo/s/write_ops/write_op_test.cpp9
13 files changed, 23 insertions, 35 deletions
diff --git a/src/mongo/s/write_ops/batch_upconvert.cpp b/src/mongo/s/write_ops/batch_upconvert.cpp
index e3c37249255..26a8b8b2da0 100644
--- a/src/mongo/s/write_ops/batch_upconvert.cpp
+++ b/src/mongo/s/write_ops/batch_upconvert.cpp
@@ -30,7 +30,6 @@
#include "mongo/s/write_ops/batch_upconvert.h"
-#include <boost/scoped_ptr.hpp>
#include "mongo/bson/bsonobj.h"
#include "mongo/client/dbclientinterface.h"
@@ -44,7 +43,7 @@
namespace mongo {
- using boost::scoped_ptr;
+ using std::unique_ptr;
using mongoutils::str::stream;
using std::unique_ptr;
using std::string;
@@ -174,7 +173,7 @@ namespace mongo {
const BatchedCommandResponse& response,
LastError* error ) {
- scoped_ptr<WriteErrorDetail> commandError;
+ unique_ptr<WriteErrorDetail> commandError;
WriteErrorDetail* lastBatchError = NULL;
if ( !response.getOk() ) {
diff --git a/src/mongo/s/write_ops/batch_write_exec.h b/src/mongo/s/write_ops/batch_write_exec.h
index a55f716194a..b7fd6c51e43 100644
--- a/src/mongo/s/write_ops/batch_write_exec.h
+++ b/src/mongo/s/write_ops/batch_write_exec.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include <map>
#include <string>
diff --git a/src/mongo/s/write_ops/batch_write_exec_test.cpp b/src/mongo/s/write_ops/batch_write_exec_test.cpp
index 8c4bc77a660..3e0b2cfb9f3 100644
--- a/src/mongo/s/write_ops/batch_write_exec_test.cpp
+++ b/src/mongo/s/write_ops/batch_write_exec_test.cpp
@@ -28,7 +28,6 @@
#include "mongo/s/write_ops/batch_write_exec.h"
-#include <boost/scoped_ptr.hpp>
#include "mongo/base/owned_pointer_vector.h"
#include "mongo/s/client/mock_multi_write_command.h"
@@ -40,7 +39,7 @@
namespace {
- using boost::scoped_ptr;
+ using std::unique_ptr;
using std::string;
using std::vector;
@@ -81,7 +80,7 @@ namespace {
MockShardResolver resolver;
MockMultiWriteCommand dispatcher;
- scoped_ptr<BatchWriteExec> exec;
+ unique_ptr<BatchWriteExec> exec;
};
//
diff --git a/src/mongo/s/write_ops/batch_write_op.h b/src/mongo/s/write_ops/batch_write_op.h
index 0638cc43cb0..224d9985ef3 100644
--- a/src/mongo/s/write_ops/batch_write_op.h
+++ b/src/mongo/s/write_ops/batch_write_op.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include <set>
#include <vector>
@@ -180,7 +179,7 @@ namespace mongo {
OwnedPointerVector<BatchedUpsertDetail> _upsertedIds;
// Stats for the entire batch op
- boost::scoped_ptr<BatchWriteStats> _stats;
+ std::unique_ptr<BatchWriteStats> _stats;
};
struct BatchWriteStats {
diff --git a/src/mongo/s/write_ops/batched_command_request.h b/src/mongo/s/write_ops/batched_command_request.h
index 9cf7fb1a92d..66e178dd5a8 100644
--- a/src/mongo/s/write_ops/batched_command_request.h
+++ b/src/mongo/s/write_ops/batched_command_request.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include "mongo/base/disallow_copying.h"
#include "mongo/s/bson_serializable.h"
@@ -185,9 +184,9 @@ namespace mongo {
private:
BatchType _batchType;
- boost::scoped_ptr<BatchedInsertRequest> _insertReq;
- boost::scoped_ptr<BatchedUpdateRequest> _updateReq;
- boost::scoped_ptr<BatchedDeleteRequest> _deleteReq;
+ std::unique_ptr<BatchedInsertRequest> _insertReq;
+ std::unique_ptr<BatchedUpdateRequest> _updateReq;
+ std::unique_ptr<BatchedDeleteRequest> _deleteReq;
};
/**
diff --git a/src/mongo/s/write_ops/batched_command_response.h b/src/mongo/s/write_ops/batched_command_response.h
index 57fc0549330..68cee2abaa6 100644
--- a/src/mongo/s/write_ops/batched_command_response.h
+++ b/src/mongo/s/write_ops/batched_command_response.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include <string>
#include <vector>
@@ -175,7 +174,7 @@ namespace mongo {
// (O) Array of upserted items' _id's
// Should only be present if _singleUpserted is not.
- boost::scoped_ptr<std::vector<BatchedUpsertDetail*> >_upsertDetails;
+ std::unique_ptr<std::vector<BatchedUpsertDetail*> >_upsertDetails;
// (O) Timestamp assigned to the write op when it was written to the oplog.
// Normally, getLastError can use Client::_lastOp, but this is not valid for
@@ -192,10 +191,10 @@ namespace mongo {
bool _isElectionIdSet;
// (O) Array of item-level error information
- boost::scoped_ptr<std::vector<WriteErrorDetail*> >_writeErrorDetails;
+ std::unique_ptr<std::vector<WriteErrorDetail*> >_writeErrorDetails;
// (O) errors that occurred while trying to satisfy the write concern.
- boost::scoped_ptr<WCErrorDetail> _wcErrDetails;
+ std::unique_ptr<WCErrorDetail> _wcErrDetails;
};
} // namespace mongo
diff --git a/src/mongo/s/write_ops/batched_delete_request.h b/src/mongo/s/write_ops/batched_delete_request.h
index 62fd4f94505..e3846833bec 100644
--- a/src/mongo/s/write_ops/batched_delete_request.h
+++ b/src/mongo/s/write_ops/batched_delete_request.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include <string>
#include <vector>
@@ -151,7 +150,7 @@ namespace mongo {
bool _isOrderedSet;
// (O) metadata associated with this request for internal use.
- boost::scoped_ptr<BatchedRequestMetadata> _metadata;
+ std::unique_ptr<BatchedRequestMetadata> _metadata;
};
} // namespace mongo
diff --git a/src/mongo/s/write_ops/batched_insert_request.h b/src/mongo/s/write_ops/batched_insert_request.h
index 0fb6d95d8c5..8b5238b888e 100644
--- a/src/mongo/s/write_ops/batched_insert_request.h
+++ b/src/mongo/s/write_ops/batched_insert_request.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include <string>
#include <vector>
@@ -141,7 +140,7 @@ namespace mongo {
bool _isOrderedSet;
// (O) metadata associated with this request for internal use.
- boost::scoped_ptr<BatchedRequestMetadata> _metadata;
+ std::unique_ptr<BatchedRequestMetadata> _metadata;
// (O) cached copied of target ns
NamespaceString _targetNSS;
diff --git a/src/mongo/s/write_ops/batched_request_metadata.cpp b/src/mongo/s/write_ops/batched_request_metadata.cpp
index e3403196151..29d4b5e97fc 100644
--- a/src/mongo/s/write_ops/batched_request_metadata.cpp
+++ b/src/mongo/s/write_ops/batched_request_metadata.cpp
@@ -82,7 +82,7 @@ namespace mongo {
_isShardNameSet = fieldState == FieldParser::FIELD_SET;
{
- boost::scoped_ptr<ChunkVersion> tempChunkVersion(new ChunkVersion);
+ std::unique_ptr<ChunkVersion> tempChunkVersion(new ChunkVersion);
fieldState = FieldParser::extract(source, shardVersion,
tempChunkVersion.get(), errMsg);
if (fieldState == FieldParser::FIELD_INVALID) return false;
diff --git a/src/mongo/s/write_ops/batched_request_metadata.h b/src/mongo/s/write_ops/batched_request_metadata.h
index 029e915757e..afe639adfaa 100644
--- a/src/mongo/s/write_ops/batched_request_metadata.h
+++ b/src/mongo/s/write_ops/batched_request_metadata.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include <string>
#include "mongo/base/disallow_copying.h"
@@ -86,7 +85,7 @@ namespace mongo {
bool _isShardNameSet;
// (O) version for this collection on a given shard
- boost::scoped_ptr<ChunkVersion> _shardVersion;
+ std::unique_ptr<ChunkVersion> _shardVersion;
// (O) session number the inserts belong to
long long _session;
diff --git a/src/mongo/s/write_ops/batched_update_request.h b/src/mongo/s/write_ops/batched_update_request.h
index 94f24f089b1..db99188b7b3 100644
--- a/src/mongo/s/write_ops/batched_update_request.h
+++ b/src/mongo/s/write_ops/batched_update_request.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include <string>
#include <vector>
@@ -150,7 +149,7 @@ namespace mongo {
bool _shouldBypassValidation;
// (O) metadata associated with this request for internal use.
- boost::scoped_ptr<BatchedRequestMetadata> _metadata;
+ std::unique_ptr<BatchedRequestMetadata> _metadata;
};
} // namespace mongo
diff --git a/src/mongo/s/write_ops/write_op.h b/src/mongo/s/write_ops/write_op.h
index b54ec1718c3..98ccf0d691d 100644
--- a/src/mongo/s/write_ops/write_op.h
+++ b/src/mongo/s/write_ops/write_op.h
@@ -28,7 +28,6 @@
#pragma once
-#include <boost/scoped_ptr.hpp>
#include <vector>
#include "mongo/base/string_data.h"
@@ -183,7 +182,7 @@ namespace mongo {
std::vector<ChildWriteOp*> _childOps;
// filled when state == _Error
- boost::scoped_ptr<WriteErrorDetail> _error;
+ std::unique_ptr<WriteErrorDetail> _error;
// Finished child operations, for debugging
std::vector<ChildWriteOp*> _history;
@@ -210,10 +209,10 @@ namespace mongo {
TargetedWrite* pendingWrite;
// filled when state > _Pending
- boost::scoped_ptr<ShardEndpoint> endpoint;
+ std::unique_ptr<ShardEndpoint> endpoint;
// filled when state == _Error or (optionally) when state == _Cancelled
- boost::scoped_ptr<WriteErrorDetail> error;
+ std::unique_ptr<WriteErrorDetail> error;
};
// First value is write item index in the batch, second value is child write op index
diff --git a/src/mongo/s/write_ops/write_op_test.cpp b/src/mongo/s/write_ops/write_op_test.cpp
index 669220c6d24..fc5caa05dfb 100644
--- a/src/mongo/s/write_ops/write_op_test.cpp
+++ b/src/mongo/s/write_ops/write_op_test.cpp
@@ -28,7 +28,6 @@
#include "mongo/s/write_ops/write_op.h"
-#include <boost/scoped_ptr.hpp>
#include "mongo/base/error_codes.h"
#include "mongo/base/owned_pointer_vector.h"
@@ -40,7 +39,7 @@
namespace {
- using boost::scoped_ptr;
+ using std::unique_ptr;
using std::string;
using std::vector;
@@ -69,7 +68,7 @@ namespace {
WriteOp writeOp( BatchItemRef( &request, 0 ) );
ASSERT_EQUALS( writeOp.getWriteState(), WriteOpState_Ready );
- scoped_ptr<WriteErrorDetail> error( buildError( ErrorCodes::UnknownError,
+ unique_ptr<WriteErrorDetail> error( buildError( ErrorCodes::UnknownError,
BSON( "data" << 12345 ),
"some message" ) );
@@ -294,7 +293,7 @@ namespace {
ASSERT_EQUALS( targeted.size(), 1u );
assertEndpointsEqual( targeted.front()->endpoint, endpoint );
- scoped_ptr<WriteErrorDetail> error( buildError( ErrorCodes::UnknownError,
+ unique_ptr<WriteErrorDetail> error( buildError( ErrorCodes::UnknownError,
BSON( "data" << 12345 ),
"some message" ) );
@@ -392,7 +391,7 @@ namespace {
// Stale exception
- scoped_ptr<WriteErrorDetail> error( buildError( ErrorCodes::StaleShardVersion,
+ unique_ptr<WriteErrorDetail> error( buildError( ErrorCodes::StaleShardVersion,
BSON( "data" << 12345 ),
"some message" ) );
View Lorry Controller Status