CSHARP-2123 Change maxTimeMS set from double to int

byTimo · rstam · commit ef9872aab393 · 2018-01-04T17:40:28.000-05:00
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AggregateExplainOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/AggregateExplainOperation.cs
@@ -160,7 +160,7 @@ internal BsonDocument CreateCommand(SemanticVersion serverVersion)
                 { "explain", true },
                 { "pipeline", new BsonArray(_pipeline) },
                 { "allowDiskUse", () => _allowDiskUse.Value, _allowDiskUse.HasValue },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "collation", () => _collation.ToBsonDocument(), _collation != null },
                 { "hint", () => _hint, _hint != null },
                 { "comment", () => _comment, _comment != null }
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AggregateOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/AggregateOperation.cs
@@ -277,7 +277,7 @@ internal BsonDocument CreateCommand(ConnectionDescription connectionDescription,
                 { "aggregate", _collectionNamespace.CollectionName },
                 { "pipeline", new BsonArray(_pipeline) },
                 { "allowDiskUse", () => _allowDiskUse.Value, _allowDiskUse.HasValue },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "collation", () => _collation.ToBsonDocument(), _collation != null },
                 { "hint", () => _hint, _hint != null },
                 { "comment", () => _comment, _comment != null }
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AggregateToCollectionOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/AggregateToCollectionOperation.cs
@@ -220,7 +220,7 @@ internal BsonDocument CreateCommand(SemanticVersion serverVersion)
                 { "pipeline", new BsonArray(_pipeline) },
                 { "allowDiskUse", () => _allowDiskUse.Value, _allowDiskUse.HasValue },
                 { "bypassDocumentValidation", () => _bypassDocumentValidation.Value, _bypassDocumentValidation.HasValue && Feature.BypassDocumentValidation.IsSupported(serverVersion) },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "collation", () => _collation.ToBsonDocument(), _collation != null },
                 { "writeConcern", () => _writeConcern.ToBsonDocument(), Feature.CommandsThatWriteAcceptWriteConcern.ShouldSendWriteConcern(serverVersion, _writeConcern) },
                 { "cursor", new BsonDocument(), serverVersion >= new SemanticVersion(3, 5, 0) },
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AsyncCursor.cs b/src/MongoDB.Driver.Core/Core/Operations/AsyncCursor.cs
@@ -157,7 +157,7 @@ private BsonDocument CreateGetMoreCommand()
                 { "getMore", _cursorId },
                 { "collection", _collectionNamespace.CollectionName },
                 { "batchSize", () => _batchSize.Value, _batchSize > 0 },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue }
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue }
             };
 
             return command;
diff --git a/src/MongoDB.Driver.Core/Core/Operations/CountOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/CountOperation.cs
@@ -172,7 +172,7 @@ internal BsonDocument CreateCommand(ConnectionDescription connectionDescription,
                 { "limit", () => _limit.Value, _limit.HasValue },
                 { "skip", () => _skip.Value, _skip.HasValue },
                 { "hint", _hint, _hint != null },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "collation", () => _collation.ToBsonDocument(), _collation != null }
             };
 
diff --git a/src/MongoDB.Driver.Core/Core/Operations/DistinctOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/DistinctOperation.cs
@@ -191,7 +191,7 @@ internal BsonDocument CreateCommand(ConnectionDescription connectionDescription,
                 { "distinct", _collectionNamespace.CollectionName },
                 { "key", _fieldName },
                 { "query", _filter, _filter != null },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "collation", () => _collation.ToBsonDocument(), _collation != null }
             };
 
