diff options
| author | Jason Rassi <rassi@10gen.com> | 2014-03-13 00:46:39 -0400 |
|---|---|---|
| committer | Jason Rassi <rassi@10gen.com> | 2014-03-13 00:50:21 -0400 |
| commit | 5253043325f42857efbb732b667ea8261ebcd4df (patch) | |
| tree | f5088c3bf6a96ddcf0156f2a86a84b1ca4a16f93 /src/mongo/s/write_ops | |
| parent | 506431db2f82995ecd757820a6071449c628b9d5 (diff) | |
| download | mongo-5253043325f42857efbb732b667ea8261ebcd4df.tar.gz | |
SERVER-12819 Reject write cmds where batch size > maxWriteBatchSize
Diffstat (limited to 'src/mongo/s/write_ops')
| -rw-r--r-- | src/mongo/s/write_ops/batch_upconvert.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/s/write_ops/batched_command_request.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/s/write_ops/batched_command_request.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/s/write_ops/batch_upconvert.cpp b/src/mongo/s/write_ops/batch_upconvert.cpp index dec0a03c95d..d371fde5848 100644 --- a/src/mongo/s/write_ops/batch_upconvert.cpp +++ b/src/mongo/s/write_ops/batch_upconvert.cpp @@ -88,7 +88,7 @@ namespace mongo { break; } } - while ( static_cast<int>( docs.size() ) < BatchedCommandRequest::kMaxWriteBatchSize + while ( docs.size() < BatchedCommandRequest::kMaxWriteBatchSize && dbMsg.moreJSObjs() ); dassert( !docs.empty() ); diff --git a/src/mongo/s/write_ops/batched_command_request.cpp b/src/mongo/s/write_ops/batched_command_request.cpp index ce90f54be87..92f6f99069f 100644 --- a/src/mongo/s/write_ops/batched_command_request.cpp +++ b/src/mongo/s/write_ops/batched_command_request.cpp @@ -33,6 +33,8 @@ namespace mongo { + const size_t BatchedCommandRequest::kMaxWriteBatchSize = 1000; + BatchedCommandRequest::BatchedCommandRequest( BatchType batchType ) : _batchType( batchType ) { switch ( getBatchType() ) { diff --git a/src/mongo/s/write_ops/batched_command_request.h b/src/mongo/s/write_ops/batched_command_request.h index 5702d6077b5..1afd9c02b96 100644 --- a/src/mongo/s/write_ops/batched_command_request.h +++ b/src/mongo/s/write_ops/batched_command_request.h @@ -48,7 +48,7 @@ namespace mongo { public: // Maximum number of write ops supported per batch - static const int kMaxWriteBatchSize = 1000; + static const size_t kMaxWriteBatchSize; enum BatchType { BatchType_Insert, BatchType_Update, BatchType_Delete, BatchType_Unknown |