diff --git a/src/MongoDB.Driver.Core/Core/Operations/EvalOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/EvalOperation.cs
@@ -152,7 +152,7 @@ internal BsonDocument CreateCommand()
                 { "$eval", _function },
                 { "args", () => new BsonArray(_args), _args != null },
                 { "nolock", () => _noLock.Value, _noLock.HasValue },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue }
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue }
             };
         }
 
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindCommandOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindCommandOperation.cs
@@ -434,7 +434,7 @@ internal BsonDocument CreateCommand(ConnectionDescription connectionDescription,
                 { "singleBatch", () => _limit < 0 || _singleBatch.Value, _limit < 0 || _singleBatch.HasValue },
                 { "comment", _comment, _comment != null },
                 { "maxScan", () => _maxScan.Value, _maxScan.HasValue },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "max", _max, _max != null },
                 { "min", _min, _min != null },
                 { "returnKey", () => _returnKey.Value, _returnKey.HasValue },
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindOneAndDeleteOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindOneAndDeleteOperation.cs
@@ -108,7 +108,7 @@ internal override BsonDocument CreateCommand(SemanticVersion serverVersion, long
                 { "remove", true },
                 { "sort", _sort, _sort != null },
                 { "fields", _projection, _projection != null },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "writeConcern", () => WriteConcern.ToBsonDocument(), WriteConcern != null && !WriteConcern.IsServerDefault && Feature.FindAndModifyWriteConcern.IsSupported(serverVersion) },
                 { "collation", () => Collation.ToBsonDocument(), Collation != null },
                 { "txnNumber", () => transactionNumber, transactionNumber.HasValue }
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindOneAndReplaceOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindOneAndReplaceOperation.cs
@@ -170,7 +170,7 @@ internal override BsonDocument CreateCommand(SemanticVersion serverVersion, long
                 { "sort", _sort, _sort != null },
                 { "fields", _projection, _projection != null },
                 { "upsert", true, _isUpsert },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "writeConcern", () => WriteConcern.ToBsonDocument(), WriteConcern != null && !WriteConcern.IsServerDefault && Feature.FindAndModifyWriteConcern.IsSupported(serverVersion) },
                 { "bypassDocumentValidation", () => _bypassDocumentValidation.Value, _bypassDocumentValidation.HasValue && Feature.BypassDocumentValidation.IsSupported(serverVersion) },
                 { "collation", () => Collation.ToBsonDocument(), Collation != null },
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindOneAndUpdateOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindOneAndUpdateOperation.cs
@@ -187,7 +187,7 @@ internal override BsonDocument CreateCommand(SemanticVersion serverVersion, long
                 { "sort", _sort, _sort != null },
                 { "fields", _projection, _projection != null },
                 { "upsert", true, _isUpsert },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "writeConcern", () => WriteConcern.ToBsonDocument(), WriteConcern != null && !WriteConcern.IsServerDefault && Feature.FindAndModifyWriteConcern.IsSupported(serverVersion) },
                 { "bypassDocumentValidation", () => _bypassDocumentValidation.Value, _bypassDocumentValidation.HasValue && Feature.BypassDocumentValidation.IsSupported(serverVersion) },
                 { "collation", () => Collation.ToBsonDocument(), Collation != null },
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindOpcodeOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindOpcodeOperation.cs
@@ -408,7 +408,7 @@ internal BsonDocument CreateWrappedQuery(ServerType serverType, ReadPreference r
                 { "$readPreference", readPreferenceDocument, readPreferenceDocument != null },
                 { "$orderby", _sort, _sort != null },
                 { "$comment", _comment, _comment != null },
-                { "$maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "$maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "$hint", _hint, _hint != null },
                 { "$max", _max, _max != null },
                 { "$maxScan", () => _maxScan.Value, _maxScan.HasValue },
diff --git a/src/MongoDB.Driver.Core/Core/Operations/GeoNearOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/GeoNearOperation.cs
@@ -225,7 +225,7 @@ internal BsonDocument CreateCommand(ConnectionDescription connectionDescription,
                 { "distanceMultiplier", () => _distanceMultiplier.Value, _distanceMultiplier.HasValue },
                 { "includeLocs", () => _includeLocs.Value, _includeLocs.HasValue },
                 { "uniqueDocs", () => _uniqueDocs.Value, _uniqueDocs.HasValue },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "collation", () => _collation.ToBsonDocument(), _collation != null }
             };
 
diff --git a/src/MongoDB.Driver.Core/Core/Operations/GeoSearchOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/GeoSearchOperation.cs
@@ -170,7 +170,7 @@ internal BsonDocument CreateCommand(ConnectionDescription connectionDescription,
                 { "limit", () => _limit.Value, _limit.HasValue },
                 { "maxDistance", () => _maxDistance.Value, _maxDistance.HasValue },
                 { "search", _search, _search != null },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
             };
 
             ReadConcernHelper.AppendReadConcern(command, _readConcern, connectionDescription, session);
diff --git a/src/MongoDB.Driver.Core/Core/Operations/GroupOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/GroupOperation.cs
@@ -256,7 +256,7 @@ internal BsonDocument CreateCommand(SemanticVersion serverVersion)
                         { "collation", () => _collation.ToBsonDocument(), _collation != null }
                     }
                 },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue }
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue }
            };
         }
 
diff --git a/src/MongoDB.Driver.Core/Core/Operations/MapReduceOperationBase.cs b/src/MongoDB.Driver.Core/Core/Operations/MapReduceOperationBase.cs
@@ -245,7 +245,7 @@ protected internal virtual BsonDocument CreateCommand(ConnectionDescription conn
                 { "scope", _scope, _scope != null },
                 { "jsMode", () => _javaScriptMode.Value, _javaScriptMode.HasValue },
                 { "verbose", () => _verbose.Value, _verbose.HasValue },
-                { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
+                { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
                 { "collation", () => _collation.ToBsonDocument(), _collation != null }
             };
         }
diff --git a/src/MongoDB.Driver.Legacy/MongoCollection.cs b/src/MongoDB.Driver.Legacy/MongoCollection.cs
@@ -1181,7 +1181,7 @@ public virtual CollectionStatsResult GetStats(GetStatsArgs args)
             {
                 { "collstats", _collectionNamespace.CollectionName },
                 { "scale", () => args.Scale.Value, args.Scale.HasValue }, // optional
-                { "maxTimeMS", () => args.MaxTime.Value.TotalMilliseconds, args.MaxTime.HasValue } // optional
+                { "maxTimeMS", () => (int)args.MaxTime.Value.TotalMilliseconds, args.MaxTime.HasValue } // optional
             };
             return _database.RunCommandAs<CollectionStatsResult>(command, ReadPreference.Primary);
         }
@@ -2139,7 +2139,7 @@ public virtual ValidateCollectionResult Validate(ValidateCollectionArgs args)
                 { "validate", _collectionNamespace.CollectionName },
                 { "full", () => args.Full.Value, args.Full.HasValue }, // optional
                 { "scandata", () => args.ScanData.Value, args.ScanData.HasValue }, // optional
-                { "maxTimeMS", () => args.MaxTime.Value.TotalMilliseconds, args.MaxTime.HasValue } // optional
+                { "maxTimeMS", () => (int)args.MaxTime.Value.TotalMilliseconds, args.MaxTime.HasValue } // optional
             };
             return _database.RunCommandAs<ValidateCollectionResult>(command, ReadPreference.Primary);
         }
diff --git a/src/MongoDB.Driver.Legacy/MongoCursor.cs b/src/MongoDB.Driver.Legacy/MongoCursor.cs
@@ -588,7 +588,7 @@ public virtual MongoCursor SetMaxScan(int maxScan)
         public virtual MongoCursor SetMaxTime(TimeSpan maxTime)
         {
             if (_isFrozen) { ThrowFrozen(); }
-            SetOption("$maxTimeMS", maxTime.TotalMilliseconds);
+            SetOption("$maxTimeMS", (int)maxTime.TotalMilliseconds);
             return this;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ internal BsonDocument CreateCommand()`
`152`	`152`	`{ "$eval", _function },`
`153`	`153`	`{ "args", () => new BsonArray(_args), _args != null },`
`154`	`154`	`{ "nolock", () => _noLock.Value, _noLock.HasValue },`
`155`		`- { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue }`
	`155`	`+ { "maxTimeMS", () => (int)_maxTime.Value.TotalMilliseconds, _maxTime.HasValue }`
`156`	`156`	`};`
`157`	`157`	`}`
`158`	`158`