diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 3a88f90de8c..31b81beebcb 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -122,7 +122,7 @@ - + diff --git a/driver-core/src/main/com/mongodb/MongoClientSettings.java b/driver-core/src/main/com/mongodb/MongoClientSettings.java index 858c1c83754..3cc4e9faba8 100644 --- a/driver-core/src/main/com/mongodb/MongoClientSettings.java +++ b/driver-core/src/main/com/mongodb/MongoClientSettings.java @@ -32,6 +32,7 @@ import com.mongodb.connection.SslSettings; import com.mongodb.connection.TransportSettings; import com.mongodb.event.CommandListener; +import com.mongodb.internal.operation.CommandOperationHelper; import com.mongodb.lang.Nullable; import com.mongodb.observability.ObservabilitySettings; import com.mongodb.spi.dns.DnsClient; @@ -503,9 +504,11 @@ public Builder retryReads(final boolean retryReads) { * the {@value MongoException#SYSTEM_OVERLOADED_ERROR_LABEL} and {@value MongoException#RETRYABLE_ERROR_LABEL} labels. * Such errors are referred to as retryable overload errors. *

- * Default is {@code null}, implies the value 2 and the above retry behavior. The implied value and behavior may change in + * Default is {@code null}, implies the value {@value CommandOperationHelper#DEFAULT_MAX_ADAPTIVE_RETRIES} and the above retry behavior. + * The implied value and behavior may change in * the future in a minor version. - * This means, there is no guarantee that not setting a value is equivalent to setting the value 2. + * This means, there is no guarantee that not setting a value is equivalent to setting the value + * {@value CommandOperationHelper#DEFAULT_MAX_ADAPTIVE_RETRIES}. * The value 0 results in not retrying the attempts failed due to retryable overload errors. * * @@ -961,7 +964,6 @@ public boolean getRetryReads() { */ @Beta(Reason.CLIENT) @Nullable - // TODO-BACKPRESSURE Valentin Use the `maxAdaptiveRetries` setting when retrying. public Integer getMaxAdaptiveRetries() { return maxAdaptiveRetries; } diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java index 9d655cd3d7a..1b3d6345839 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/AbortTransactionOperation.java @@ -36,8 +36,8 @@ public class AbortTransactionOperation extends TransactionOperation { private static final String COMMAND_NAME = "abortTransaction"; private BsonDocument recoveryToken; - public AbortTransactionOperation(final WriteConcern writeConcern) { - super(writeConcern); + public AbortTransactionOperation(final WriteConcern writeConcern, @Nullable final Integer maxAdaptiveRetriesSetting) { + super(writeConcern, maxAdaptiveRetriesSetting); } public AbortTransactionOperation recoveryToken(@Nullable final BsonDocument recoveryToken) { diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java index 1f2a6ba518f..fa6abd6a00f 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperation.java @@ -45,13 +45,14 @@ public class AggregateOperation implements ReadOperationExplainable { private final AggregateOperationImpl wrapped; - public AggregateOperation(final MongoNamespace namespace, final List pipeline, final Decoder decoder) { - this(namespace, pipeline, decoder, AggregationLevel.COLLECTION); + public AggregateOperation(final MongoNamespace namespace, final List pipeline, final Decoder decoder, + @Nullable final Integer maxAdaptiveRetriesSetting) { + this(namespace, pipeline, decoder, AggregationLevel.COLLECTION, maxAdaptiveRetriesSetting); } public AggregateOperation(final MongoNamespace namespace, final List pipeline, final Decoder decoder, - final AggregationLevel aggregationLevel) { - this.wrapped = new AggregateOperationImpl<>(namespace, pipeline, decoder, aggregationLevel); + final AggregationLevel aggregationLevel, @Nullable final Integer maxAdaptiveRetriesSetting) { + this.wrapped = new AggregateOperationImpl<>(namespace, pipeline, decoder, aggregationLevel, maxAdaptiveRetriesSetting); } public List getPipeline() { diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java index 940073d4238..ae1cf007429 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java +++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateOperationImpl.java @@ -65,6 +65,8 @@ class AggregateOperationImpl implements ReadOperationCursor { private final PipelineCreator pipelineCreator; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private Boolean allowDiskUse; private Integer batchSize; private Collation collation; @@ -75,21 +77,24 @@ class AggregateOperationImpl implements ReadOperationCursor { private CursorType cursorType; AggregateOperationImpl(final MongoNamespace namespace, - final List pipeline, final Decoder decoder, final AggregationLevel aggregationLevel) { + final List pipeline, final Decoder decoder, final AggregationLevel aggregationLevel, + @Nullable final Integer maxAdaptiveRetriesSetting) { this(namespace, pipeline, decoder, defaultAggregateTarget(notNull("aggregationLevel", aggregationLevel), notNull("namespace", namespace).getCollectionName()), - defaultPipelineCreator(pipeline)); + defaultPipelineCreator(pipeline), maxAdaptiveRetriesSetting); } AggregateOperationImpl(final MongoNamespace namespace, final List pipeline, final Decoder decoder, final AggregateTarget aggregateTarget, - final PipelineCreator pipelineCreator) { + final PipelineCreator pipelineCreator, + @Nullable final Integer maxAdaptiveRetriesSetting) { this.namespace = notNull("namespace", namespace); this.pipeline = notNull("pipeline", pipeline); this.decoder = notNull("decoder", decoder); this.aggregateTarget = notNull("aggregateTarget", aggregateTarget); this.pipelineCreator = notNull("pipelineCreator", pipelineCreator); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } List getPipeline() { @@ -196,7 +201,7 @@ public MongoNamespace getNamespace() { public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) { return executeRetryableRead(binding, applyTimeoutModeToOperationContext(timeoutMode, operationContext), namespace.getDatabaseName(), getCommandCreator(), CommandResultDocumentCodec.create(decoder, FIELD_NAMES_WITH_RESULT), - transformer(), retryReads); + transformer(), retryReads, maxAdaptiveRetriesSetting); } @Override @@ -204,7 +209,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext SingleResultCallback> errHandlingCallback = errorHandlingCallback(callback, LOGGER); executeRetryableReadAsync(binding, applyTimeoutModeToOperationContext(timeoutMode, operationContext), namespace.getDatabaseName(), getCommandCreator(), CommandResultDocumentCodec.create(decoder, FIELD_NAMES_WITH_RESULT), - asyncTransformer(), retryReads, + asyncTransformer(), retryReads, maxAdaptiveRetriesSetting, errHandlingCallback); } diff --git a/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java index 146a6680d37..69332c409b4 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/AggregateToCollectionOperation.java @@ -178,7 +178,8 @@ public Void execute(final ReadBinding binding, final OperationContext operationC getCommandCreator(), new BsonDocumentCodec(), transformer(), - false); + false, + null); } @Override @@ -194,6 +195,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext new BsonDocumentCodec(), asyncTransformer(), false, + null, callback); } diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java index d327ad663c9..cf0729b8555 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java +++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java @@ -176,9 +176,10 @@ static void executeRetryableReadAsync( final Decoder decoder, final CommandReadTransformerAsync transformer, final boolean retryReadsSetting, + @Nullable final Integer maxAdaptiveRetriesSetting, final SingleResultCallback callback) { executeRetryableReadAsync(binding, operationContext, binding::getReadConnectionSource, database, commandCreator, - decoder, transformer, retryReadsSetting, callback); + decoder, transformer, retryReadsSetting, maxAdaptiveRetriesSetting, callback); } static void executeRetryableReadAsync( @@ -190,9 +191,10 @@ static void executeRetryableReadAsync( final Decoder decoder, final CommandReadTransformerAsync transformer, final boolean retryReadsSetting, + @Nullable final Integer maxAdaptiveRetriesSetting, final SingleResultCallback callback) { RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryReadsSetting).includeRead(operationContext), + new SpecRetryPolicy.IndividualPolicies(retryReadsSetting).includeRead(operationContext).includeOverload(maxAdaptiveRetriesSetting), operationContext); binding.retain(); AsyncCallbackSupplier asyncRead = decorateWithRetriesAsync(retryControl, operationContext, @@ -257,12 +259,13 @@ static void executeRetryableWriteAsync( final CommandWriteTransformerAsync transformer, final Function retryCommandModifier, final boolean effectiveRetryWritesSetting, + @Nullable final Integer maxAdaptiveRetriesSetting, final SingleResultCallback callback) { beginAsync().thenSupply(c -> { binding.retain(); MutableValue command = new MutableValue<>(); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(effectiveRetryWritesSetting).includeWrite(), + new SpecRetryPolicy.IndividualPolicies(effectiveRetryWritesSetting).includeWrite().includeOverload(maxAdaptiveRetriesSetting), operationContext); AsyncCallbackSupplier retryingWrite = decorateWithRetriesAsync(retryControl, operationContext, supplierCallback -> { beginAsync().thenSupply(withSourceAndConnectionCallback -> { diff --git a/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java b/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java index fdb24752b62..9e291c159be 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/BaseFindAndModifyOperation.java @@ -51,6 +51,8 @@ public abstract class BaseFindAndModifyOperation implements WriteOperation private final MongoNamespace namespace; private final WriteConcern writeConcern; private final boolean retryWrites; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private final Decoder decoder; private BsonDocument filter; @@ -62,11 +64,14 @@ public abstract class BaseFindAndModifyOperation implements WriteOperation private BsonValue comment; private BsonDocument variables; - protected BaseFindAndModifyOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final boolean retryWrites, + protected BaseFindAndModifyOperation(final MongoNamespace namespace, final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, final Decoder decoder) { this.namespace = notNull("namespace", namespace); this.writeConcern = notNull("writeConcern", writeConcern); this.retryWrites = retryWrites; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; this.decoder = notNull("decoder", decoder); } @@ -83,7 +88,8 @@ public T execute(final WriteBinding binding, final OperationContext operationCon getCommandCreator(), FindAndModifyHelper.transformer(), cmd -> cmd, - retryWrites); + retryWrites, + maxAdaptiveRetriesSetting); } @Override @@ -91,7 +97,7 @@ public void executeAsync(final AsyncWriteBinding binding, final OperationContext executeRetryableWriteAsync(binding, operationContext, getDatabaseName(), null, getFieldNameValidator(), CommandResultDocumentCodec.create(getDecoder(), "value"), getCommandCreator(), - FindAndModifyHelper.asyncTransformer(), cmd -> cmd, retryWrites, callback); + FindAndModifyHelper.asyncTransformer(), cmd -> cmd, retryWrites, maxAdaptiveRetriesSetting, callback); } @Override diff --git a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java index ee45e885ceb..c94dccebf50 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/ChangeStreamOperation.java @@ -69,14 +69,15 @@ public class ChangeStreamOperation implements ReadOperationCursor { @VisibleForTesting(otherwise = VisibleForTesting.AccessModifier.PRIVATE) public ChangeStreamOperation(final MongoNamespace namespace, final FullDocument fullDocument, final FullDocumentBeforeChange fullDocumentBeforeChange, final List pipeline, final Decoder decoder) { - this(namespace, fullDocument, fullDocumentBeforeChange, pipeline, decoder, ChangeStreamLevel.COLLECTION); + this(namespace, fullDocument, fullDocumentBeforeChange, pipeline, decoder, ChangeStreamLevel.COLLECTION, null); } public ChangeStreamOperation(final MongoNamespace namespace, final FullDocument fullDocument, final FullDocumentBeforeChange fullDocumentBeforeChange, final List pipeline, final Decoder decoder, - final ChangeStreamLevel changeStreamLevel) { + final ChangeStreamLevel changeStreamLevel, + @Nullable final Integer maxAdaptiveRetriesSetting) { this.wrapped = new AggregateOperationImpl<>(namespace, pipeline, RAW_BSON_DOCUMENT_CODEC, getAggregateTarget(), - getPipelineCreator()).cursorType(CursorType.TailableAwait); + getPipelineCreator(), maxAdaptiveRetriesSetting).cursorType(CursorType.TailableAwait); this.fullDocument = notNull("fullDocument", fullDocument); this.fullDocumentBeforeChange = notNull("fullDocumentBeforeChange", fullDocumentBeforeChange); this.decoder = notNull("decoder", decoder); diff --git a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java index 4cfd0282c8e..ae9cd51b828 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/ClientBulkWriteOperation.java @@ -156,6 +156,8 @@ public final class ClientBulkWriteOperation implements WriteOperation retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryWritesSetting).includeWrite(), + new SpecRetryPolicy.IndividualPolicies(retryWritesSetting).includeWrite().includeOverload(maxAdaptiveRetriesSetting), operationContext); BatchEncoder batchEncoder = new BatchEncoder(); @@ -334,7 +338,7 @@ private void executeBatchAsync( assertFalse(unexecutedModels.isEmpty()); SessionContext sessionContext = operationContext.getSessionContext(); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryWritesSetting).includeWrite(), + new SpecRetryPolicy.IndividualPolicies(retryWritesSetting).includeWrite().includeOverload(maxAdaptiveRetriesSetting), operationContext); BatchEncoder batchEncoder = new BatchEncoder(); diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java index 6efe10b9e8c..f7d4c30b694 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java @@ -17,6 +17,7 @@ package com.mongodb.internal.operation; import com.mongodb.MongoClientException; +import com.mongodb.MongoClientSettings; import com.mongodb.MongoCommandException; import com.mongodb.MongoConnectionPoolClearedException; import com.mongodb.MongoException; @@ -42,6 +43,11 @@ @SuppressWarnings("overloads") public final class CommandOperationHelper { + /** + * The value used when {@link MongoClientSettings#getMaxAdaptiveRetries()} is {@code null}. + */ + public static final int DEFAULT_MAX_ADAPTIVE_RETRIES = 2; + static WriteConcern validateAndGetEffectiveWriteConcern(final WriteConcern writeConcernSetting, final SessionContext sessionContext) throws MongoClientException { boolean activeTransaction = sessionContext.hasActiveTransaction(); diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java index 6d51b13fd04..c593afbc60a 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CommandReadOperation.java @@ -68,14 +68,14 @@ public MongoNamespace getNamespace() { @Override public T execute(final ReadBinding binding, final OperationContext operationContext) { return executeRetryableRead(binding, operationContext, databaseName, commandCreator, decoder, - transformer(), false); + transformer(), false, null); } @Override public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback callback) { executeRetryableReadAsync(binding, operationContext, databaseName, commandCreator, decoder, - asyncTransformer(), false, callback); + asyncTransformer(), false, null, callback); } private static CommandReadTransformer transformer() { diff --git a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java index a7a60ba7206..e56f0e07a4f 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CommitTransactionOperation.java @@ -53,12 +53,8 @@ public class CommitTransactionOperation extends TransactionOperation { private final boolean alreadyCommitted; private BsonDocument recoveryToken; - public CommitTransactionOperation(final WriteConcern writeConcern) { - this(writeConcern, false); - } - - public CommitTransactionOperation(final WriteConcern writeConcern, final boolean alreadyCommitted) { - super(writeConcern); + public CommitTransactionOperation(final WriteConcern writeConcern, @Nullable final Integer maxAdaptiveRetriesSetting, final boolean alreadyCommitted) { + super(writeConcern, maxAdaptiveRetriesSetting); this.alreadyCommitted = alreadyCommitted; } diff --git a/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java index ed762dfbd29..435718c5801 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CountDocumentsOperation.java @@ -43,6 +43,8 @@ public class CountDocumentsOperation implements ReadOperationSimple { private static final Decoder DECODER = new BsonDocumentCodec(); private final MongoNamespace namespace; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private BsonDocument filter; private BsonValue hint; private BsonValue comment; @@ -50,8 +52,9 @@ public class CountDocumentsOperation implements ReadOperationSimple { private long limit; private Collation collation; - public CountDocumentsOperation(final MongoNamespace namespace) { + public CountDocumentsOperation(final MongoNamespace namespace, @Nullable final Integer maxAdaptiveRetriesSetting) { this.namespace = notNull("namespace", namespace); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } @Nullable @@ -157,7 +160,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext } private AggregateOperation getAggregateOperation() { - return new AggregateOperation<>(namespace, getPipeline(), DECODER) + return new AggregateOperation<>(namespace, getPipeline(), DECODER, maxAdaptiveRetriesSetting) .retryReads(retryReads) .collation(collation) .comment(comment) diff --git a/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java b/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java index 4bddd08edf4..09ba8d5a894 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/CountOperation.java @@ -47,14 +47,17 @@ public class CountOperation implements ReadOperationSimple { private static final Decoder DECODER = new BsonDocumentCodec(); private final MongoNamespace namespace; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private BsonDocument filter; private BsonValue hint; private long skip; private long limit; private Collation collation; - public CountOperation(final MongoNamespace namespace) { + public CountOperation(final MongoNamespace namespace, @Nullable final Integer maxAdaptiveRetriesSetting) { this.namespace = notNull("namespace", namespace); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } public BsonDocument getFilter() { @@ -124,13 +127,13 @@ public MongoNamespace getNamespace() { @Override public Long execute(final ReadBinding binding, final OperationContext operationContext) { return executeRetryableRead(binding, operationContext, namespace.getDatabaseName(), - getCommandCreator(), DECODER, transformer(), retryReads); + getCommandCreator(), DECODER, transformer(), retryReads, maxAdaptiveRetriesSetting); } @Override public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback callback) { executeRetryableReadAsync(binding, operationContext, namespace.getDatabaseName(), - getCommandCreator(), DECODER, asyncTransformer(), retryReads, callback); + getCommandCreator(), DECODER, asyncTransformer(), retryReads, maxAdaptiveRetriesSetting, callback); } private CommandReadTransformer transformer() { diff --git a/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java index 94d669c24f7..0196d32cd27 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/DistinctOperation.java @@ -53,15 +53,19 @@ public class DistinctOperation implements ReadOperationCursor { private final String fieldName; private final Decoder decoder; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private BsonDocument filter; private Collation collation; private BsonValue comment; private BsonValue hint; - public DistinctOperation(final MongoNamespace namespace, final String fieldName, final Decoder decoder) { + public DistinctOperation(final MongoNamespace namespace, final String fieldName, final Decoder decoder, + @Nullable final Integer maxAdaptiveRetriesSetting) { this.namespace = notNull("namespace", namespace); this.fieldName = notNull("fieldName", fieldName); this.decoder = notNull("decoder", decoder); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } public BsonDocument getFilter() { @@ -122,13 +126,14 @@ public MongoNamespace getNamespace() { @Override public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) { return executeRetryableRead(binding, operationContext, namespace.getDatabaseName(), getCommandCreator(), createCommandDecoder(), - singleBatchCursorTransformer(VALUES), retryReads); + singleBatchCursorTransformer(VALUES), retryReads, maxAdaptiveRetriesSetting); } @Override public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) { executeRetryableReadAsync(binding, operationContext, namespace.getDatabaseName(), - getCommandCreator(), createCommandDecoder(), asyncSingleBatchCursorTransformer(VALUES), retryReads, + getCommandCreator(), createCommandDecoder(), asyncSingleBatchCursorTransformer(VALUES), + retryReads, maxAdaptiveRetriesSetting, errorHandlingCallback(callback, LOGGER)); } diff --git a/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java index 3a6b0487fbe..af6b73e6da0 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java @@ -228,7 +228,7 @@ private BsonDocument getCollectionEncryptedFields(final BsonDocument defaultEncr } private ListCollectionsOperation listCollectionOperation() { - return new ListCollectionsOperation<>(namespace.getDatabaseName(), BSON_VALUE_CODEC) + return new ListCollectionsOperation<>(namespace.getDatabaseName(), BSON_VALUE_CODEC, null) .filter(new BsonDocument("name", new BsonString(namespace.getCollectionName()))) .batchSize(1); } diff --git a/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java b/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java index 3e8bc6a49e0..d44c2fa87c8 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/EstimatedDocumentCountOperation.java @@ -50,10 +50,13 @@ public class EstimatedDocumentCountOperation implements ReadOperationSimple DECODER = new BsonDocumentCodec(); private final MongoNamespace namespace; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private BsonValue comment; - public EstimatedDocumentCountOperation(final MongoNamespace namespace) { + public EstimatedDocumentCountOperation(final MongoNamespace namespace, @Nullable final Integer maxAdaptiveRetriesSetting) { this.namespace = notNull("namespace", namespace); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } public EstimatedDocumentCountOperation retryReads(final boolean retryReads) { @@ -86,7 +89,7 @@ public Long execute(final ReadBinding binding, final OperationContext operationC try { return executeRetryableRead(binding, operationContext, namespace.getDatabaseName(), getCommandCreator(), CommandResultDocumentCodec.create(DECODER, singletonList("firstBatch")), - transformer(), retryReads); + transformer(), retryReads, maxAdaptiveRetriesSetting); } catch (MongoCommandException e) { return assertNotNull(rethrowIfNotNamespaceError(e, 0L)); } @@ -96,7 +99,7 @@ public Long execute(final ReadBinding binding, final OperationContext operationC public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback callback) { executeRetryableReadAsync(binding, operationContext, namespace.getDatabaseName(), getCommandCreator(), CommandResultDocumentCodec.create(DECODER, singletonList("firstBatch")), - asyncTransformer(), retryReads, + asyncTransformer(), retryReads, maxAdaptiveRetriesSetting, (result, t) -> { if (isNamespaceError(t)) { callback.onResult(0L, null); diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindAndDeleteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindAndDeleteOperation.java index db9d61b1dd4..bd87b53c7c2 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/FindAndDeleteOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/FindAndDeleteOperation.java @@ -35,9 +35,11 @@ */ public class FindAndDeleteOperation extends BaseFindAndModifyOperation { - public FindAndDeleteOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final boolean retryWrites, + public FindAndDeleteOperation(final MongoNamespace namespace, final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, final Decoder decoder) { - super(namespace, writeConcern, retryWrites, decoder); + super(namespace, writeConcern, retryWrites, maxAdaptiveRetriesSetting, decoder); } @Override diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindAndReplaceOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindAndReplaceOperation.java index 7073260a4c7..d77fad067a5 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/FindAndReplaceOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/FindAndReplaceOperation.java @@ -45,9 +45,11 @@ public class FindAndReplaceOperation extends BaseFindAndModifyOperation { private boolean upsert; private Boolean bypassDocumentValidation; - public FindAndReplaceOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final boolean retryWrites, + public FindAndReplaceOperation(final MongoNamespace namespace, final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, final Decoder decoder, final BsonDocument replacement) { - super(namespace, writeConcern, retryWrites, decoder); + super(namespace, writeConcern, retryWrites, maxAdaptiveRetriesSetting, decoder); this.replacement = notNull("replacement", replacement); } diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindAndUpdateOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindAndUpdateOperation.java index e83deba30f3..8f46ce4d516 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/FindAndUpdateOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/FindAndUpdateOperation.java @@ -52,15 +52,20 @@ public class FindAndUpdateOperation extends BaseFindAndModifyOperation { private List arrayFilters; public FindAndUpdateOperation(final MongoNamespace namespace, - final WriteConcern writeConcern, final boolean retryWrites, final Decoder decoder, final BsonDocument update) { - super(namespace, writeConcern, retryWrites, decoder); + final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, + final Decoder decoder, final BsonDocument update) { + super(namespace, writeConcern, retryWrites, maxAdaptiveRetriesSetting, decoder); this.update = notNull("update", update); this.updatePipeline = null; } - public FindAndUpdateOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final boolean retryWrites, + public FindAndUpdateOperation(final MongoNamespace namespace, final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, final Decoder decoder, final List update) { - super(namespace, writeConcern, retryWrites, decoder); + super(namespace, writeConcern, retryWrites, maxAdaptiveRetriesSetting, decoder); this.updatePipeline = update; this.update = null; } diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java index bad874ac02c..1202e45a877 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/FindOperation.java @@ -73,6 +73,8 @@ public class FindOperation implements ReadOperationExplainable { private final MongoNamespace namespace; private final Decoder decoder; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private BsonDocument filter; private int batchSize; private int limit; @@ -93,9 +95,13 @@ public class FindOperation implements ReadOperationExplainable { private Boolean allowDiskUse; private TimeoutMode timeoutMode; - public FindOperation(final MongoNamespace namespace, final Decoder decoder) { + public FindOperation( + final MongoNamespace namespace, + final Decoder decoder, + @Nullable final Integer maxAdaptiveRetriesSetting) { this.namespace = notNull("namespace", namespace); this.decoder = notNull("decoder", decoder); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } @Override @@ -299,7 +305,7 @@ public BatchCursor execute(final ReadBinding binding, final OperationContext OperationContext findOperationContext = getFindOperationContext(operationContext); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(findOperationContext), + new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(findOperationContext).includeOverload(maxAdaptiveRetriesSetting), findOperationContext); Supplier> read = decorateWithRetries(retryControl, findOperationContext, () -> withSourceAndConnection(binding::getReadConnectionSource, false, findOperationContext, @@ -327,7 +333,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext OperationContext findOperationContext = getFindOperationContext(operationContext); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(findOperationContext), + new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(findOperationContext).includeOverload(maxAdaptiveRetriesSetting), findOperationContext); binding.retain(); AsyncCallbackSupplier> asyncRead = decorateWithRetriesAsync( diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java index e597e86a04e..c91a62bee55 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java @@ -76,6 +76,8 @@ public class ListCollectionsOperation implements ReadOperationCursor { private final String databaseName; private final Decoder decoder; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private BsonDocument filter; private int batchSize; private boolean nameOnly; @@ -83,9 +85,13 @@ public class ListCollectionsOperation implements ReadOperationCursor { private BsonValue comment; private TimeoutMode timeoutMode = TimeoutMode.CURSOR_LIFETIME; - public ListCollectionsOperation(final String databaseName, final Decoder decoder) { + public ListCollectionsOperation( + final String databaseName, + final Decoder decoder, + @Nullable final Integer maxAdaptiveRetriesSetting) { this.databaseName = notNull("databaseName", databaseName); this.decoder = notNull("decoder", decoder); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } @Override @@ -175,7 +181,7 @@ public BatchCursor execute(final ReadBinding binding, final OperationContext OperationContext listCollectionsOperationContext = applyTimeoutModeToOperationContext(timeoutMode, operationContext); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(listCollectionsOperationContext), + new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(listCollectionsOperationContext).includeOverload(maxAdaptiveRetriesSetting), listCollectionsOperationContext); Supplier> read = decorateWithRetries(retryControl, listCollectionsOperationContext, () -> withSourceAndConnection(binding::getReadConnectionSource, false, listCollectionsOperationContext, (source, connection, operationContextWithMinRTT) -> { @@ -197,7 +203,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext OperationContext listCollectionsOperationContext = applyTimeoutModeToOperationContext(timeoutMode, operationContext); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(listCollectionsOperationContext), + new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(listCollectionsOperationContext).includeOverload(maxAdaptiveRetriesSetting), listCollectionsOperationContext); binding.retain(); AsyncCallbackSupplier> asyncRead = decorateWithRetriesAsync( diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java index b3abbdbc85c..2e5206cf557 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/ListDatabasesOperation.java @@ -50,13 +50,16 @@ public class ListDatabasesOperation implements ReadOperationCursor { private static final String DATABASES = "databases"; private final Decoder decoder; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private BsonDocument filter; private Boolean nameOnly; private Boolean authorizedDatabasesOnly; private BsonValue comment; - public ListDatabasesOperation(final Decoder decoder) { + public ListDatabasesOperation(final Decoder decoder, @Nullable final Integer maxAdaptiveRetriesSetting) { this.decoder = notNull("decoder", decoder); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } public ListDatabasesOperation filter(@Nullable final BsonDocument filter) { @@ -119,14 +122,14 @@ public MongoNamespace getNamespace() { public BatchCursor execute(final ReadBinding binding, final OperationContext operationContext) { return executeRetryableRead(binding, operationContext, "admin", getCommandCreator(), CommandResultDocumentCodec.create(decoder, DATABASES), - singleBatchCursorTransformer(DATABASES), retryReads); + singleBatchCursorTransformer(DATABASES), retryReads, maxAdaptiveRetriesSetting); } @Override public void executeAsync(final AsyncReadBinding binding, final OperationContext operationContext, final SingleResultCallback> callback) { executeRetryableReadAsync(binding, operationContext, "admin", getCommandCreator(), CommandResultDocumentCodec.create(decoder, DATABASES), - asyncSingleBatchCursorTransformer(DATABASES), retryReads, errorHandlingCallback(callback, LOGGER)); + asyncSingleBatchCursorTransformer(DATABASES), retryReads, maxAdaptiveRetriesSetting, errorHandlingCallback(callback, LOGGER)); } private CommandCreator getCommandCreator() { diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java index c340c1c2f72..b1a03f93fed 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java @@ -69,13 +69,19 @@ public class ListIndexesOperation implements ReadOperationCursor { private final MongoNamespace namespace; private final Decoder decoder; private boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private int batchSize; private BsonValue comment; private TimeoutMode timeoutMode = TimeoutMode.CURSOR_LIFETIME; - public ListIndexesOperation(final MongoNamespace namespace, final Decoder decoder) { + public ListIndexesOperation( + final MongoNamespace namespace, + final Decoder decoder, + @Nullable final Integer maxAdaptiveRetriesSetting) { this.namespace = notNull("namespace", namespace); this.decoder = notNull("decoder", decoder); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } public Integer getBatchSize() { @@ -132,7 +138,7 @@ public BatchCursor execute(final ReadBinding binding, final OperationContext OperationContext listIndexesOperationContext = applyTimeoutModeToOperationContext(timeoutMode, operationContext); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(listIndexesOperationContext), + new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(listIndexesOperationContext).includeOverload(maxAdaptiveRetriesSetting), listIndexesOperationContext); Supplier> read = decorateWithRetries(retryControl, listIndexesOperationContext, () -> withSourceAndConnection(binding::getReadConnectionSource, false, listIndexesOperationContext, (source, connection, operationContextWithMinRTT) -> { @@ -153,7 +159,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext OperationContext listIndexesOperationContext = applyTimeoutModeToOperationContext(timeoutMode, operationContext); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(listIndexesOperationContext), + new SpecRetryPolicy.IndividualPolicies(retryReads).includeRead(listIndexesOperationContext).includeOverload(maxAdaptiveRetriesSetting), listIndexesOperationContext); binding.retain(); AsyncCallbackSupplier> asyncRead = decorateWithRetriesAsync( diff --git a/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java b/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java index 6d2e5278184..71ffdcfc3c8 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/ListSearchIndexesOperation.java @@ -59,11 +59,15 @@ public final class ListSearchIndexesOperation implements ReadOperationExplain @Nullable private final String indexName; private final boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; public ListSearchIndexesOperation(final MongoNamespace namespace, final Decoder decoder, @Nullable final String indexName, @Nullable final Integer batchSize, @Nullable final Collation collation, @Nullable final BsonValue comment, - @Nullable final Boolean allowDiskUse, final boolean retryReads) { + @Nullable final Boolean allowDiskUse, + final boolean retryReads, + @Nullable final Integer maxAdaptiveRetriesSetting) { this.namespace = namespace; this.decoder = decoder; this.allowDiskUse = allowDiskUse; @@ -72,6 +76,7 @@ public ListSearchIndexesOperation(final MongoNamespace namespace, final Decoder< this.comment = comment; this.indexName = indexName; this.retryReads = retryReads; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } @Override @@ -119,7 +124,7 @@ public ReadOperationSimple asExplainableOperation(@Nullable final Explain private AggregateOperation asAggregateOperation() { BsonDocument searchDefinition = getSearchDefinition(); BsonDocument listSearchIndexesStage = new BsonDocument(STAGE_LIST_SEARCH_INDEXES, searchDefinition); - return new AggregateOperation<>(namespace, singletonList(listSearchIndexesStage), decoder) + return new AggregateOperation<>(namespace, singletonList(listSearchIndexesStage), decoder, maxAdaptiveRetriesSetting) .retryReads(retryReads) .collation(collation) .comment(comment) diff --git a/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java index 6e2511beebc..b43a619b203 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java @@ -175,7 +175,7 @@ public String getCommandName() { public MapReduceBatchCursor execute(final ReadBinding binding, final OperationContext operationContext) { return executeRetryableRead(binding, operationContext, namespace.getDatabaseName(), getCommandCreator(), - CommandResultDocumentCodec.create(decoder, "results"), transformer(), false); + CommandResultDocumentCodec.create(decoder, "results"), transformer(), false, null); } @Override @@ -184,7 +184,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext SingleResultCallback> errHandlingCallback = errorHandlingCallback(callback, LOGGER); executeRetryableReadAsync(binding, operationContext, namespace.getDatabaseName(), getCommandCreator(), CommandResultDocumentCodec.create(decoder, "results"), - asyncTransformer(), false, errHandlingCallback); + asyncTransformer(), false, null, errHandlingCallback); } public ReadOperationSimple asExplainableOperation(final ExplainVerbosity explainVerbosity) { diff --git a/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java index 80ab345fec7..4c771b14cac 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java @@ -78,6 +78,8 @@ public class MixedBulkWriteOperation implements WriteOperation private final List writeRequests; private final boolean ordered; private final boolean retryWrites; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private final WriteConcern writeConcern; private Boolean bypassDocumentValidation; private String commandName; @@ -85,7 +87,9 @@ public class MixedBulkWriteOperation implements WriteOperation private BsonDocument variables; public MixedBulkWriteOperation(final MongoNamespace namespace, final List writeRequests, - final boolean ordered, final WriteConcern writeConcern, final boolean retryWrites) { + final boolean ordered, final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting) { notNull("writeRequests", writeRequests); isTrueArgument("writeRequests is not an empty list", !writeRequests.isEmpty()); this.commandName = notNull("commandName", writeRequests.get(0).getType().toString().toLowerCase(Locale.ROOT)); @@ -94,6 +98,7 @@ public MixedBulkWriteOperation(final MongoNamespace namespace, final List executeBatchReusingCon MutableValue batch = new MutableValue<>(maybeBatch); MutableValue sourceAndConnection = new MutableValue<>(maybeSourceAndConnection); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryWrites).includeWrite(), + new SpecRetryPolicy.IndividualPolicies(retryWrites).includeWrite().includeOverload(maxAdaptiveRetriesSetting), operationContext); Supplier> retryingBatchExecutor = decorateWithRetries( retryControl, @@ -291,7 +296,7 @@ private void executeBatchReusingConnectionAsync( MutableValue batch = new MutableValue<>(maybeBatch); MutableValue sourceAndConnection = new MutableValue<>(maybeSourceAndConnection); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryWrites).includeWrite(), + new SpecRetryPolicy.IndividualPolicies(retryWrites).includeWrite().includeOverload(maxAdaptiveRetriesSetting), operationContext); AsyncCallbackSupplier> retryingBatchExecutor = decorateWithRetriesAsync( retryControl, diff --git a/driver-core/src/main/com/mongodb/internal/operation/Operations.java b/driver-core/src/main/com/mongodb/internal/operation/Operations.java index da0661220da..0ff5b31422f 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/Operations.java +++ b/driver-core/src/main/com/mongodb/internal/operation/Operations.java @@ -105,23 +105,25 @@ public final class Operations { private final WriteConcern writeConcern; private final boolean retryWrites; private final boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private final TimeoutSettings timeoutSettings; public Operations(final Class documentClass, final ReadPreference readPreference, final CodecRegistry codecRegistry, - final boolean retryReads, final TimeoutSettings timeoutSettings) { + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { this(null, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, - true, retryReads, timeoutSettings); + true, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } public Operations(@Nullable final MongoNamespace namespace, final Class documentClass, final ReadPreference readPreference, - final CodecRegistry codecRegistry, final boolean retryReads, final TimeoutSettings timeoutSettings) { + final CodecRegistry codecRegistry, final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { this(namespace, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, - true, retryReads, timeoutSettings); + true, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } public Operations(@Nullable final MongoNamespace namespace, final Class documentClass, final ReadPreference readPreference, final CodecRegistry codecRegistry, final ReadConcern readConcern, final WriteConcern writeConcern, final boolean retryWrites, - final boolean retryReads, final TimeoutSettings timeoutSettings) { + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { this.namespace = namespace; this.documentClass = documentClass; this.readPreference = readPreference; @@ -129,6 +131,7 @@ public Operations(@Nullable final MongoNamespace namespace, final Class docum this.readConcern = readConcern; this.retryWrites = retryWrites; this.retryReads = retryReads; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; this.timeoutSettings = timeoutSettings; WriteConcern writeConcernToUse = writeConcern; @@ -225,7 +228,8 @@ public TimeoutSettings createTimeoutSettings(final DropIndexOptions options) { public ReadOperationSimple countDocuments(final Bson filter, final CountOptions options) { CountDocumentsOperation operation = new CountDocumentsOperation( - assertNotNull(namespace)) + assertNotNull(namespace), + maxAdaptiveRetriesSetting) .retryReads(retryReads) .filter(toBsonDocument(filter)) .skip(options.getSkip()) @@ -242,7 +246,7 @@ public ReadOperationSimple countDocuments(final Bson filter, final CountOp public ReadOperationSimple estimatedDocumentCount(final EstimatedDocumentCountOptions options) { return new EstimatedDocumentCountOperation( - assertNotNull(namespace)) + assertNotNull(namespace), maxAdaptiveRetriesSetting) .retryReads(retryReads) .comment(options.getComment()); } @@ -265,7 +269,8 @@ public ReadOperationExplainable find(final MongoNamespace findNamespace, private FindOperation createFindOperation(final MongoNamespace findNamespace, @Nullable final Bson filter, final Class resultClass, final FindOptions options) { FindOperation operation = new FindOperation<>( - findNamespace, codecRegistry.get(resultClass)) + findNamespace, codecRegistry.get(resultClass), + maxAdaptiveRetriesSetting) .retryReads(retryReads) .filter(filter == null ? new BsonDocument() : filter.toBsonDocument(documentClass, codecRegistry)) .batchSize(options.getBatchSize()) @@ -297,7 +302,7 @@ private FindOperation createFindOperation(final MongoNamespace findNamesp public ReadOperationCursor distinct(final String fieldName, @Nullable final Bson filter, final Class resultClass, final Collation collation, final BsonValue comment, @Nullable final Bson hint, @Nullable final String hintString) { DistinctOperation operation = new DistinctOperation<>(assertNotNull(namespace), - fieldName, codecRegistry.get(resultClass)) + fieldName, codecRegistry.get(resultClass), maxAdaptiveRetriesSetting) .retryReads(retryReads) .filter(filter == null ? null : filter.toBsonDocument(documentClass, codecRegistry)) .collation(collation) @@ -316,7 +321,8 @@ public ReadOperationExplainable aggregate(final List pipe final Collation collation, @Nullable final Bson hint, @Nullable final String hintString, final BsonValue comment, final Bson variables, final Boolean allowDiskUse, final AggregationLevel aggregationLevel) { return new AggregateOperation<>(assertNotNull(namespace), - assertNotNull(toBsonDocumentList(pipeline)), codecRegistry.get(resultClass), aggregationLevel) + assertNotNull(toBsonDocumentList(pipeline)), codecRegistry.get(resultClass), aggregationLevel, + maxAdaptiveRetriesSetting) .retryReads(retryReads) .allowDiskUse(allowDiskUse) .batchSize(batchSize) @@ -392,7 +398,7 @@ public ReadOperationMapReduceCursor mapReduce(final String mapFunction, public WriteOperation findOneAndDelete(final Bson filter, final FindOneAndDeleteOptions options) { return new FindAndDeleteOperation<>( - assertNotNull(namespace), writeConcern, retryWrites, getCodec()) + assertNotNull(namespace), writeConcern, retryWrites, maxAdaptiveRetriesSetting, getCodec()) .filter(toBsonDocument(filter)) .projection(toBsonDocument(options.getProjection())) .sort(toBsonDocument(options.getSort())) @@ -406,7 +412,7 @@ public WriteOperation findOneAndDelete(final Bson filter, final FindOneAndDel public WriteOperation findOneAndReplace(final Bson filter, final T replacement, final FindOneAndReplaceOptions options) { return new FindAndReplaceOperation<>( - assertNotNull(namespace), writeConcern, retryWrites, getCodec(), documentToBsonDocument(replacement)) + assertNotNull(namespace), writeConcern, retryWrites, maxAdaptiveRetriesSetting, getCodec(), documentToBsonDocument(replacement)) .filter(toBsonDocument(filter)) .projection(toBsonDocument(options.getProjection())) .sort(toBsonDocument(options.getSort())) @@ -422,7 +428,7 @@ public WriteOperation findOneAndReplace(final Bson filter, final T replacemen public WriteOperation findOneAndUpdate(final Bson filter, final Bson update, final FindOneAndUpdateOptions options) { return new FindAndUpdateOperation<>( - assertNotNull(namespace), writeConcern, retryWrites, getCodec(), assertNotNull(toBsonDocument(update))) + assertNotNull(namespace), writeConcern, retryWrites, maxAdaptiveRetriesSetting, getCodec(), assertNotNull(toBsonDocument(update))) .filter(toBsonDocument(filter)) .projection(toBsonDocument(options.getProjection())) .sort(toBsonDocument(options.getSort())) @@ -440,7 +446,7 @@ public WriteOperation findOneAndUpdate(final Bson filter, final Bson update, public WriteOperation findOneAndUpdate(final Bson filter, final List update, final FindOneAndUpdateOptions options) { return new FindAndUpdateOperation<>( - assertNotNull(namespace), writeConcern, retryWrites, getCodec(), assertNotNull(toBsonDocumentList(update))) + assertNotNull(namespace), writeConcern, retryWrites, maxAdaptiveRetriesSetting, getCodec(), assertNotNull(toBsonDocumentList(update))) .filter(toBsonDocument(filter)) .projection(toBsonDocument(options.getProjection())) .sort(toBsonDocument(options.getSort())) @@ -516,7 +522,7 @@ public WriteOperation insertMany(final List docume } return new MixedBulkWriteOperation(assertNotNull(namespace), - requests, options.isOrdered(), writeConcern, retryWrites) + requests, options.isOrdered(), writeConcern, retryWrites, maxAdaptiveRetriesSetting) .bypassDocumentValidation(options.getBypassDocumentValidation()) .comment(options.getComment()); } @@ -586,7 +592,7 @@ public WriteOperation bulkWrite(final List ReadOperationExplainable listSearchIndexes(final Class resultCl @Nullable final String indexName, @Nullable final Integer batchSize, @Nullable final Collation collation, @Nullable final BsonValue comment, @Nullable final Boolean allowDiskUse) { return new ListSearchIndexesOperation<>(assertNotNull(namespace), - codecRegistry.get(resultClass), indexName, batchSize, collation, comment, allowDiskUse, retryReads); + codecRegistry.get(resultClass), indexName, batchSize, collation, comment, allowDiskUse, retryReads, maxAdaptiveRetriesSetting); } public WriteOperation dropIndex(final String indexName, final DropIndexOptions ignoredOptions) { @@ -752,7 +758,7 @@ public WriteOperation dropIndex(final Bson keys, final DropIndexOptions ig public ReadOperationCursor listCollections(final String databaseName, final Class resultClass, final Bson filter, final boolean collectionNamesOnly, final boolean authorizedCollections, @Nullable final Integer batchSize, final BsonValue comment, @Nullable final TimeoutMode timeoutMode) { - return new ListCollectionsOperation<>(databaseName, codecRegistry.get(resultClass)) + return new ListCollectionsOperation<>(databaseName, codecRegistry.get(resultClass), maxAdaptiveRetriesSetting) .retryReads(retryReads) .filter(toBsonDocument(filter)) .nameOnly(collectionNamesOnly) @@ -765,7 +771,7 @@ public ReadOperationCursor listCollections(final String databaseName, fin public ReadOperationCursor listDatabases(final Class resultClass, final Bson filter, final Boolean nameOnly, final Boolean authorizedDatabasesOnly, final BsonValue comment) { - return new ListDatabasesOperation<>(codecRegistry.get(resultClass)) + return new ListDatabasesOperation<>(codecRegistry.get(resultClass), maxAdaptiveRetriesSetting) .retryReads(retryReads) .filter(toBsonDocument(filter)) .nameOnly(nameOnly) @@ -776,7 +782,8 @@ public ReadOperationCursor listDatabases(final Class resultClass, fina public ReadOperationCursor listIndexes(final Class resultClass, @Nullable final Integer batchSize, final BsonValue comment, @Nullable final TimeoutMode timeoutMode) { return new ListIndexesOperation<>(assertNotNull(namespace), - codecRegistry.get(resultClass)) + codecRegistry.get(resultClass), + maxAdaptiveRetriesSetting) .retryReads(retryReads) .batchSize(batchSize == null ? 0 : batchSize) .comment(comment) @@ -792,7 +799,8 @@ public ReadOperationCursor changeStream(final FullDocument fullDocument, assertNotNull(namespace), fullDocument, fullDocumentBeforeChange, - assertNotNull(toBsonDocumentList(pipeline)), decoder, changeStreamLevel) + assertNotNull(toBsonDocumentList(pipeline)), decoder, changeStreamLevel, + maxAdaptiveRetriesSetting) .batchSize(batchSize) .collation(collation) .comment(comment) @@ -806,7 +814,7 @@ public ReadOperationCursor changeStream(final FullDocument fullDocument, public WriteOperation clientBulkWriteOperation( final List clientWriteModels, @Nullable final ClientBulkWriteOptions options) { - return new ClientBulkWriteOperation(clientWriteModels, options, writeConcern, retryWrites, codecRegistry); + return new ClientBulkWriteOperation(clientWriteModels, options, writeConcern, retryWrites, maxAdaptiveRetriesSetting, codecRegistry); } private Codec getCodec() { diff --git a/driver-core/src/main/com/mongodb/internal/operation/SpecRetryPolicy.java b/driver-core/src/main/com/mongodb/internal/operation/SpecRetryPolicy.java index b339c3b39e7..49ec3a595e3 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/SpecRetryPolicy.java +++ b/driver-core/src/main/com/mongodb/internal/operation/SpecRetryPolicy.java @@ -29,6 +29,7 @@ import com.mongodb.internal.async.function.RetryPolicy.Decision.RetryAttemptInfo; import com.mongodb.internal.connection.OperationContext; import com.mongodb.internal.connection.OperationContext.ServerDeprioritization; +import com.mongodb.internal.time.ExponentialBackoff; import com.mongodb.lang.Nullable; import java.time.Duration; @@ -38,12 +39,15 @@ import java.util.Set; import java.util.function.Supplier; +import static com.mongodb.MongoException.RETRYABLE_ERROR_LABEL; +import static com.mongodb.MongoException.SYSTEM_OVERLOADED_ERROR_LABEL; import static com.mongodb.assertions.Assertions.assertFalse; import static com.mongodb.assertions.Assertions.assertNotNull; import static com.mongodb.assertions.Assertions.assertNull; import static com.mongodb.assertions.Assertions.assertTrue; import static com.mongodb.assertions.Assertions.fail; import static com.mongodb.internal.TimeoutContext.createMongoTimeoutException; +import static com.mongodb.internal.operation.CommandOperationHelper.DEFAULT_MAX_ADAPTIVE_RETRIES; import static com.mongodb.internal.operation.CommandOperationHelper.NO_WRITES_PERFORMED_ERROR_LABEL; import static com.mongodb.internal.operation.CommandOperationHelper.RETRYABLE_WRITE_ERROR_LABEL; import static com.mongodb.internal.operation.CommandOperationHelper.addRetryableWriteErrorLabelIfNeeded; @@ -61,7 +65,7 @@ final class SpecRetryPolicy implements RetryPolicy { private static final int INFINITE_ATTEMPTS = Integer.MAX_VALUE; private final IndividualPolicies policies; - private final int maxAttempts; + private int maxAttempts; private final ServerDeprioritization serverDeprioritization; private Supplier commandDescriptionSupplier; @@ -132,6 +136,8 @@ public Decision onAttemptFailure(final RetryContext retryContext, final Throwabl decideRetryableAndAddRetryableWriteErrorLabelIfNeeded(state, attemptFailedResult)).orElse(false); retryableError |= policies.read().map(state -> decideRetryable(state, attemptFailedResult)).orElse(false); + retryableError |= policies.overload().map(state -> + decideRetryableAndUpdateMaxAttempts(state, attemptFailedResult)).orElse(false); boolean maxAttemptsReached = attempt >= maxAttempts - 1; if (policies.isRetrySettingEffectivelyTrue() && !retryableError) { logUnableToRetryError(attemptFailedResult); @@ -139,7 +145,7 @@ public Decision onAttemptFailure(final RetryContext retryContext, final Throwabl boolean retry = retryableError && !maxAttemptsReached; Decision decision = new Decision( decideProspectiveFailedResult(retryContext.getProspectiveFailedResult().orElse(null), maybeInternalAttemptFailedResult), - retry ? new RetryAttemptInfo(Duration.ZERO) : null); + retry ? new RetryAttemptInfo(calculateOverloadBackoff(attemptFailedResult, attempt + 1)) : null); policies.write().ifPresent(IndividualPolicies.State.Write::resetRequirementsInfo); return decision; } @@ -195,6 +201,26 @@ private static boolean decideRetryable(final IndividualPolicies.State.Read state return isRetryableMongoSecurityException(mongoException) || isRetryableException(mongoException); } + /** + * Returns {@code true} iff another attempt must be executed provided that {@link #maxAttempts} has not been reached. + */ + private boolean decideRetryableAndUpdateMaxAttempts(final IndividualPolicies.State.Overload state, final Throwable exception) { + boolean hasRetryableErrorLabel; + boolean hasSystemOverloadErrorLabel; + if (exception instanceof MongoException) { + MongoException mongoException = (MongoException) exception; + hasRetryableErrorLabel = mongoException.hasErrorLabel(RETRYABLE_ERROR_LABEL); + hasSystemOverloadErrorLabel = mongoException.hasErrorLabel(SYSTEM_OVERLOADED_ERROR_LABEL); + } else { + hasRetryableErrorLabel = false; + hasSystemOverloadErrorLabel = false; + } + if (hasSystemOverloadErrorLabel && policies.isRetrySettingEffectivelyTrue()) { + maxAttempts = state.getMaxAttempts(); + } + return state.isRequirementsMet() && hasRetryableErrorLabel && hasSystemOverloadErrorLabel; + } + private void logUnableToRetryError(final Throwable exception) { assertFalse(exception instanceof OperationHelper.ResourceSupplierInternalException); if (LOGGER.isDebugEnabled()) { @@ -246,6 +272,15 @@ private static Throwable decideReadProspectiveFailedResult( } } + private static Duration calculateOverloadBackoff(final Throwable attemptFailedResult, final int immediateNextAttempt) { + assertFalse(attemptFailedResult instanceof OperationHelper.ResourceSupplierInternalException); + if (attemptFailedResult instanceof MongoException + && ((MongoException) attemptFailedResult).hasErrorLabel(SYSTEM_OVERLOADED_ERROR_LABEL)) { + return ExponentialBackoff.calculateOverloadBackoff(immediateNextAttempt); + } + return Duration.ZERO; + } + private static int maxAttempts(final int maxRetries) { assertTrue(maxRetries < INFINITE_ATTEMPTS - 1); return maxRetries + 1; @@ -271,6 +306,7 @@ static final class IndividualPolicies { CONFLICTS = new EnumMap<>(Descriptor.class); CONFLICTS.put(Descriptor.WRITE, EnumSet.of(Descriptor.READ)); CONFLICTS.put(Descriptor.READ, EnumSet.of(Descriptor.WRITE)); + CONFLICTS.put(Descriptor.OVERLOAD, EnumSet.noneOf(Descriptor.class)); assertTrue(CONFLICTS.keySet().containsAll(asList(Descriptor.values()))); } @@ -322,6 +358,16 @@ IndividualPolicies includeRead(final OperationContext operationContext) { return this; } + /** + * See + * Client Backpressure, + * which specifies the overload retry policy. + */ + IndividualPolicies includeOverload(@Nullable final Integer maxAdaptiveRetriesSetting) { + include(Descriptor.OVERLOAD, new State.Overload(effectiveRetrySetting, maxAdaptiveRetriesSetting)); + return this; + } + private void include(final Descriptor descriptor, final State state) { State previous = policies.put(descriptor, state); assertNull(previous); @@ -333,6 +379,8 @@ private int getMaxAttempts() { maxRetries = Descriptor.WRITE.maxRetries; } else if (policies.containsKey(Descriptor.READ)) { maxRetries = Descriptor.READ.maxRetries; + } else if (policies.containsKey(Descriptor.OVERLOAD)) { + maxRetries = overload().map(State.Overload::getMaxAttempts).orElse(Descriptor.OVERLOAD.maxRetries); } else { throw fail(toString()); } @@ -347,6 +395,10 @@ private Optional read() { return Optional.ofNullable((State.Read) policies.get(Descriptor.READ)); } + private Optional overload() { + return Optional.ofNullable((State.Overload) policies.get(Descriptor.OVERLOAD)); + } + @Override public String toString() { return "IndividualPolicies{" @@ -363,7 +415,11 @@ private enum Descriptor { /** * See {@link #includeRead(OperationContext)}. */ - READ(1); + READ(1), + /** + * See {@link #includeOverload(Integer)}. + */ + OVERLOAD(DEFAULT_MAX_ADAPTIVE_RETRIES); private final int maxRetries; @@ -462,6 +518,41 @@ public String toString() { + '}'; } } + + static final class Overload extends State { + private final boolean requirementsMet; + @Nullable + private final Integer maxAdaptiveRetriesSetting; + + Overload( + final boolean effectiveRetrySetting, + @Nullable + final Integer maxAdaptiveRetriesSetting) { + requirementsMet = effectiveRetrySetting; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; + } + + int getMaxAttempts() { + return maxAttempts(maxAdaptiveRetriesSetting == null + ? IndividualPolicies.Descriptor.OVERLOAD.maxRetries + : maxAdaptiveRetriesSetting); + } + + /** + * See {@link Read#isRequirementsMet()}. + */ + boolean isRequirementsMet() { + return requirementsMet; + } + + @Override + public String toString() { + return "Overload{" + + "requirementsMet=" + requirementsMet + + ", maxAdaptiveRetriesSetting=" + maxAdaptiveRetriesSetting + + '}'; + } + } } } diff --git a/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java index 8fa8b0db1de..32476ede201 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java +++ b/driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java @@ -187,9 +187,10 @@ static T executeRetryableRead( final CommandCreator commandCreator, final Decoder decoder, final CommandReadTransformer transformer, - final boolean retryReadsSetting) { + final boolean retryReadsSetting, + @Nullable final Integer maxAdaptiveRetriesSetting) { return executeRetryableRead(operationContext, binding::getReadConnectionSource, database, commandCreator, - decoder, transformer, retryReadsSetting); + decoder, transformer, retryReadsSetting, maxAdaptiveRetriesSetting); } static T executeRetryableRead( @@ -199,9 +200,11 @@ static T executeRetryableRead( final CommandCreator commandCreator, final Decoder decoder, final CommandReadTransformer transformer, - final boolean retryReadsSetting) { + final boolean retryReadsSetting, + @Nullable + final Integer maxAdaptiveRetriesSetting) { RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(retryReadsSetting).includeRead(operationContext), + new SpecRetryPolicy.IndividualPolicies(retryReadsSetting).includeRead(operationContext).includeOverload(maxAdaptiveRetriesSetting), operationContext); Supplier read = decorateWithRetries(retryControl, operationContext, () -> @@ -262,10 +265,11 @@ static R executeRetryableWrite( final CommandCreator commandCreator, final CommandWriteTransformer transformer, final com.mongodb.Function retryCommandModifier, - final boolean effectiveRetryWritesSetting) { + final boolean effectiveRetryWritesSetting, + @Nullable final Integer maxAdaptiveRetriesSetting) { MutableValue command = new MutableValue<>(); RetryControl retryControl = createSpecRetryControl( - new SpecRetryPolicy.IndividualPolicies(effectiveRetryWritesSetting).includeWrite(), + new SpecRetryPolicy.IndividualPolicies(effectiveRetryWritesSetting).includeWrite().includeOverload(maxAdaptiveRetriesSetting), operationContext); Supplier retryingWrite = decorateWithRetries(retryControl, operationContext, () -> { boolean firstAttempt = retryControl.isFirstAttempt(); diff --git a/driver-core/src/main/com/mongodb/internal/operation/TransactionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/TransactionOperation.java index 6ee79ab6a17..6d8a254cb28 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/TransactionOperation.java +++ b/driver-core/src/main/com/mongodb/internal/operation/TransactionOperation.java @@ -24,6 +24,7 @@ import com.mongodb.internal.binding.WriteBinding; import com.mongodb.internal.connection.OperationContext; import com.mongodb.internal.validator.NoOpFieldNameValidator; +import com.mongodb.lang.Nullable; import org.bson.BsonDocument; import org.bson.BsonInt32; import org.bson.codecs.BsonDocumentCodec; @@ -45,9 +46,12 @@ */ public abstract class TransactionOperation implements WriteOperation { private final WriteConcern writeConcern; + @Nullable + private final Integer maxAdaptiveRetriesSetting; - TransactionOperation(final WriteConcern writeConcern) { + TransactionOperation(final WriteConcern writeConcern, @Nullable final Integer maxAdaptiveRetriesSetting) { this.writeConcern = notNull("writeConcern", writeConcern); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } public WriteConcern getWriteConcern() { @@ -60,7 +64,7 @@ public Void execute(final WriteBinding binding, final OperationContext operation TimeoutContext timeoutContext = operationContext.getTimeoutContext(); return executeRetryableWrite(binding, operationContext, "admin", null, NoOpFieldNameValidator.INSTANCE, new BsonDocumentCodec(), getCommandCreator(), - writeConcernErrorTransformer(timeoutContext), getRetryCommandModifier(timeoutContext), true); + writeConcernErrorTransformer(timeoutContext), getRetryCommandModifier(timeoutContext), true, maxAdaptiveRetriesSetting); } @Override @@ -70,7 +74,7 @@ public void executeAsync(final AsyncWriteBinding binding, final OperationContext executeRetryableWriteAsync(binding, operationContext, "admin", null, NoOpFieldNameValidator.INSTANCE, new BsonDocumentCodec(), getCommandCreator(), writeConcernErrorTransformerAsync(timeoutContext), getRetryCommandModifier(timeoutContext), - true, + true, maxAdaptiveRetriesSetting, errorHandlingCallback(callback, LOGGER)); } diff --git a/driver-core/src/main/com/mongodb/internal/time/ExponentialBackoff.java b/driver-core/src/main/com/mongodb/internal/time/ExponentialBackoff.java index db5d2efa996..11ea3c52e27 100644 --- a/driver-core/src/main/com/mongodb/internal/time/ExponentialBackoff.java +++ b/driver-core/src/main/com/mongodb/internal/time/ExponentialBackoff.java @@ -17,7 +17,9 @@ package com.mongodb.internal.time; import com.mongodb.internal.VisibleForTesting; +import com.mongodb.internal.async.function.RetryControl; +import java.time.Duration; import java.util.concurrent.ThreadLocalRandom; import java.util.function.DoubleSupplier; @@ -29,10 +31,8 @@ */ public final class ExponentialBackoff { - private static final double TRANSACTION_BASE_MS = 5.0; @VisibleForTesting(otherwise = PRIVATE) static final double TRANSACTION_MAX_MS = 500.0; - private static final double TRANSACTION_GROWTH = 1.5; // TODO-JAVA-6079 private static DoubleSupplier testJitterSupplier = null; @@ -43,17 +43,38 @@ private ExponentialBackoff() { /** * Calculate the backoff in milliseconds for transaction retries. * - * @param attemptNumber attempt number > 0 + * @param attemptNumber A positive 0-based attempt number. That is, the attempt must be a retry attempt. * @return The calculated backoff in milliseconds. + * + * @see RetryControl#attempt() */ public static long calculateTransactionBackoffMs(final int attemptNumber) { - assertTrue(attemptNumber > 0, "Attempt number must be at least 1 (1-based) in the context of transaction backoff calculation"); + return calculateBackoffMs(5.0, TRANSACTION_MAX_MS, 1.5, attemptNumber); + } + + /** + * Calculate the backoff for command retries caused by + * {@linkplain com.mongodb.MongoException#SYSTEM_OVERLOADED_ERROR_LABEL overload}. + * See {@link #calculateTransactionBackoffMs(int)} for more details. + */ + public static Duration calculateOverloadBackoff(final int attemptNumber) { + return Duration.ofMillis(calculateBackoffMs(100, 10000, 2, attemptNumber)); + } + + /** + * Calculate the backoff in milliseconds for transaction retries. + * + * @param attemptNumber attempt number > 0 + * @return The calculated backoff in milliseconds. + */ + public static long calculateBackoffMs(final double baseMs, final double maxMs, final double growth, final int attemptNumber) { + assertTrue(attemptNumber > 0, String.valueOf(attemptNumber)); double jitter = testJitterSupplier != null ? testJitterSupplier.getAsDouble() : ThreadLocalRandom.current().nextDouble(); return Math.round(jitter * Math.min( - TRANSACTION_BASE_MS * Math.pow(TRANSACTION_GROWTH, attemptNumber - 1), - TRANSACTION_MAX_MS)); + baseMs * Math.pow(growth, attemptNumber - 1), + maxMs)); } /** diff --git a/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy index 906f2e3ff68..5a8d65d51ad 100644 --- a/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy @@ -108,13 +108,13 @@ class OperationFunctionalSpecification extends Specification { void acknowledgeWrite(final SingleConnectionBinding binding) { new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument())], true, - ACKNOWLEDGED, false).execute(binding, createOperationContext()) + ACKNOWLEDGED, false, null).execute(binding, createOperationContext()) binding.release() } void acknowledgeWrite(final AsyncSingleConnectionBinding binding) { executeAsync(new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument())], - true, ACKNOWLEDGED, false), binding) + true, ACKNOWLEDGED, false, null), binding) binding.release() } diff --git a/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java b/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java index e6c28d9d5bc..a54ed99b5db 100644 --- a/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java +++ b/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java @@ -286,7 +286,8 @@ public void insertDocuments(final List documents, final WriteConce for (BsonDocument document : documents) { insertRequests.add(new InsertRequest(document)); } - new MixedBulkWriteOperation(namespace, insertRequests, true, writeConcern, false).execute(binding, ClusterFixture.createOperationContext()); + new MixedBulkWriteOperation(namespace, insertRequests, true, writeConcern, false, null).execute( + binding, ClusterFixture.createOperationContext()); } public void insertDocuments(final Document... documents) { @@ -328,7 +329,7 @@ public List find() { public Optional listSearchIndex(final String indexName) { ListSearchIndexesOperation listSearchIndexesOperation = - new ListSearchIndexesOperation<>(namespace, codec, indexName, null, null, null, null, true); + new ListSearchIndexesOperation<>(namespace, codec, indexName, null, null, null, null, true, null); BatchCursor cursor = listSearchIndexesOperation.execute(getBinding(), ClusterFixture.createOperationContext()); List results = new ArrayList<>(); @@ -346,7 +347,8 @@ public void createSearchIndex(final SearchIndexRequest searchIndexModel) { } public List find(final Codec codec) { - BatchCursor cursor = new FindOperation<>(namespace, codec) + BatchCursor cursor = new FindOperation<>(namespace, codec, + null) .sort(new BsonDocument("_id", new BsonInt32(1))) .execute(getBinding(), ClusterFixture.createOperationContext()); List results = new ArrayList<>(); @@ -366,7 +368,7 @@ public void updateOne(final Bson filter, final Bson update, final boolean isUpse update.toBsonDocument(Document.class, registry), WriteRequest.Type.UPDATE) .upsert(isUpsert)), - true, WriteConcern.ACKNOWLEDGED, false) + true, WriteConcern.ACKNOWLEDGED, false, null) .execute(getBinding(), ClusterFixture.createOperationContext()); } @@ -376,7 +378,7 @@ public void replaceOne(final Bson filter, final Bson update, final boolean isUps update.toBsonDocument(Document.class, registry), WriteRequest.Type.REPLACE) .upsert(isUpsert)), - true, WriteConcern.ACKNOWLEDGED, false) + true, WriteConcern.ACKNOWLEDGED, false, null) .execute(getBinding(), ClusterFixture.createOperationContext()); } @@ -391,7 +393,7 @@ public void deleteMany(final Bson filter) { private void delete(final Bson filter, final boolean multi) { new MixedBulkWriteOperation(namespace, singletonList(new DeleteRequest(filter.toBsonDocument(Document.class, registry)).multi(multi)), - true, WriteConcern.ACKNOWLEDGED, false) + true, WriteConcern.ACKNOWLEDGED, false, null) .execute(getBinding(), ClusterFixture.createOperationContext()); } @@ -416,7 +418,7 @@ private List aggregate(final List pipeline, final Decoder decode for (Bson cur : pipeline) { bsonDocumentPipeline.add(cur.toBsonDocument(Document.class, registry)); } - BatchCursor cursor = new AggregateOperation<>(namespace, bsonDocumentPipeline, decoder, level) + BatchCursor cursor = new AggregateOperation<>(namespace, bsonDocumentPipeline, decoder, level, null) .execute(getBinding(), ClusterFixture.createOperationContext()); List results = new ArrayList<>(); while (cursor.hasNext()) { @@ -451,7 +453,7 @@ public List find(final BsonDocument filter, final BsonDocument sort, fina } public List find(final BsonDocument filter, final BsonDocument sort, final BsonDocument projection, final Decoder decoder) { - BatchCursor cursor = new FindOperation<>(namespace, decoder).filter(filter).sort(sort) + BatchCursor cursor = new FindOperation<>(namespace, decoder, null).filter(filter).sort(sort) .projection(projection).execute(getBinding(), ClusterFixture.createOperationContext()); List results = new ArrayList<>(); while (cursor.hasNext()) { @@ -465,15 +467,15 @@ public long count() { } public long count(final ReadBinding binding) { - return new CountDocumentsOperation(namespace).execute(binding, ClusterFixture.createOperationContext()); + return new CountDocumentsOperation(namespace, null).execute(binding, ClusterFixture.createOperationContext()); } public long count(final AsyncReadWriteBinding binding) throws Throwable { - return executeAsync(new CountDocumentsOperation(namespace), binding); + return executeAsync(new CountDocumentsOperation(namespace, null), binding); } public long count(final Bson filter) { - return new CountDocumentsOperation(namespace) + return new CountDocumentsOperation(namespace, null) .filter(toBsonDocument(filter)).execute(getBinding(), ClusterFixture.createOperationContext()); } @@ -515,7 +517,7 @@ public void createIndex(final Bson key) { public List listIndexes(){ List indexes = new ArrayList<>(); - BatchCursor cursor = new ListIndexesOperation<>(namespace, new BsonDocumentCodec()) + BatchCursor cursor = new ListIndexesOperation<>(namespace, new BsonDocumentCodec(), null) .execute(getBinding(), ClusterFixture.createOperationContext()); while (cursor.hasNext()) { indexes.addAll(cursor.next()); diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AbortTransactionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/AbortTransactionOperationSpecification.groovy index fe7cd511c0c..28846f61a5d 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/AbortTransactionOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AbortTransactionOperationSpecification.groovy @@ -33,13 +33,13 @@ class AbortTransactionOperationSpecification extends OperationFunctionalSpecific def expectedCommand = BsonDocument.parse('{abortTransaction: 1}') when: - def operation = new AbortTransactionOperation(ACKNOWLEDGED) + def operation = new AbortTransactionOperation(ACKNOWLEDGED, null) then: testOperationInTransaction(operation, [4, 0, 0], expectedCommand, async, cannedResult) when: - operation = new AbortTransactionOperation(MAJORITY) + operation = new AbortTransactionOperation(MAJORITY, null) expectedCommand.put('writeConcern', MAJORITY.asDocument()) then: @@ -56,14 +56,14 @@ class AbortTransactionOperationSpecification extends OperationFunctionalSpecific when: def writeConcern = MAJORITY.withWTimeout(10, TimeUnit.MILLISECONDS) - def operation = new AbortTransactionOperation(writeConcern) + def operation = new AbortTransactionOperation(writeConcern, null) then: testOperationRetries(operation, [4, 0, 0], expectedCommand, async, cannedResult, true) when: writeConcern = MAJORITY - operation = new AbortTransactionOperation(writeConcern) + operation = new AbortTransactionOperation(writeConcern, null) expectedCommand.put('writeConcern', writeConcern.asDocument()) then: @@ -71,7 +71,7 @@ class AbortTransactionOperationSpecification extends OperationFunctionalSpecific when: writeConcern = ACKNOWLEDGED - operation = new AbortTransactionOperation(writeConcern) + operation = new AbortTransactionOperation(writeConcern, null) expectedCommand.remove('writeConcern') then: diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy index a39b7ca6448..9e8d6a8277e 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy @@ -78,7 +78,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should have the correct defaults'() { when: - AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) then: operation.getAllowDiskUse() == null @@ -92,7 +92,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def hint = BsonDocument.parse('{a: 1}') when: - AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) .allowDiskUse(true) .batchSize(10) .collation(defaultCollation) @@ -108,7 +108,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should throw when using invalid hint'() { given: def hint = new BsonString('ok') - def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()).hint(hint) + def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null).hint(hint) when: operation.getHint() @@ -132,7 +132,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should create the expected command'() { when: def pipeline = [new BsonDocument('$match', new BsonDocument('a', new BsonString('A')))] - def operation = new AggregateOperation(helper.namespace, pipeline, new DocumentCodec()) + def operation = new AggregateOperation(helper.namespace, pipeline, new DocumentCodec(), null) def expectedCommand = new BsonDocument('aggregate', new BsonString(helper.namespace.getCollectionName())) .append('pipeline', new BsonArray(pipeline)) @@ -142,7 +142,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { testOperation(operation, [3, 4, 0], expectedCommand, async, helper.cursorResult) when: - operation = new AggregateOperation(helper.namespace, pipeline, new DocumentCodec()) + operation = new AggregateOperation(helper.namespace, pipeline, new DocumentCodec(), null) .allowDiskUse(true) .batchSize(10) .collation(defaultCollation) @@ -165,7 +165,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def document = BsonDocument.parse('{_id: 1, str: "foo"}') getCollectionHelper().insertDocuments(document) def pipeline = [BsonDocument.parse('{$match: {str: "FOO"}}')] - def operation = new AggregateOperation(namespace, pipeline, new BsonDocumentCodec()) + def operation = new AggregateOperation(namespace, pipeline, new BsonDocumentCodec(), null) .collation(caseInsensitiveCollation) when: @@ -183,7 +183,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { given: def expected = [createExpectedChangeNotification(namespace, 0), createExpectedChangeNotification(namespace, 1)] def pipeline = ['{$changeStream: {}}', '{$project: {"_id.clusterTime": 0, "_id.uuid": 0}}'].collect { BsonDocument.parse(it) } - def operation = new AggregateOperation(namespace, pipeline, new BsonDocumentCodec()) + def operation = new AggregateOperation(namespace, pipeline, new BsonDocumentCodec(), null) def helper = getCollectionHelper() when: @@ -211,7 +211,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should be able to aggregate'() { when: - AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) def batchCursor = execute(operation, async) def results = collectCursorResults(batchCursor)*.getString('name') @@ -234,7 +234,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { .execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) when: - AggregateOperation operation = new AggregateOperation(viewNamespace, [], new DocumentCodec()) + AggregateOperation operation = new AggregateOperation(viewNamespace, [], new DocumentCodec(), null) def batchCursor = execute(operation, async) def results = collectCursorResults(batchCursor)*.getString('name') @@ -254,7 +254,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should be able to aggregate with pipeline'() { when: AggregateOperation operation = new AggregateOperation(getNamespace(), - [new BsonDocument('$match', new BsonDocument('job', new BsonString('plumber')))], new DocumentCodec()) + [new BsonDocument('$match', new BsonDocument('job', new BsonString('plumber')))], new DocumentCodec(), null) def batchCursor = execute(operation, async) def results = collectCursorResults(batchCursor)*.getString('name') @@ -268,7 +268,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should allow disk usage'() { when: - AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) .allowDiskUse(allowDiskUse) def binding = ClusterFixture.getBinding() @@ -283,7 +283,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should allow batch size'() { when: - AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + AggregateOperation operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) .batchSize(batchSize) def binding = ClusterFixture.getBinding() @@ -298,7 +298,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should be able to explain an empty pipeline'() { given: - def operation = new AggregateOperation(getNamespace(), [], new BsonDocumentCodec()) + def operation = new AggregateOperation(getNamespace(), [], new BsonDocumentCodec(), null) operation = async ? operation.asExplainableOperation(QUERY_PLANNER, new BsonDocumentCodec()) : operation.asExplainableOperation(QUERY_PLANNER, new BsonDocumentCodec()) @@ -315,7 +315,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should be able to aggregate with collation'() { when: AggregateOperation operation = new AggregateOperation(getNamespace(), - [BsonDocument.parse('{$match: {job : "plumber"}}')], new DocumentCodec() + [BsonDocument.parse('{$match: {job : "plumber"}}')], new DocumentCodec(), null ).collation(options) def batchCursor = execute(operation, async) def results = collectCursorResults(batchCursor)*.getString('name') @@ -334,7 +334,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def index = new BsonDocument('a', new BsonInt32(1)) collectionHelper.createIndex(index) - def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) .hint(hint) when: @@ -357,7 +357,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)), new BsonDocumentCodec()).execute(binding, createOperationContext(binding.getReadPreference())) def expectedComment = 'this is a comment' - def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) .comment(new BsonString(expectedComment)) when: @@ -393,7 +393,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { .append('cursor', new BsonDocument()) appendReadConcernToCommand(operationContext.getSessionContext(), UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) when: operation.execute(binding, operationContext) @@ -434,7 +434,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { .append('cursor', new BsonDocument()) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec()) + def operation = new AggregateOperation(getNamespace(), [], new DocumentCodec(), null) when: executeAsync(operation, binding, operationContext) @@ -462,7 +462,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification { def 'should use the ReadBindings readPreference to set secondaryOk'() { when: - def operation = new AggregateOperation(helper.namespace, [], new BsonDocumentCodec()) + def operation = new AggregateOperation(helper.namespace, [], new BsonDocumentCodec(), null) then: testOperationSecondaryOk(operation, [2, 6, 0], readPreference, async, helper.cursorResult) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/ChangeStreamOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/ChangeStreamOperationSpecification.groovy index f2374e92160..fc2431f03f3 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/ChangeStreamOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/ChangeStreamOperationSpecification.groovy @@ -112,7 +112,7 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio .append('firstBatch', new BsonArrayWrapper([]))) def operation = new ChangeStreamOperation(namespace, FullDocument.DEFAULT, - FullDocumentBeforeChange.DEFAULT, pipeline, new DocumentCodec(), changeStreamLevel as ChangeStreamLevel) + FullDocumentBeforeChange.DEFAULT, pipeline, new DocumentCodec(), changeStreamLevel as ChangeStreamLevel, null) .batchSize(5) .collation(defaultCollation) .startAtOperationTime(new BsonTimestamp()) @@ -359,7 +359,7 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio def operation = new ChangeStreamOperation(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, FullDocumentBeforeChange.DEFAULT, pipeline, createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())), - ChangeStreamLevel.DATABASE) + ChangeStreamLevel.DATABASE, null) helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }')) when: diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CommitTransactionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CommitTransactionOperationSpecification.groovy index 0d91963d5bf..69c257462d1 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/CommitTransactionOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CommitTransactionOperationSpecification.groovy @@ -33,13 +33,13 @@ class CommitTransactionOperationSpecification extends OperationFunctionalSpecifi def expectedCommand = BsonDocument.parse('{commitTransaction: 1}') when: - def operation = new CommitTransactionOperation(ACKNOWLEDGED) + def operation = new CommitTransactionOperation(ACKNOWLEDGED, null, false) then: testOperationInTransaction(operation, [4, 0, 0], expectedCommand, async, cannedResult) when: - operation = new CommitTransactionOperation(MAJORITY) + operation = new CommitTransactionOperation(MAJORITY, null, false) expectedCommand.put('writeConcern', MAJORITY.asDocument()) then: @@ -56,14 +56,14 @@ class CommitTransactionOperationSpecification extends OperationFunctionalSpecifi when: def writeConcern = MAJORITY.withWTimeout(10, TimeUnit.MILLISECONDS) - def operation = new CommitTransactionOperation(writeConcern) + def operation = new CommitTransactionOperation(writeConcern, null, false) then: testOperationRetries(operation, [4, 0, 0], expectedCommand, async, cannedResult, true) when: writeConcern = MAJORITY - operation = new CommitTransactionOperation(writeConcern) + operation = new CommitTransactionOperation(writeConcern, null, false) expectedCommand.put('writeConcern', writeConcern.withWTimeout(10000, TimeUnit.MILLISECONDS).asDocument()) then: @@ -71,7 +71,7 @@ class CommitTransactionOperationSpecification extends OperationFunctionalSpecifi when: writeConcern = ACKNOWLEDGED - operation = new CommitTransactionOperation(writeConcern) + operation = new CommitTransactionOperation(writeConcern, null, false) expectedCommand.put('writeConcern', writeConcern.withW('majority').withWTimeout(10000, TimeUnit.MILLISECONDS).asDocument()) then: @@ -87,7 +87,7 @@ class CommitTransactionOperationSpecification extends OperationFunctionalSpecifi def expectedCommand = BsonDocument.parse('{commitTransaction: 1, writeConcern: {w: "majority", wtimeout: 10000}}') when: - def operation = new CommitTransactionOperation(ACKNOWLEDGED, true) + def operation = new CommitTransactionOperation(ACKNOWLEDGED, null, true) then: testOperationInTransaction(operation, [4, 0, 0], expectedCommand, async, cannedResult, true) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CountDocumentsOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CountDocumentsOperationSpecification.groovy index dc9746053c3..2c61dc77eef 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/CountDocumentsOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CountDocumentsOperationSpecification.groovy @@ -69,7 +69,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should have the correct defaults'() { when: - CountDocumentsOperation operation = new CountDocumentsOperation(getNamespace()) + CountDocumentsOperation operation = new CountDocumentsOperation(getNamespace(), null) then: operation.getFilter() == null @@ -84,7 +84,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def hint = new BsonString('hint') when: - CountDocumentsOperation operation = new CountDocumentsOperation(getNamespace()) + CountDocumentsOperation operation = new CountDocumentsOperation(getNamespace(), null) .filter(filter) .hint(hint) .limit(20) @@ -99,7 +99,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should get the count'() { expect: - execute(new CountDocumentsOperation(getNamespace()), async) == documents.size() + execute(new CountDocumentsOperation(getNamespace(), null), async) == documents.size() where: async << [true, false] @@ -110,7 +110,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat getCollectionHelper().drop() then: - execute(new CountDocumentsOperation(getNamespace()), async) == 0 + execute(new CountDocumentsOperation(getNamespace(), null), async) == 0 where: async << [true, false] @@ -122,7 +122,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat getCollectionHelper().create() then: - execute(new CountDocumentsOperation(getNamespace()), async) == 0 + execute(new CountDocumentsOperation(getNamespace(), null), async) == 0 where: async << [true, false] @@ -130,7 +130,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should use limit with the count'() { when: - def operation = new CountDocumentsOperation(getNamespace()).limit(1) + def operation = new CountDocumentsOperation(getNamespace(), null).limit(1) then: execute(operation, async) == 1 @@ -141,7 +141,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should use skip with the count'() { when: - def operation = new CountDocumentsOperation(getNamespace()).skip(documents.size() - 2) + def operation = new CountDocumentsOperation(getNamespace(), null).skip(documents.size() - 2) then: execute(operation, async) @@ -157,7 +157,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def binding = ClusterFixture.getBinding() new CreateIndexesOperation(getNamespace(), [new IndexRequest(indexDefinition).sparse(true)], null) .execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) - def operation = new CountDocumentsOperation(getNamespace()).hint(indexDefinition) + def operation = new CountDocumentsOperation(getNamespace(), null).hint(indexDefinition) when: def count = execute(operation, async) @@ -171,7 +171,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should support hints that are bson documents or strings'() { expect: - execute(new CountDocumentsOperation(getNamespace()).hint(hint), async) == 5 + execute(new CountDocumentsOperation(getNamespace(), null).hint(hint), async) == 5 where: [async, hint] << [[true, false], [new BsonString('_id_'), BsonDocument.parse('{_id: 1}')]].combinations() @@ -179,7 +179,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should throw with bad hint'() { given: - def operation = new CountDocumentsOperation(getNamespace()) + def operation = new CountDocumentsOperation(getNamespace(), null) .filter(new BsonDocument('a', new BsonInt32(1))) .hint(new BsonString('BAD HINT')) @@ -195,7 +195,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should use the ReadBindings readPreference to set secondaryOk'() { when: - def operation = new CountDocumentsOperation(helper.namespace) + def operation = new CountDocumentsOperation(helper.namespace, null) .filter(BsonDocument.parse('{a: 1}')) then: @@ -208,7 +208,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should create the expected aggregation command'() { when: def filter = new BsonDocument('filter', new BsonInt32(1)) - def operation = new CountDocumentsOperation(helper.namespace) + def operation = new CountDocumentsOperation(helper.namespace, null) def pipeline = [BsonDocument.parse('{ $match: {}}'), BsonDocument.parse('{$group: {_id: 1, n: {$sum: 1}}}')] def expectedCommand = new BsonDocument('aggregate', new BsonString(helper.namespace.getCollectionName())) .append('pipeline', new BsonArray(pipeline)) @@ -218,7 +218,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat testOperation(operation, [3, 4, 0], expectedCommand, async, helper.cursorResult) when: - operation = new CountDocumentsOperation(helper.namespace) + operation = new CountDocumentsOperation(helper.namespace, null) .filter(filter) .limit(20) .skip(30) @@ -243,7 +243,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat def 'should support collation'() { given: getCollectionHelper().insertDocuments(BsonDocument.parse('{str: "foo"}')) - def operation = new CountDocumentsOperation(namespace) + def operation = new CountDocumentsOperation(namespace, null) .filter(BsonDocument.parse('{str: "FOO"}')) .collation(caseInsensitiveCollation) @@ -273,7 +273,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat .append('cursor', new BsonDocument()) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new CountDocumentsOperation(getNamespace()) + def operation = new CountDocumentsOperation(getNamespace(), null) when: operation.execute(binding, operationContext) @@ -311,7 +311,7 @@ class CountDocumentsOperationSpecification extends OperationFunctionalSpecificat .append('cursor', new BsonDocument()) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new CountDocumentsOperation(getNamespace()) + def operation = new CountDocumentsOperation(getNamespace(), null) when: executeAsync(operation, binding, operationContext) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateCollectionOperationSpecification.groovy index a0b80cc178a..074ddfa422b 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateCollectionOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateCollectionOperationSpecification.groovy @@ -112,7 +112,7 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific then: def binding = ClusterFixture.getBinding() - new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec()) + new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec(), null) .execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) .next() .find { it -> it.getString('name').value == getCollectionName() } @@ -133,7 +133,7 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific then: def binding = ClusterFixture.getBinding() - new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec()) + new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec(), null) .execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) .next() .find { it -> it.getString('name').value == getCollectionName() } @@ -253,7 +253,7 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific def getCollectionInfo(String collectionName) { def binding = getBinding() - new ListCollectionsOperation(databaseName, new BsonDocumentCodec()).filter(new BsonDocument('name', + new ListCollectionsOperation(databaseName, new BsonDocumentCodec(), null).filter(new BsonDocument('name', new BsonString(collectionName))).execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())).tryNext()?.head() } @@ -274,7 +274,8 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific BatchCursor cursor = new AggregateOperation( getNamespace(), singletonList(new BsonDocument('$collStats', new BsonDocument('storageStats', new BsonDocument()))), - new BsonDocumentCodec()).execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) + new BsonDocumentCodec(), + null).execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) try { return cursor.next().first().getDocument('storageStats') } finally { diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy index 5365f19f1de..12e0335d751 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy @@ -493,7 +493,7 @@ class CreateIndexesOperationSpecification extends OperationFunctionalSpecificati def indexes = [] def binding = ClusterFixture.getBinding() - def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec()) + def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null) .execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) while (cursor.hasNext()) { indexes.addAll(cursor.next()) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy index 3e90c21363e..b90c5ce4586 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy @@ -123,7 +123,7 @@ class CreateViewOperationSpecification extends OperationFunctionalSpecification def getCollectionInfo(String collectionName) { def binding = getBinding() - new ListCollectionsOperation(databaseName, new BsonDocumentCodec()).filter(new BsonDocument('name', + new ListCollectionsOperation(databaseName, new BsonDocumentCodec(), null).filter(new BsonDocument('name', new BsonString(collectionName))).execute(binding, createOperationContext(binding.getReadPreference())).tryNext()?.head() } diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/DistinctOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/DistinctOperationSpecification.groovy index 66936080558..e59d03eef47 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/DistinctOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/DistinctOperationSpecification.groovy @@ -71,7 +71,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { def 'should have the correct defaults'() { when: - DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder) + DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder, null) then: operation.getFilter() == null @@ -83,7 +83,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { def filter = new BsonDocument('filter', new BsonInt32(1)) when: - DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder) + DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder, null) .filter(filter) .collation(defaultCollation) @@ -98,7 +98,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { Document sam = new Document('name', 'Sam').append('age', 21) Document pete2 = new Document('name', 'Pete').append('age', 25) getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2) - DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder) + DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder, null) when: def results = executeAndCollectBatchCursorResults(operation, async) @@ -116,7 +116,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { Document sam = new Document('name', 'Sam').append('age', 21) Document pete2 = new Document('name', 'Pete').append('age', 25) getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2) - def operation = new DistinctOperation(getNamespace(), 'name', stringDecoder) + def operation = new DistinctOperation(getNamespace(), 'name', stringDecoder, null) .filter(new BsonDocument('age', new BsonInt32(25))) when: @@ -147,7 +147,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { .append('numberOfJobs', sam.numberOfJobs) getCollectionHelper().insertDocuments(new Document('worker', peteDocument), new Document('worker', samDocument)) - DistinctOperation operation = new DistinctOperation(getNamespace(), 'worker', new WorkerCodec()) + DistinctOperation operation = new DistinctOperation(getNamespace(), 'worker', new WorkerCodec(), null) when: def results = executeAndCollectBatchCursorResults(operation, async) @@ -166,7 +166,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { Document sam = new Document('name', 1) Document pete2 = new Document('name', new Document('earle', 'Jones')) getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2) - DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder) + DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder, null) when: execute(operation, async) @@ -180,7 +180,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { def 'should use the ReadBindings readPreference to set secondaryOk'() { when: - def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder) + def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder, null) then: testOperationSecondaryOk(operation, [3, 4, 0], readPreference, async, helper.commandResult) @@ -191,7 +191,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { def 'should create the expected command'() { when: - def operation = new DistinctOperation(helper.namespace, 'name', new BsonDocumentCodec()) + def operation = new DistinctOperation(helper.namespace, 'name', new BsonDocumentCodec(), null) .filter(new BsonDocument('a', BsonBoolean.TRUE)) .collation(defaultCollation) @@ -211,7 +211,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { given: def document = Document.parse('{str: "foo"}') getCollectionHelper().insertDocuments(document) - def operation = new DistinctOperation(namespace, 'str', stringDecoder) + def operation = new DistinctOperation(namespace, 'str', stringDecoder, null) .filter(BsonDocument.parse('{str: "FOO"}}')) .collation(caseInsensitiveCollation) @@ -239,7 +239,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { .append('key', new BsonString('str')) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new DistinctOperation(getNamespace(), 'str', new StringCodec()) + def operation = new DistinctOperation(getNamespace(), 'str', new StringCodec(), null) when: operation.execute(binding, operationContext) @@ -278,7 +278,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification { .append('key', new BsonString('str')) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new DistinctOperation(getNamespace(), 'str', new StringCodec()) + def operation = new DistinctOperation(getNamespace(), 'str', new StringCodec(), null) when: executeAsync(operation, binding, operationContext) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/DropCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/DropCollectionOperationSpecification.groovy index 703d0e14212..d8f95daec3b 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/DropCollectionOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/DropCollectionOperationSpecification.groovy @@ -103,7 +103,7 @@ class DropCollectionOperationSpecification extends OperationFunctionalSpecificat } def collectionNameExists(String collectionName) { - def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec()) + def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec(), null) .execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) if (!cursor.hasNext()) { return false diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy index 955b5efcaa3..a9a74fc3190 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy @@ -90,8 +90,8 @@ class DropDatabaseOperationSpecification extends OperationFunctionalSpecificatio async << [true, false] } - def databaseNameExists(String databaseName) { - new ListDatabasesOperation(new DocumentCodec()).execute(binding, + static databaseNameExists(String databaseName) { + new ListDatabasesOperation(new DocumentCodec(), null).execute(binding, createOperationContext(binding.getReadPreference())).next()*.name.contains(databaseName) } diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/DropIndexOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/DropIndexOperationSpecification.groovy index 0aff76df1cb..74f88d0cfb6 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/DropIndexOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/DropIndexOperationSpecification.groovy @@ -158,7 +158,7 @@ class DropIndexOperationSpecification extends OperationFunctionalSpecification { def getIndexes() { def indexes = [] def binding = getBinding() - def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec()) + def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null) .execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) while (cursor.hasNext()) { indexes.addAll(cursor.next()) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndDeleteOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndDeleteOperationSpecification.groovy index 6da8050811b..e0f52e4ab60 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndDeleteOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndDeleteOperationSpecification.groovy @@ -51,7 +51,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati def 'should have the correct defaults'() { when: - def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec) + def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec) then: operation.getNamespace() == getNamespace() @@ -70,7 +70,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati def projection = BsonDocument.parse('{ projection : 1}') when: - def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec) + def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec) .filter(filter) .sort(sort) .projection(projection) @@ -91,7 +91,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam) when: - def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec) + def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec) .filter(new BsonDocument('name', new BsonString('Pete'))) Document returnedDocument = execute(operation, async) @@ -113,7 +113,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati when: FindAndDeleteOperation operation = new FindAndDeleteOperation(getNamespace(), - ACKNOWLEDGED, false, workerCodec).filter(new BsonDocument('name', new BsonString('Pete'))) + ACKNOWLEDGED, false, null, workerCodec).filter(new BsonDocument('name', new BsonString('Pete'))) Worker returnedDocument = execute(operation, async) then: @@ -132,7 +132,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati CollectionHelper helper = new CollectionHelper(documentCodec, getNamespace()) Document pete = new Document('name', 'Pete').append('job', 'handyman') helper.insertDocuments(new DocumentCodec(), pete) - def operation = new FindAndDeleteOperation(getNamespace(), new WriteConcern(5, 1), false, + def operation = new FindAndDeleteOperation(getNamespace(), new WriteConcern(5, 1), false, null, documentCodec).filter(new BsonDocument('name', new BsonString('Pete'))) when: @@ -164,7 +164,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati "writeConcernError": {"code": 91, "errmsg": "Replication is being shut down"}}}''') configureFailPoint(failPoint) - def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec).filter(new BsonDocument('name', new BsonString('Pete'))) when: @@ -191,7 +191,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati def includeWriteConcern = writeConcern.isAcknowledged() && !writeConcern.isServerDefault() def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec())) def operation = new FindAndDeleteOperation(getNamespace(), writeConcern as WriteConcern, - retryWrites as boolean, documentCodec) + retryWrites as boolean, null, documentCodec) def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName())) .append('remove', BsonBoolean.TRUE) @@ -244,7 +244,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam) when: - def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, true, documentCodec) + def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec) .filter(new BsonDocument('name', new BsonString('Pete'))) enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse('{times: 1}')) @@ -265,7 +265,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati def 'should retry if the connection initially fails'() { when: def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec())) - def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, true, documentCodec) + def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec) def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName())) .append('remove', BsonBoolean.TRUE) .append('txnNumber', new BsonInt64(0)) @@ -279,7 +279,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati def 'should throw original error when retrying and failing'() { given: - def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, true, documentCodec) + def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec) def originalException = new MongoSocketException('Some failure', new ServerAddress()) when: @@ -306,7 +306,7 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati given: def document = Document.parse('{_id: 1, str: "foo"}') getCollectionHelper().insertDocuments(document) - def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec) + def operation = new FindAndDeleteOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec) .filter(BsonDocument.parse('{str: "FOO"}')) .collation(caseInsensitiveCollation) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndReplaceOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndReplaceOperationSpecification.groovy index 50dd68fa810..3cc738add44 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndReplaceOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndReplaceOperationSpecification.groovy @@ -59,7 +59,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat def 'should have the correct defaults and passed values'() { when: def replacement = new BsonDocument('replace', new BsonInt32(1)) - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, replacement) then: @@ -81,7 +81,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat def projection = new BsonDocument('projection', new BsonInt32(1)) when: - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, new BsonDocument('replace', new BsonInt32(1))).filter(filter).sort(sort).projection(projection) .bypassDocumentValidation(true).upsert(true).returnOriginal(false) .collation(defaultCollation) @@ -106,7 +106,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat helper.insertDocuments(new DocumentCodec(), pete, sam) when: - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, jordan) .filter(new BsonDocument('name', new BsonString('Pete'))) Document returnedDocument = execute(operation, async) @@ -117,7 +117,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat helper.find().get(0).getString('name') == 'Jordan' when: - operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, + operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, new BsonDocumentWrapper(pete, documentCodec)) .filter(new BsonDocument('name', new BsonString('Jordan'))) .returnOriginal(false) @@ -141,7 +141,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat helper.insertDocuments(new WorkerCodec(), pete, sam) when: - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, workerCodec, replacement).filter(new BsonDocument('name', new BsonString('Pete'))) Worker returnedDocument = execute(operation, async) @@ -151,7 +151,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat when: replacement = new BsonDocumentWrapper(pete, workerCodec) - operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, workerCodec, + operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, workerCodec, replacement) .filter(new BsonDocument('name', new BsonString('Jordan'))) .returnOriginal(false) @@ -167,7 +167,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat def 'should return null if query fails to match'() { when: BsonDocument jordan = BsonDocument.parse('{name: "Jordan", job: "sparky"}') - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, jordan) .filter(new BsonDocument('name', new BsonString('Pete'))) Document returnedDocument = execute(operation, async) @@ -182,7 +182,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat def 'should throw an exception if replacement contains update operators'() { given: def replacement = new BsonDocumentWrapper(['$inc': 1] as Document, documentCodec) - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, replacement) when: @@ -206,7 +206,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat when: def replacement = new BsonDocument('level', new BsonInt32(9)) - def operation = new FindAndReplaceOperation(namespace, ACKNOWLEDGED, false, + def operation = new FindAndReplaceOperation(namespace, ACKNOWLEDGED, false, null, documentCodec, replacement) execute(operation, async) @@ -246,7 +246,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat when: def operation = new FindAndReplaceOperation(getNamespace(), - new WriteConcern(5, 1), false, documentCodec, jordan) + new WriteConcern(5, 1), false, null, documentCodec, jordan) .filter(new BsonDocument('name', new BsonString('Pete'))) execute(operation, async) @@ -260,7 +260,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat when: operation = new FindAndReplaceOperation(getNamespace(), new WriteConcern(5, 1), - false, documentCodec, jordan).filter(new BsonDocument('name', new BsonString('Bob'))) + false, null, documentCodec, jordan).filter(new BsonDocument('name', new BsonString('Bob'))) .upsert(true) execute(operation, async) @@ -292,7 +292,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat BsonDocument jordan = BsonDocument.parse('{name: "Jordan", job: "sparky"}') def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, - false, documentCodec, jordan).filter(new BsonDocument('name', new BsonString('Pete'))) + false, null, documentCodec, jordan).filter(new BsonDocument('name', new BsonString('Pete'))) when: execute(operation, async) @@ -318,7 +318,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat def includeWriteConcern = writeConcern.isAcknowledged() && !writeConcern.isServerDefault() def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec())) def replacement = BsonDocument.parse('{ replacement: 1}') - def operation = new FindAndReplaceOperation(getNamespace(), writeConcern, retryWrites, documentCodec, replacement) + def operation = new FindAndReplaceOperation(getNamespace(), writeConcern, retryWrites, null, documentCodec, replacement) def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName())) .append('update', replacement) if (includeWriteConcern) { @@ -375,7 +375,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat helper.insertDocuments(new DocumentCodec(), pete, sam) when: - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, true, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec, jordan) .filter(new BsonDocument('name', new BsonString('Pete'))) @@ -398,7 +398,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat when: def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec())) def replacement = BsonDocument.parse('{ replacement: 1}') - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, true, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec, replacement) def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName())) .append('update', replacement) @@ -415,7 +415,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat def 'should throw original error when retrying and failing'() { given: def replacement = BsonDocument.parse('{ replacement: 1}') - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, true, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec, replacement) def originalException = new MongoSocketException('Some failure', new ServerAddress()) @@ -444,7 +444,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat def document = Document.parse('{_id: 1, str: "foo"}') getCollectionHelper().insertDocuments(document) def replacement = BsonDocument.parse('{str: "bar"}') - def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndReplaceOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, replacement) .filter(BsonDocument.parse('{str: "FOO"}')) .collation(caseInsensitiveCollation) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndUpdateOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndUpdateOperationSpecification.groovy index 292d5bb471e..f721ac57ef8 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndUpdateOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/FindAndUpdateOperationSpecification.groovy @@ -61,7 +61,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def 'should have the correct defaults and passed values'() { when: def update = new BsonDocument('update', new BsonInt32(1)) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) then: @@ -79,7 +79,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def 'should have the correct defaults and passed values using update pipelines'() { when: def updatePipeline = new BsonArray(singletonList(new BsonDocument('update', new BsonInt32(1)))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, updatePipeline) + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, updatePipeline) then: operation.getNamespace() == getNamespace() @@ -101,7 +101,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def operation = new FindAndUpdateOperation(getNamespace(), - ACKNOWLEDGED, false, documentCodec, new BsonDocument('update', new BsonInt32(1))) + ACKNOWLEDGED, false, null, documentCodec, new BsonDocument('update', new BsonInt32(1))) .filter(filter) .sort(sort) .projection(projection) @@ -126,7 +126,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def projection = new BsonDocument('projection', new BsonInt32(1)) when: - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, new BsonArray(singletonList(new BsonDocument('update', new BsonInt32(1))))) .filter(filter) .sort(sort) @@ -155,7 +155,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) Document returnedDocument = execute(operation, async) @@ -167,7 +167,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1))) - operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) .returnOriginal(false) @@ -190,7 +190,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def update = new BsonArray(singletonList(new BsonDocument('$addFields', new BsonDocument('foo', new BsonInt32(1))))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, update) + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) .returnOriginal(false) Document returnedDocument = execute(operation, false) @@ -201,7 +201,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: update = new BsonArray(singletonList(new BsonDocument('$addFields', new BsonDocument('foo', new BsonInt32(1))))) - operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, update) + operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) .returnOriginal(false) returnedDocument = execute(operation, false) @@ -221,7 +221,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, workerCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) Worker returnedDocument = execute(operation, async) @@ -233,7 +233,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1))) - operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, workerCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) .returnOriginal(false) @@ -256,7 +256,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def update = new BsonArray(singletonList(new BsonDocument('$project', new BsonDocument('name', new BsonInt32(1))))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, update) + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) .returnOriginal(false) Document returnedDocument = execute(operation, async) @@ -272,7 +272,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def 'should return null if query fails to match'() { when: def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, update) + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) Document returnedDocument = execute(operation, async) @@ -286,7 +286,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def 'should throw an exception if update contains fields that are not update operators'() { given: def update = new BsonDocument('x', new BsonInt32(1)) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) when: @@ -303,7 +303,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def 'should throw an exception if update pipeline contains operations that are not supported'() { when: def update = new BsonArray(singletonList(new BsonDocument('$foo', new BsonDocument('x', new BsonInt32(1))))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, update) + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) execute(operation, async) then: @@ -311,7 +311,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: update = singletonList(new BsonInt32(1)) - operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, documentCodec, update) + operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) execute(operation, async) then: @@ -331,7 +331,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def update = new BsonDocument('$inc', new BsonDocument('level', new BsonInt32(-1))) - def operation = new FindAndUpdateOperation(namespace, ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(namespace, ACKNOWLEDGED, false, null, documentCodec, update) execute(operation, async) @@ -368,7 +368,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def operation = new FindAndUpdateOperation(getNamespace(), - new WriteConcern(5, 1), false, documentCodec, update) + new WriteConcern(5, 1), false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) execute(operation, async) @@ -381,7 +381,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati ex.writeResult.upsertedId == null when: - operation = new FindAndUpdateOperation(getNamespace(), new WriteConcern(5, 1), false, + operation = new FindAndUpdateOperation(getNamespace(), new WriteConcern(5, 1), false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Bob'))) .upsert(true) @@ -411,7 +411,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati configureFailPoint(failPoint) def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) @@ -439,7 +439,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def includeWriteConcern = writeConcern.isAcknowledged() && !writeConcern.isServerDefault() def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec())) def update = BsonDocument.parse('{ update: 1}') - def operation = new FindAndUpdateOperation(getNamespace(), writeConcern, retryWrites, documentCodec, update) + def operation = new FindAndUpdateOperation(getNamespace(), writeConcern, retryWrites, null, documentCodec, update) def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName())) .append('update', update) if (includeWriteConcern) { @@ -496,7 +496,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1))) - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, true, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec, update) .filter(new BsonDocument('name', new BsonString('Pete'))) @@ -520,7 +520,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati when: def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec())) def update = BsonDocument.parse('{ update: 1}') - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, true, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec, update) def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName())) .append('update', update) @@ -537,7 +537,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def 'should throw original error when retrying and failing'() { given: def update = BsonDocument.parse('{ update: 1}') - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, true, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, true, null, documentCodec, update) def originalException = new MongoSocketException('Some failure', new ServerAddress()) @@ -566,7 +566,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati def document = Document.parse('{_id: 1, str: "foo"}') getCollectionHelper().insertDocuments(document) def update = BsonDocument.parse('{ $set: {str: "bar"}}') - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .filter(BsonDocument.parse('{str: "FOO"}')) .collation(caseInsensitiveCollation) @@ -588,7 +588,7 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati getCollectionHelper().insertDocuments(documentOne, documentTwo) def update = BsonDocument.parse('{ $set: {"y.$[i].b": 2}}') def arrayFilters = [BsonDocument.parse('{"i.b": 3}')] - def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, + def operation = new FindAndUpdateOperation(getNamespace(), ACKNOWLEDGED, false, null, documentCodec, update) .returnOriginal(false) .arrayFilters(arrayFilters) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy index fc7c6aeece0..c8b107cba2c 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy @@ -77,7 +77,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def decoder = new DocumentCodec() when: - FindOperation operation = new FindOperation(getNamespace(), decoder) + FindOperation operation = new FindOperation(getNamespace(), decoder, null) then: operation.getNamespace() == getNamespace() @@ -101,7 +101,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def hint = new BsonString('a_1') when: - FindOperation operation = new FindOperation(getNamespace(), new DocumentCodec()) + FindOperation operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .filter(filter) .limit(20) .skip(30) @@ -131,7 +131,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { given: def document = new Document('_id', 1) getCollectionHelper().insertDocuments(new DocumentCodec(), document) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) when: def results = executeAndCollectBatchCursorResults(operation, async) @@ -157,7 +157,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { where: [async, operation] << [ [true, false], - [new FindOperation(getNamespace(), new DocumentCodec()) + [new FindOperation(getNamespace(), new DocumentCodec(), null) .filter(new BsonDocument('_id', new BsonInt32(1)))] ].combinations() } @@ -178,7 +178,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { where: [async, operation] << [ [true, false], - [new FindOperation(getNamespace(), new DocumentCodec()) + [new FindOperation(getNamespace(), new DocumentCodec(), null) .sort(new BsonDocument('_id', new BsonInt32(1)))] ].combinations() } @@ -187,7 +187,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { given: getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', 5).append('y', 10), new Document('_id', 1).append('x', 10)) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .projection(new BsonDocument('_id', new BsonInt32(0)).append('x', new BsonInt32(1))) when: @@ -206,7 +206,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { new Document('_id', 5)] getCollectionHelper().insertDocuments(new DocumentCodec(), documents) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .sort(new BsonDocument('_id', new BsonInt32(1))) .skip(3) @@ -226,7 +226,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { new Document('_id', 5)] getCollectionHelper().insertDocuments(new DocumentCodec(), documents) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .sort(new BsonDocument('_id', new BsonInt32(1))) .limit(limit) @@ -245,7 +245,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def documents = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3), new Document('_id', 4), new Document('_id', 5)] getCollectionHelper().insertDocuments(new DocumentCodec(), documents) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .sort(new BsonDocument('_id', new BsonInt32(1))) .batchSize(batchSize) @@ -288,7 +288,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def 'should throw query exception'() { given: - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .filter(new BsonDocument('x', new BsonDocument('$thisIsNotAnOperator', BsonBoolean.TRUE))) when: @@ -307,7 +307,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { collectionHelper.insertDocuments(new DocumentCodec(), new Document('x', 'y').append('count', it)) } collectionHelper.createIndex(new BsonDocument('count', new BsonInt32(1))) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .max(new BsonDocument('count', new BsonInt32(11))) .hint(new BsonDocument('count', new BsonInt32(1))) @@ -327,7 +327,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { collectionHelper.insertDocuments(new DocumentCodec(), new Document('x', 'y').append('count', it)) } collectionHelper.createIndex(new BsonDocument('count', new BsonInt32(1))) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .min(new BsonDocument('count', new BsonInt32(10))) .hint(new BsonDocument('count', new BsonInt32(1))) @@ -348,7 +348,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { } collectionHelper.createIndex(new BsonDocument('x', new BsonInt32(1))) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .filter(new BsonDocument('x', new BsonInt32(7))) .returnKey(true) @@ -367,7 +367,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def index = new BsonDocument('a', new BsonInt32(1)) collectionHelper.createIndex(index) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .hint((BsonValue) hint) .asExplainableOperation(null, new BsonDocumentCodec()) @@ -391,7 +391,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)), new BsonDocumentCodec()).execute(binding, createOperationContext(binding.getReadPreference())) def expectedComment = 'this is a comment' - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .comment(new BsonString(expectedComment)) when: @@ -416,7 +416,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { String fieldName = '$recordId' collectionHelper.insertDocuments(new BsonDocument()) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) .showRecordId(true) when: @@ -433,7 +433,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def 'should read from a secondary'() { given: collectionHelper.insertDocuments(new DocumentCodec(), new Document()) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) def syncBinding = new ClusterBinding(getCluster(), ReadPreference.secondary()) def asyncBinding = new AsyncClusterBinding(getAsyncCluster(), ReadPreference.secondary()) @@ -453,7 +453,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def documents = [new Document('_id', 3), new Document('_id', 1), new Document('_id', 2), new Document('_id', 5), new Document('_id', 4)] collectionHelper.insertDocuments(new DocumentCodec(), documents) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) when: def hedgeOptions = isHedgeEnabled != null ? @@ -492,7 +492,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def commandDocument = new BsonDocument('find', new BsonString(getCollectionName())) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) when: operation.execute(binding, operationContext) @@ -532,7 +532,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def commandDocument = new BsonDocument('find', new BsonString(getCollectionName())) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new FindOperation(getNamespace(), new DocumentCodec()) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null) when: executeAsync(operation, binding, operationContext) @@ -572,7 +572,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def commandDocument = new BsonDocument('find', new BsonString(getCollectionName())).append('allowDiskUse', BsonBoolean.TRUE) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new FindOperation(getNamespace(), new DocumentCodec()).allowDiskUse(true) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null).allowDiskUse(true) when: operation.execute(binding, operationContext) @@ -612,7 +612,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def commandDocument = new BsonDocument('find', new BsonString(getCollectionName())).append('allowDiskUse', BsonBoolean.TRUE) appendReadConcernToCommand(sessionContext, UNKNOWN_WIRE_VERSION, commandDocument) - def operation = new FindOperation(getNamespace(), new DocumentCodec()).allowDiskUse(true) + def operation = new FindOperation(getNamespace(), new DocumentCodec(), null).allowDiskUse(true) when: executeAsync(operation, binding, operationContext) @@ -648,7 +648,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { def operationContext = createOperationContext().withTimeoutContext(timeoutContext) collectionHelper.create(getCollectionName(), new CreateCollectionOptions().capped(true).sizeInBytes(1000)) - def operation = new FindOperation(namespace, new BsonDocumentCodec()) + def operation = new FindOperation(namespace, new BsonDocumentCodec(), null) .cursorType(cursorType) when: @@ -676,7 +676,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { // sanity check that the server accepts the miscallaneous flags def 'should pass miscallaneous flags through'() { given: - def operation = new FindOperation(namespace, new BsonDocumentCodec()) + def operation = new FindOperation(namespace, new BsonDocumentCodec(), null) .noCursorTimeout(true) .partial(true) @@ -694,7 +694,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification { given: def document = BsonDocument.parse('{_id: 1, str: "foo"}') getCollectionHelper().insertDocuments(document) - def operation = new FindOperation(getNamespace(), new BsonDocumentCodec()) + def operation = new FindOperation(getNamespace(), new BsonDocumentCodec(), null) .filter(BsonDocument.parse('{str: "FOO"}')) .collation(caseInsensitiveCollation) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy index b44b341d202..ceb3c96baac 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy @@ -55,7 +55,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should return empty set if database does not exist'() { given: - def operation = new ListCollectionsOperation(madeUpDatabase, new DocumentCodec()) + def operation = new ListCollectionsOperation(madeUpDatabase, new DocumentCodec(), null) def binding = getBinding() @@ -72,7 +72,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should return empty cursor if database does not exist asynchronously'() { given: - def operation = new ListCollectionsOperation(madeUpDatabase, new DocumentCodec()) + def operation = new ListCollectionsOperation(madeUpDatabase, new DocumentCodec(), null) when: def cursor = executeAsync(operation) @@ -88,7 +88,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should return collection names if a collection exists'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null) def helper = getCollectionHelper() def helper2 = getCollectionHelper(new MongoNamespace(databaseName, 'collection2')) def codec = new DocumentCodec() @@ -110,7 +110,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should filter collection names if a name filter is specified'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null) .filter(new BsonDocument('name', new BsonString('collection2'))) def helper = getCollectionHelper() def helper2 = getCollectionHelper(new MongoNamespace(databaseName, 'collection2')) @@ -133,7 +133,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should filter capped collections'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null) .filter(new BsonDocument('options.capped', BsonBoolean.TRUE)) def helper = getCollectionHelper() getCollectionHelper().create('collection3', new CreateCollectionOptions().capped(true).sizeInBytes(1000)) @@ -154,7 +154,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should only get collection names when nameOnly is requested'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null) .nameOnly(true) getCollectionHelper().create('collection5', new CreateCollectionOptions()) @@ -170,7 +170,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should only get collection names when nameOnly and authorizedCollections are requested'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null) .nameOnly(true) .authorizedCollections(true) getCollectionHelper().create('collection6', new CreateCollectionOptions()) @@ -187,7 +187,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should get all fields when authorizedCollections is requested and nameOnly is not requested'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null) .nameOnly(false) .authorizedCollections(true) getCollectionHelper().create('collection8', new CreateCollectionOptions()) @@ -204,7 +204,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should return collection names if a collection exists asynchronously'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null) def helper = getCollectionHelper() def helper2 = getCollectionHelper(new MongoNamespace(databaseName, 'collection2')) def codec = new DocumentCodec() @@ -229,7 +229,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED) .execute(binding, createOperationContext(binding.getReadPreference())) addSeveralIndexes() - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null).batchSize(2) when: @@ -249,7 +249,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED) .execute(binding, createOperationContext(binding.getReadPreference())) addSeveralIndexes() - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null).batchSize(2) when: binding = getBinding() @@ -274,7 +274,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED) .execute(binding, createOperationContext(binding.getReadPreference())) addSeveralIndexes() - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null).batchSize(2) when: @@ -300,7 +300,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED) .execute(binding, createOperationContext(binding.getReadPreference())) addSeveralIndexes() - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null).batchSize(2) when: binding = getBinding() @@ -320,7 +320,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED) .execute(binding, createOperationContext(binding.getReadPreference())) addSeveralIndexes() - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null).batchSize(2) when: def cursor = executeAsync(operation) @@ -333,7 +333,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should use the set batchSize of collections'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null).batchSize(2) def codec = new DocumentCodec() getCollectionHelper().insertDocuments(codec, ['a': 1] as Document) getCollectionHelper(new MongoNamespace(databaseName, 'collection2')).insertDocuments(codec, ['a': 1] as Document) @@ -367,7 +367,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica def 'should use the set batchSize of collections asynchronously'() { given: - def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2) + def operation = new ListCollectionsOperation(databaseName, new DocumentCodec(), null).batchSize(2) def codec = new DocumentCodec() getCollectionHelper().insertDocuments(codec, ['a': 1] as Document) getCollectionHelper(new MongoNamespace(databaseName, 'collection2')).insertDocuments(codec, ['a': 1] as Document) @@ -408,7 +408,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica getReadConnectionSource(_) >> connectionSource getReadPreference() >> readPreference } - def operation = new ListCollectionsOperation(helper.dbName, helper.decoder) + def operation = new ListCollectionsOperation(helper.dbName, helper.decoder, null) when: '3.6.0' operation.execute(readBinding, operationContext) @@ -437,7 +437,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica getReadConnectionSource(_, _) >> { it[1].onResult(connectionSource, null) } getReadPreference() >> readPreference } - def operation = new ListCollectionsOperation(helper.dbName, helper.decoder) + def operation = new ListCollectionsOperation(helper.dbName, helper.decoder, null) when: '3.6.0' operation.executeAsync(readBinding, operationContext, Stub(SingleResultCallback)) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/ListDatabasesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/ListDatabasesOperationSpecification.groovy index a6ed542bde2..e0b3b342e7b 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/ListDatabasesOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/ListDatabasesOperationSpecification.groovy @@ -41,7 +41,7 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati def 'should return a list of database names'() { given: getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1)) - def operation = new ListDatabasesOperation(codec) + def operation = new ListDatabasesOperation(codec, null) when: def names = executeAndCollectBatchCursorResults(operation, async)*.get('name') @@ -79,7 +79,7 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati getReadConnectionSource(_) >> connectionSource getReadPreference() >> readPreference } - def operation = new ListDatabasesOperation(helper.decoder) + def operation = new ListDatabasesOperation(helper.decoder, null) when: operation.execute(readBinding, createOperationContext()) @@ -104,7 +104,7 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati getReadPreference() >> readPreference getReadConnectionSource(_, _) >> { it[1].onResult(connectionSource, null) } } - def operation = new ListDatabasesOperation(helper.decoder) + def operation = new ListDatabasesOperation(helper.decoder, null) when: operation.executeAsync(readBinding, createOperationContext(), Stub(SingleResultCallback)) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy index 823de9bfd91..43b81f8aaa0 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy @@ -52,7 +52,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification def 'should return empty list for nonexistent collection'() { given: - def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()) + def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null) def binding = getBinding() @@ -66,7 +66,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification def 'should return empty list for nonexistent collection asynchronously'() { given: - def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()) + def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null) when: AsyncBatchCursor cursor = executeAsync(operation) @@ -80,7 +80,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification def 'should return default index on Collection that exists'() { given: - def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()) + def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null) getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('documentThat', 'forces creation of the Collection')) @@ -98,7 +98,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification def 'should return default index on Collection that exists asynchronously'() { given: - def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()) + def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null) getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('documentThat', 'forces creation of the Collection')) when: @@ -114,7 +114,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification def 'should return created indexes on Collection'() { given: - def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()) + def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null) collectionHelper.createIndex(new BsonDocument('theField', new BsonInt32(1))) collectionHelper.createIndex(new BsonDocument('compound', new BsonInt32(1)).append('index', new BsonInt32(-1))) @@ -138,7 +138,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification def 'should return created indexes on Collection asynchronously'() { given: - def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()) + def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null) collectionHelper.createIndex(new BsonDocument('theField', new BsonInt32(1))) collectionHelper.createIndex(new BsonDocument('compound', new BsonInt32(1)).append('index', new BsonInt32(-1))) @@ -161,7 +161,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification def 'should use the set batchSize of collections'() { given: - def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()).batchSize(2) + def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null).batchSize(2) collectionHelper.createIndex(new BsonDocument('collection1', new BsonInt32(1))) collectionHelper.createIndex(new BsonDocument('collection2', new BsonInt32(1))) collectionHelper.createIndex(new BsonDocument('collection3', new BsonInt32(1))) @@ -194,7 +194,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification def 'should use the set batchSize of collections asynchronously'() { given: - def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()).batchSize(2) + def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec(), null).batchSize(2) collectionHelper.createIndex(new BsonDocument('collection1', new BsonInt32(1))) collectionHelper.createIndex(new BsonDocument('collection2', new BsonInt32(1))) collectionHelper.createIndex(new BsonDocument('collection3', new BsonInt32(1))) @@ -234,7 +234,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification getReadConnectionSource(_) >> connectionSource getReadPreference() >> readPreference } - def operation = new ListIndexesOperation(helper.namespace, helper.decoder) + def operation = new ListIndexesOperation(helper.namespace, helper.decoder, null) when: '3.6.0' operation.execute(readBinding, operationContext) @@ -262,7 +262,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification getReadPreference() >> readPreference getReadConnectionSource(_, _) >> { it[1].onResult(connectionSource, null) } } - def operation = new ListIndexesOperation(helper.namespace, helper.decoder) + def operation = new ListIndexesOperation(helper.namespace, helper.decoder, null) when: '3.6.0' operation.executeAsync(readBinding, createOperationContext(), Stub(SingleResultCallback)) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/MixedBulkWriteOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/MixedBulkWriteOperationSpecification.groovy index a0a30842630..57d62f33060 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/MixedBulkWriteOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/MixedBulkWriteOperationSpecification.groovy @@ -71,7 +71,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'should throw IllegalArgumentException for empty list of requests'() { when: - new MixedBulkWriteOperation(getNamespace(), [], true, ACKNOWLEDGED, false) + new MixedBulkWriteOperation(getNamespace(), [], true, ACKNOWLEDGED, false, null) then: thrown(IllegalArgumentException) @@ -79,7 +79,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'should have the expected passed values'() { when: - def operation = new MixedBulkWriteOperation(getNamespace(), requests, ordered, writeConcern, retryWrites) + def operation = new MixedBulkWriteOperation(getNamespace(), requests, ordered, writeConcern, retryWrites, null) .bypassDocumentValidation(bypassValidation) then: @@ -100,7 +100,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'when no document with the same id exists, should insert the document'() { given: def operation = new MixedBulkWriteOperation(getNamespace(), - [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))], ordered, ACKNOWLEDGED, false) + [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))], ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -120,7 +120,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def document = new BsonDocument('_id', new BsonInt32(1)) getCollectionHelper().insertDocuments(document) def operation = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(document)], ordered, - ACKNOWLEDGED, false) + ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -136,7 +136,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'RawBsonDocument should not generate an _id'() { given: def operation = new MixedBulkWriteOperation(getNamespace(), - [new InsertRequest(RawBsonDocument.parse('{_id: 1}'))], ordered, ACKNOWLEDGED, false) + [new InsertRequest(RawBsonDocument.parse('{_id: 1}'))], ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -156,7 +156,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true)) def operation = new MixedBulkWriteOperation(getNamespace(), [new DeleteRequest(new BsonDocument('x', BsonBoolean.TRUE)).multi(false)], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -175,7 +175,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat new Document('x', false)) def operation = new MixedBulkWriteOperation(getNamespace(), [new DeleteRequest(new BsonDocument('x', BsonBoolean.TRUE))], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -195,7 +195,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE), new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))), UPDATE).multi(false)], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -214,7 +214,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def operation = new MixedBulkWriteOperation(getNamespace(), [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE), new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))), - UPDATE).multi(true)], ordered, ACKNOWLEDGED, false) + UPDATE).multi(true)], ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -233,7 +233,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def query = new BsonDocument('_id', new BsonObjectId(id)) def operation = new MixedBulkWriteOperation(getNamespace(), [new UpdateRequest(query, new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))), - UPDATE).upsert(true)], ordered, ACKNOWLEDGED, false) + UPDATE).upsert(true)], ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -253,7 +253,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def operation = new MixedBulkWriteOperation(getNamespace(), [new UpdateRequest(query, new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))), UPDATE).upsert(true).multi(true)], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -274,7 +274,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE), new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))), UPDATE).multi(false).upsert(true)], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -294,7 +294,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE), new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))), UPDATE).upsert(true).multi(true)], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -312,7 +312,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def id = new ObjectId() def operation = new MixedBulkWriteOperation(getNamespace(), [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument(), UPDATE)], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -329,7 +329,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def id = new ObjectId() def operation = new MixedBulkWriteOperation(getNamespace(), [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument(), REPLACE)], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -346,7 +346,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def id = new ObjectId() def operation = new MixedBulkWriteOperation(getNamespace(), [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument('a', new BsonInt32(1)), UPDATE)], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -365,7 +365,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def operation = new MixedBulkWriteOperation(getNamespace(), [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))), REPLACE)], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -383,7 +383,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat given: def operation = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument('$inc', new BsonDocument('x', new BsonInt32(1))))], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -403,7 +403,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))), REPLACE) .upsert(true)], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -424,7 +424,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat .append('x', new BsonInt32(2)), REPLACE) .upsert(true)], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -453,7 +453,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat REPLACE) .upsert(true) ], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -485,7 +485,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat REPLACE) .upsert(true) ], - ordered, UNACKNOWLEDGED, false) + ordered, UNACKNOWLEDGED, false, null) when: def result = execute(operation, binding) @@ -507,7 +507,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE), new BsonDocument('y', new BsonInt32(1)).append('x', BsonBoolean.FALSE), REPLACE).upsert(true)], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -528,7 +528,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)), new BsonDocument('_id', new BsonInt32(1)) .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])), - REPLACE).upsert(true)], true, ACKNOWLEDGED, false) + REPLACE).upsert(true)], true, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -554,7 +554,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat new BsonDocument('_id', new BsonInt32(2)) .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])), REPLACE)], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -577,7 +577,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary)), new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary)) ], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, true) @@ -598,7 +598,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary)), new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary)) ], - true, ACKNOWLEDGED, false) + true, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, true) @@ -613,7 +613,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'should handle multi-length runs of ordered insert, update, replace, and remove'() { given: getCollectionHelper().insertDocuments(getTestInserts()) - def operation = new MixedBulkWriteOperation(getNamespace(), getTestWrites(), ordered, ACKNOWLEDGED, false) + def operation = new MixedBulkWriteOperation(getNamespace(), getTestWrites(), ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -637,13 +637,13 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat given: getCollectionHelper().insertDocuments(getTestInserts()) def operation = new MixedBulkWriteOperation(getNamespace(), getTestWrites(), ordered, UNACKNOWLEDGED, - false) + false, null) def binding = async ? getAsyncSingleConnectionBinding() : getSingleConnectionBinding() when: def result = execute(operation, binding) execute(new MixedBulkWriteOperation(namespace, - [new InsertRequest(new BsonDocument('_id', new BsonInt32(9)))], true, ACKNOWLEDGED, false,), binding) + [new InsertRequest(new BsonDocument('_id', new BsonInt32(9)))], true, ACKNOWLEDGED, false, null), binding) then: !result.wasAcknowledged() @@ -672,7 +672,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat (1..numberOfWrites).each { writes.add(new InsertRequest(new BsonDocument())) } - def operation = new MixedBulkWriteOperation(getNamespace(), writes, ordered, ACKNOWLEDGED, false) + def operation = new MixedBulkWriteOperation(getNamespace(), writes, ordered, ACKNOWLEDGED, false, null) when: execute(operation, binding) @@ -695,7 +695,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat writeOperations.add(upsert) writeOperations.add(new DeleteRequest(new BsonDocument('key', new BsonInt32(it)))) } - def operation = new MixedBulkWriteOperation(getNamespace(), writeOperations, ordered, ACKNOWLEDGED, false) + def operation = new MixedBulkWriteOperation(getNamespace(), writeOperations, ordered, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -716,7 +716,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat new BsonDocument('$set', new BsonDocument('x', new BsonInt32(3))), UPDATE), new InsertRequest(new BsonDocument('_id', new BsonInt32(1))) // this should fail with index 2 - ], true, ACKNOWLEDGED, false) + ], true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -739,7 +739,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat new BsonDocument('$set', new BsonDocument('x', new BsonInt32(3))), UPDATE), new InsertRequest(new BsonDocument('_id', new BsonInt32(3))) // this should fail with index 2 - ], false, ACKNOWLEDGED, false) + ], false, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -762,7 +762,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat for (int i = 0; i < 2000; i++) { inserts.add(new InsertRequest(new BsonDocument('_id', new BsonInt32(i)))) } - def operation = new MixedBulkWriteOperation(getNamespace(), inserts, false, ACKNOWLEDGED, false) + def operation = new MixedBulkWriteOperation(getNamespace(), inserts, false, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -784,7 +784,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat for (int i = 0; i < 2000; i++) { inserts.add(new InsertRequest(new BsonDocument('_id', new BsonInt32(i)))) } - def operation = new MixedBulkWriteOperation(getNamespace(), inserts, true, ACKNOWLEDGED, false) + def operation = new MixedBulkWriteOperation(getNamespace(), inserts, true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -806,7 +806,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat given: def operation = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))], - false, new WriteConcern(5, 1), false) + false, new WriteConcern(5, 1), false, null) when: execute(operation, async) @@ -826,7 +826,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def operation = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument('_id', new BsonInt32(7))), new InsertRequest(new BsonDocument('_id', new BsonInt32(1))) // duplicate key - ], false, new WriteConcern(4, 1), false) + ], false, new WriteConcern(4, 1), false, null) when: execute(operation, async) // This is assuming that it won't be able to replicate to 4 servers in 1 ms @@ -849,7 +849,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def operation = new MixedBulkWriteOperation(getNamespace(), [new DeleteRequest(new BsonDocument('_id', new BsonInt32(2))), // existing key new InsertRequest(new BsonDocument('_id', new BsonInt32(1))) // existing (duplicate) key - ], true, ACKNOWLEDGED, true) + ], true, ACKNOWLEDGED, true, null) def failPoint = BsonDocument.parse('''{ "configureFailPoint": "failCommand", @@ -878,7 +878,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'should throw IllegalArgumentException when passed an empty bulk operation'() { when: - new MixedBulkWriteOperation(getNamespace(), [], ordered, UNACKNOWLEDGED, false) + new MixedBulkWriteOperation(getNamespace(), [], ordered, UNACKNOWLEDGED, false, null) then: thrown(IllegalArgumentException) @@ -890,7 +890,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'should throw if bypassDocumentValidation is set and writeConcern is UNACKNOWLEDGED'() { given: def operation = new MixedBulkWriteOperation(getNamespace(), - [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, UNACKNOWLEDGED, false) + [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, UNACKNOWLEDGED, false, null) .bypassDocumentValidation(bypassDocumentValidation) when: @@ -906,7 +906,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'should throw if collation is set and write is UNACKNOWLEDGED'() { given: def operation = new MixedBulkWriteOperation(getNamespace(), - [new DeleteRequest(BsonDocument.parse('{ level: 9 }')).collation(defaultCollation)], true, UNACKNOWLEDGED, false) + [new DeleteRequest(BsonDocument.parse('{ level: 9 }')).collation(defaultCollation)], true, UNACKNOWLEDGED, false, null) when: execute(operation, async) @@ -925,7 +925,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat collectionHelper.create(namespace.getCollectionName(), new CreateCollectionOptions().validationOptions( new ValidationOptions().validator(gte('level', 10)))) def operation = new MixedBulkWriteOperation(namespace, - [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], ordered, ACKNOWLEDGED, false) + [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], ordered, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -961,7 +961,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat collectionHelper.insertDocuments(BsonDocument.parse('{ x: true, level: 10}')) def operation = new MixedBulkWriteOperation(namespace, [new UpdateRequest(BsonDocument.parse('{x: true}'), BsonDocument.parse('{$inc: {level: -1}}'), UPDATE).multi(false)], - ordered, ACKNOWLEDGED, false) + ordered, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -988,7 +988,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def requests = [new DeleteRequest(BsonDocument.parse('{str: "FOO"}}')).collation(caseInsensitiveCollation), new UpdateRequest(BsonDocument.parse('{str: "BAR"}}'), BsonDocument.parse('{str: "bar"}}'), REPLACE) .collation(caseInsensitiveCollation)] - def operation = new MixedBulkWriteOperation(namespace, requests, false, ACKNOWLEDGED, false) + def operation = new MixedBulkWriteOperation(namespace, requests, false, ACKNOWLEDGED, false, null) when: BulkWriteResult result = execute(operation, async) @@ -1006,7 +1006,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def testWrites = getTestWrites() Collections.shuffle(testWrites) getCollectionHelper().insertDocuments(getTestInserts()) - def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, ACKNOWLEDGED, true) + def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, ACKNOWLEDGED, true, null) when: if (isDiscoverableReplicaSet()) { @@ -1049,7 +1049,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat given: def testWrites = getTestWrites() getCollectionHelper().insertDocuments(getTestInserts()) - def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, ACKNOWLEDGED, true) + def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, ACKNOWLEDGED, true, null) when: enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse(failPoint)) @@ -1074,7 +1074,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat given: def testWrites = getTestWrites() getCollectionHelper().insertDocuments(getTestInserts()) - def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, UNACKNOWLEDGED, true) + def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, UNACKNOWLEDGED, true, null) when: enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse(failPoint)) @@ -1098,7 +1098,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat when: def cannedResult = BsonDocument.parse('{ok: 1.0, n: 1}') def operation = new MixedBulkWriteOperation(getNamespace(), - [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, ACKNOWLEDGED, true) + [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, ACKNOWLEDGED, true, null) def expectedCommand = new BsonDocument('insert', new BsonString(getNamespace().getCollectionName())) .append('ordered', BsonBoolean.TRUE) .append('txnNumber', new BsonInt64(0)) @@ -1113,7 +1113,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'should throw original error when retrying and failing'() { given: def operation = new MixedBulkWriteOperation(getNamespace(), - [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, ACKNOWLEDGED, true) + [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, ACKNOWLEDGED, true, null) def originalException = new MongoSocketException('Some failure', new ServerAddress()) when: @@ -1138,7 +1138,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat def 'should not request retryable write for multi updates or deletes'() { given: - def operation = new MixedBulkWriteOperation(getNamespace(), writes, true, ACKNOWLEDGED, true) + def operation = new MixedBulkWriteOperation(getNamespace(), writes, true, ACKNOWLEDGED, true, null) when: executeWithSession(operation, async) @@ -1185,7 +1185,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat .multi(true) .arrayFilters([BsonDocument.parse('{"i.b": 1}')]), ] - def operation = new MixedBulkWriteOperation(namespace, requests, true, ACKNOWLEDGED, false) + def operation = new MixedBulkWriteOperation(namespace, requests, true, ACKNOWLEDGED, false, null) when: execute(operation, async) @@ -1206,7 +1206,7 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat new UpdateRequest(new BsonDocument(), BsonDocument.parse('{ $set: {"y.$[i].b": 2}}'), UPDATE) .arrayFilters([BsonDocument.parse('{"i.b": 3}')]) ] - def operation = new MixedBulkWriteOperation(namespace, requests, true, UNACKNOWLEDGED, false) + def operation = new MixedBulkWriteOperation(namespace, requests, true, UNACKNOWLEDGED, false, null) when: execute(operation, async) diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy index 080861047f1..5cf788922ad 100644 --- a/driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy @@ -100,7 +100,7 @@ class RenameCollectionOperationSpecification extends OperationFunctionalSpecific def collectionNameExists(String collectionName) { def binding = getBinding() - def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec()).execute(binding, + def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec(), null).execute(binding, createOperationContext(binding.getReadPreference())) if (!cursor.hasNext()) { return false diff --git a/driver-core/src/test/unit/com/mongodb/UriOptionsTest.java b/driver-core/src/test/unit/com/mongodb/UriOptionsTest.java index 0cec2f1770a..11834fd1b97 100644 --- a/driver-core/src/test/unit/com/mongodb/UriOptionsTest.java +++ b/driver-core/src/test/unit/com/mongodb/UriOptionsTest.java @@ -45,7 +45,6 @@ public void shouldPassAllOutcomes() { assumeFalse(getDescription().contains("tlsDisableOCSPEndpointCheck")); // No CANONICALIZE_HOST_NAME support https://jira.mongodb.org/browse/JAVA-4278 assumeFalse(getDescription().equals("Valid auth options are parsed correctly (GSSAPI)")); - skipBackpressureTests(getDescription()); if (getDefinition().getBoolean("valid", BsonBoolean.TRUE).getValue()) { testValidOptions(); @@ -58,14 +57,4 @@ public void shouldPassAllOutcomes() { public static Collection data() { return JsonPoweredTestHelper.getTestData("uri-options"); } - - /** - * TODO-JAVA-6141. - * TODO-JAVA-6167. - */ - private void skipBackpressureTests(final String description) { - // TODO-JAVA-6141 https://jira.mongodb.org/browse/JAVA-6141 Remove skips for maxAdaptiveRetries - assumeFalse(description.equals("maxAdaptiveRetries is parsed correctly")); - assumeFalse(description.equals("maxAdaptiveRetries=0 is parsed correctly")); - } } diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java index 091518c715c..92d7119ed54 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageTest.java @@ -145,6 +145,7 @@ void getCommandDocumentFromClientBulkWrite() { clientBulkWriteOptions(), WriteConcern.MAJORITY, retryWrites, + null, getDefaultCodecRegistry() ).new BatchEncoder(), (ConcreteClientBulkWriteOptions) clientBulkWriteOptions(), diff --git a/driver-core/src/test/unit/com/mongodb/internal/mockito/InsufficientStubbingDetectorDemoTest.java b/driver-core/src/test/unit/com/mongodb/internal/mockito/InsufficientStubbingDetectorDemoTest.java index 9142a097678..9e31f1bae16 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/mockito/InsufficientStubbingDetectorDemoTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/mockito/InsufficientStubbingDetectorDemoTest.java @@ -34,7 +34,7 @@ final class InsufficientStubbingDetectorDemoTest { @BeforeEach void beforeEach() { - operation = new ListCollectionsOperation<>("db", new BsonDocumentCodec()); + operation = new ListCollectionsOperation<>("db", new BsonDocumentCodec(), null); } @Test diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncOperationHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncOperationHelperSpecification.groovy index 0e43d16de43..a492a53ea01 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncOperationHelperSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/AsyncOperationHelperSpecification.groovy @@ -91,7 +91,7 @@ class AsyncOperationHelperSpecification extends Specification { when: executeRetryableWriteAsync(asyncWriteBinding, operationContext, dbName, primary(), NoOpFieldNameValidator.INSTANCE, decoder, commandCreator, FindAndModifyHelper.asyncTransformer(), - { cmd -> cmd }, true, callback) + { cmd -> cmd }, true, null, callback) then: 2 * connection.commandAsync(dbName, command, _, primary(), decoder, *_) >> { it.last().onResult(results.poll(), null) } @@ -143,7 +143,8 @@ class AsyncOperationHelperSpecification extends Specification { def connectionDescription = Stub(ConnectionDescription) when: - executeRetryableReadAsync(asyncReadBinding, createOperationContext(), dbName, commandCreator, decoder, function, false, callback) + executeRetryableReadAsync(asyncReadBinding, createOperationContext(), dbName, commandCreator, decoder, function, + false, null, callback) then: _ * connection.getDescription() >> connectionDescription diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ClientBulkWriteOperationTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/ClientBulkWriteOperationTest.java index 18a66816abf..5bb2a750bd7 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/ClientBulkWriteOperationTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/ClientBulkWriteOperationTest.java @@ -122,6 +122,7 @@ void shouldIgnoreSuccessfulCursorResultWhenVerboseResultIsFalse() { options, WriteConcern.ACKNOWLEDGED, false, + null, getDefaultCodecRegistry()); //when ClientBulkWriteResult result = op.execute(binding, ClusterFixture.createOperationContext()); @@ -174,6 +175,7 @@ void shouldUseDefaultNumberOfModifiedDocumentsWhenMissingInCursor() { options, WriteConcern.ACKNOWLEDGED, false, + null, getDefaultCodecRegistry()); //when ClientBulkWriteResult result = op.execute(binding, ClusterFixture.createOperationContext()); diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommitTransactionOperationUnitSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/CommitTransactionOperationUnitSpecification.groovy index aa4db2372ff..0fbfe927a49 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/CommitTransactionOperationUnitSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/CommitTransactionOperationUnitSpecification.groovy @@ -39,7 +39,7 @@ class CommitTransactionOperationUnitSpecification extends OperationUnitSpecifica def writeBinding = Stub(WriteBinding) { getWriteConnectionSource(_) >> { throw new MongoTimeoutException('Time out!') } } - def operation = new CommitTransactionOperation(WriteConcern.ACKNOWLEDGED) + def operation = new CommitTransactionOperation(WriteConcern.ACKNOWLEDGED, null, false) when: operation.execute(writeBinding, createOperationContext().withSessionContext(sessionContext)) @@ -60,7 +60,7 @@ class CommitTransactionOperationUnitSpecification extends OperationUnitSpecifica it[1].onResult(null, new MongoTimeoutException('Time out!')) } } - def operation = new CommitTransactionOperation(WriteConcern.ACKNOWLEDGED) + def operation = new CommitTransactionOperation(WriteConcern.ACKNOWLEDGED, null, false) def callback = new FutureResultCallback() when: diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/FindOperationUnitSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/FindOperationUnitSpecification.groovy index dd843985bbb..41ccf40eb4b 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/FindOperationUnitSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/FindOperationUnitSpecification.groovy @@ -33,14 +33,14 @@ class FindOperationUnitSpecification extends OperationUnitSpecification { def 'should find with correct command'() { when: - def operation = new FindOperation(namespace, new BsonDocumentCodec()) + def operation = new FindOperation(namespace, new BsonDocumentCodec(), null) def expectedCommand = new BsonDocument('find', new BsonString(namespace.getCollectionName())) then: testOperation(operation, [3, 2, 0], expectedCommand, async, commandResult) // Overrides when: - operation = new FindOperation(namespace, new BsonDocumentCodec()) + operation = new FindOperation(namespace, new BsonDocumentCodec(), null) .filter(new BsonDocument('a', BsonBoolean.TRUE)) .projection(new BsonDocument('x', new BsonInt32(1))) .skip(2) @@ -104,7 +104,7 @@ class FindOperationUnitSpecification extends OperationUnitSpecification { def 'should find with correct command with effective batch size'() { when: - def operation = new FindOperation(namespace, new BsonDocumentCodec()) + def operation = new FindOperation(namespace, new BsonDocumentCodec(), null) .batchSize(batchSize) .limit(limit) @@ -125,7 +125,7 @@ class FindOperationUnitSpecification extends OperationUnitSpecification { def 'should use the readPreference to set secondaryOk for commands'() { when: - def operation = new FindOperation(namespace, new DocumentCodec()) + def operation = new FindOperation(namespace, new DocumentCodec(), null) then: testOperationSecondaryOk(operation, [3, 2, 0], readPreference, async, commandResult) @@ -135,7 +135,6 @@ class FindOperationUnitSpecification extends OperationUnitSpecification { } def namespace = new MongoNamespace('db', 'coll') - def decoder = new BsonDocumentCodec() def readPreference = ReadPreference.secondary() def commandResult = new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(0)) .append('ns', new BsonString('db.coll')) diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/ListCollectionsOperationTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/ListCollectionsOperationTest.java index ca7730ff2b6..952d5b239f7 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/ListCollectionsOperationTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/ListCollectionsOperationTest.java @@ -57,7 +57,7 @@ final class ListCollectionsOperationTest { @BeforeEach void beforeEach() { MongoNamespace namespace = new MongoNamespace("db", "coll"); - operation = new ListCollectionsOperation<>(namespace.getDatabaseName(), new BsonDocumentCodec()); + operation = new ListCollectionsOperation<>(namespace.getDatabaseName(), new BsonDocumentCodec(), null); mocks = mocks(namespace); } diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/SyncOperationHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/SyncOperationHelperSpecification.groovy index 8674faf8a80..77161b33030 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/operation/SyncOperationHelperSpecification.groovy +++ b/driver-core/src/test/unit/com/mongodb/internal/operation/SyncOperationHelperSpecification.groovy @@ -104,7 +104,7 @@ class SyncOperationHelperSpecification extends Specification { when: executeRetryableWrite(writeBinding, operationContext, dbName, primary(), NoOpFieldNameValidator.INSTANCE, decoder, commandCreator, FindAndModifyHelper.transformer(), - { cmd -> cmd }, true) + { cmd -> cmd }, true, null) then: 2 * connection.command(dbName, command, _, primary(), decoder, _) >> { results.poll() } @@ -132,7 +132,7 @@ class SyncOperationHelperSpecification extends Specification { def connectionDescription = Stub(ConnectionDescription) when: - executeRetryableRead(readBinding, createOperationContext(), dbName, commandCreator, decoder, function, false) + executeRetryableRead(readBinding, createOperationContext(), dbName, commandCreator, decoder, function, false, null) then: _ * connection.getDescription() >> connectionDescription diff --git a/driver-legacy/src/main/com/mongodb/DB.java b/driver-legacy/src/main/com/mongodb/DB.java index b5aa60a58e1..9af169194b0 100644 --- a/driver-legacy/src/main/com/mongodb/DB.java +++ b/driver-legacy/src/main/com/mongodb/DB.java @@ -218,12 +218,13 @@ public String getName() { * @mongodb.driver.manual reference/method/db.getCollectionNames/ getCollectionNames() */ public Set getCollectionNames() { + MongoClientOptions options = mongo.getMongoClientOptions(); List collectionNames = new MongoIterableImpl(null, executor, ReadConcern.DEFAULT, primary(), - mongo.getMongoClientOptions().getRetryReads(), DB.this.getTimeoutSettings()) { + options.getRetryReads(), DB.this.getTimeoutSettings()) { @Override public ReadOperationCursor asReadOperation() { - return new ListCollectionsOperation<>(name, commandCodec).nameOnly(true); + return new ListCollectionsOperation<>(name, commandCodec, options.getMaxAdaptiveRetries()).nameOnly(true); } @Override diff --git a/driver-legacy/src/main/com/mongodb/DBCollection.java b/driver-legacy/src/main/com/mongodb/DBCollection.java index 7e460af74ba..55290072d3a 100644 --- a/driver-legacy/src/main/com/mongodb/DBCollection.java +++ b/driver-legacy/src/main/com/mongodb/DBCollection.java @@ -139,6 +139,8 @@ public class DBCollection { private final OperationExecutor executor; private final boolean retryWrites; private final boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private volatile ReadPreference readPreference; private volatile WriteConcern writeConcern; private volatile ReadConcern readConcern; @@ -161,8 +163,10 @@ public class DBCollection { this.executor = executor; this.objectFactory = new DBCollectionObjectFactory(); this.objectCodec = new CompoundDBObjectCodec(getDefaultDBObjectCodec()); - this.retryWrites = database.getMongoClient().getMongoClientOptions().getRetryWrites(); - this.retryReads = database.getMongoClient().getMongoClientOptions().getRetryReads(); + MongoClientOptions options = database.getMongoClient().getMongoClientOptions(); + this.retryWrites = options.getRetryWrites(); + this.retryReads = options.getRetryReads(); + this.maxAdaptiveRetriesSetting = options.getMaxAdaptiveRetries(); } /** @@ -348,7 +352,7 @@ private Encoder toEncoder(@Nullable final DBEncoder dbEncoder) { private WriteResult insert(final List insertRequestList, final WriteConcern writeConcern, final boolean continueOnError, @Nullable final Boolean bypassDocumentValidation) { return executeWriteOperation(createBulkWriteOperationForInsert(getNamespace(), - !continueOnError, writeConcern, retryWrites, insertRequestList).bypassDocumentValidation(bypassDocumentValidation)); + !continueOnError, writeConcern, retryWrites, maxAdaptiveRetriesSetting, insertRequestList).bypassDocumentValidation(bypassDocumentValidation)); } WriteResult executeWriteOperation(final LegacyMixedBulkWriteOperation operation) { @@ -432,7 +436,7 @@ private WriteResult replaceOrInsert(final DBObject obj, final Object id, final W Type.REPLACE).upsert(true); return executeWriteOperation(createBulkWriteOperationForReplace(getNamespace(), false, - writeConcern, retryWrites, singletonList(replaceRequest))); + writeConcern, retryWrites, maxAdaptiveRetriesSetting, singletonList(replaceRequest))); } /** @@ -584,9 +588,9 @@ public WriteResult update(final DBObject query, final DBObject update, final DBC .collation(options.getCollation()) .arrayFilters(wrapAllowNull(options.getArrayFilters(), options.getEncoder())); LegacyMixedBulkWriteOperation operation = (updateType == UPDATE - ? createBulkWriteOperationForUpdate(getNamespace(), true, writeConcern, retryWrites, + ? createBulkWriteOperationForUpdate(getNamespace(), true, writeConcern, retryWrites, maxAdaptiveRetriesSetting, singletonList(updateRequest)) - : createBulkWriteOperationForReplace(getNamespace(), true, writeConcern, retryWrites, + : createBulkWriteOperationForReplace(getNamespace(), true, writeConcern, retryWrites, maxAdaptiveRetriesSetting, singletonList(updateRequest))) .bypassDocumentValidation(options.getBypassDocumentValidation()); return executeWriteOperation(operation); @@ -660,7 +664,7 @@ public WriteResult remove(final DBObject query, final DBCollectionRemoveOptions WriteConcern writeConcern = optionsWriteConcern != null ? optionsWriteConcern : getWriteConcern(); DeleteRequest deleteRequest = new DeleteRequest(wrap(query, options.getEncoder())).collation(options.getCollation()); return executeWriteOperation(createBulkWriteOperationForDelete(getNamespace(), false, - writeConcern, retryWrites, singletonList(deleteRequest))); + writeConcern, retryWrites, maxAdaptiveRetriesSetting, singletonList(deleteRequest))); } /** @@ -672,7 +676,12 @@ public WriteResult remove(final DBObject query, final DBCollectionRemoveOptions * @mongodb.driver.manual tutorial/query-documents/ Querying */ public DBCursor find(final DBObject query) { - return new DBCursor(this, query, null, getReadPreference()); + return new DBCursor( + this, + query, + new DBCollectionFindOptions().readPreference(getReadPreference()), + retryReads, + maxAdaptiveRetriesSetting); } /** @@ -685,7 +694,12 @@ public DBCursor find(final DBObject query) { * @mongodb.driver.manual tutorial/query-documents/ Querying */ public DBCursor find(final DBObject query, final DBObject projection) { - return new DBCursor(this, query, projection, getReadPreference()); + return new DBCursor( + this, + query, + new DBCollectionFindOptions().projection(projection).readPreference(getReadPreference()), + retryReads, + maxAdaptiveRetriesSetting); } /** @@ -709,7 +723,7 @@ public DBCursor find() { * @since 3.4 */ public DBCursor find(@Nullable final DBObject query, final DBCollectionFindOptions options) { - return new DBCursor(this, query, options); + return new DBCursor(this, query, options, retryReads, maxAdaptiveRetriesSetting); } /** @@ -918,7 +932,8 @@ public long getCount(@Nullable final DBObject query) { public long getCount(@Nullable final DBObject query, final DBCollectionCountOptions options) { notNull("countOptions", options); CountOperation operation = new CountOperation( - getNamespace()) + getNamespace(), + maxAdaptiveRetriesSetting) .skip(options.getSkip()) .limit(options.getLimit()) .collation(options.getCollation()) @@ -1039,7 +1054,7 @@ public List distinct(final String fieldName, final DBCollectionDistinctOptions o retryReads, DBCollection.this.getTimeoutSettings()) { @Override public ReadOperationCursor asReadOperation() { - return new DistinctOperation<>(getNamespace(), fieldName, new BsonValueCodec()) + return new DistinctOperation<>(getNamespace(), fieldName, new BsonValueCodec(), maxAdaptiveRetriesSetting) .filter(wrapAllowNull(options.getFilter())) .collation(options.getCollation()) .retryReads(retryReads); @@ -1244,14 +1259,16 @@ public Cursor aggregate(final List pipeline, final Aggregati getExecutor(createTimeoutSettings(getTimeoutSettings(), options)) .execute(operation, getReadPreference(), getReadConcern(), null); result = new DBCursor(database.getCollection(outCollection.asString().getValue()), new BasicDBObject(), - new DBCollectionFindOptions().readPreference(primary()).collation(options.getCollation())); + new DBCollectionFindOptions().readPreference(primary()).collation(options.getCollation()), + retryReads, maxAdaptiveRetriesSetting); } catch (MongoWriteConcernException e) { throw createWriteConcernException(e); } } else { AggregateOperation operation = new AggregateOperation<>( getNamespace(), stages, - getDefaultDBObjectCodec()) + getDefaultDBObjectCodec(), + maxAdaptiveRetriesSetting) .allowDiskUse(options.getAllowDiskUse()) .batchSize(options.getBatchSize()) .collation(options.getCollation()) @@ -1277,7 +1294,8 @@ public Cursor aggregate(final List pipeline, final Aggregati public CommandResult explainAggregate(final List pipeline, final AggregationOptions options) { AggregateOperation operation = new AggregateOperation<>( getNamespace(), - preparePipeline(pipeline), new BsonDocumentCodec()) + preparePipeline(pipeline), new BsonDocumentCodec(), + maxAdaptiveRetriesSetting) .allowDiskUse(options.getAllowDiskUse()) .collation(options.getCollation()) .retryReads(retryReads); @@ -1666,7 +1684,7 @@ public DBObject findAndModify(final DBObject query, final DBCollectionFindAndMod WriteConcern writeConcern = optionsWriteConcern != null ? optionsWriteConcern : getWriteConcern(); WriteOperation operation; if (options.isRemove()) { - operation = new FindAndDeleteOperation<>(getNamespace(), writeConcern, retryWrites, objectCodec) + operation = new FindAndDeleteOperation<>(getNamespace(), writeConcern, retryWrites, maxAdaptiveRetriesSetting, objectCodec) .filter(wrapAllowNull(query)) .projection(wrapAllowNull(options.getProjection())) .sort(wrapAllowNull(options.getSort())) @@ -1677,7 +1695,7 @@ public DBObject findAndModify(final DBObject query, final DBCollectionFindAndMod throw new IllegalArgumentException("update can not be null unless it's a remove"); } if (!update.keySet().isEmpty() && update.keySet().iterator().next().charAt(0) == '$') { - operation = new FindAndUpdateOperation<>(getNamespace(), writeConcern, retryWrites, + operation = new FindAndUpdateOperation<>(getNamespace(), writeConcern, retryWrites, maxAdaptiveRetriesSetting, objectCodec, wrap(update)) .filter(wrap(query)) .projection(wrapAllowNull(options.getProjection())) @@ -1688,7 +1706,7 @@ objectCodec, wrap(update)) .collation(options.getCollation()) .arrayFilters(wrapAllowNull(options.getArrayFilters(), (Encoder) null)); } else { - operation = new FindAndReplaceOperation<>(getNamespace(), writeConcern, retryWrites, + operation = new FindAndReplaceOperation<>(getNamespace(), writeConcern, retryWrites, maxAdaptiveRetriesSetting, objectCodec, wrap(update)) .filter(wrap(query)) .projection(wrapAllowNull(options.getProjection())) @@ -1874,7 +1892,8 @@ public List getIndexInfo() { DBCollection.this.getTimeoutSettings()) { @Override public ReadOperationCursor asReadOperation() { - return new ListIndexesOperation<>(getNamespace(), getDefaultDBObjectCodec()) + return new ListIndexesOperation<>(getNamespace(), getDefaultDBObjectCodec(), + maxAdaptiveRetriesSetting) .retryReads(retryReads); } @@ -2027,7 +2046,7 @@ BulkWriteResult executeBulkWriteOperation(final boolean ordered, final Boolean b final WriteConcern writeConcern) { try { return translateBulkWriteResult(executor.execute(new MixedBulkWriteOperation( - getNamespace(), translateWriteRequestsToNew(writeRequests), ordered, writeConcern, false) + getNamespace(), translateWriteRequestsToNew(writeRequests), ordered, writeConcern, false, maxAdaptiveRetriesSetting) .bypassDocumentValidation(bypassDocumentValidation), getReadConcern()), getObjectCodec()); } catch (MongoBulkWriteException e) { throw BulkWriteHelper.translateBulkWriteException(e, MongoClient.getDefaultCodecRegistry().get(DBObject.class)); diff --git a/driver-legacy/src/main/com/mongodb/DBCursor.java b/driver-legacy/src/main/com/mongodb/DBCursor.java index 9b91bad5984..4928425ee1e 100644 --- a/driver-legacy/src/main/com/mongodb/DBCursor.java +++ b/driver-legacy/src/main/com/mongodb/DBCursor.java @@ -73,6 +73,8 @@ public class DBCursor implements Cursor, Iterable { private final DBCollectionFindOptions findOptions; private final OperationExecutor executor; private final boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private DBDecoderFactory decoderFactory; private Decoder decoder; private IteratorOrArray iteratorOrArray; @@ -107,22 +109,18 @@ public DBCursor(final DBCollection collection, final DBObject query, @Nullable f */ public DBCursor(final DBCollection collection, final DBObject query, @Nullable final DBObject fields, @Nullable final ReadPreference readPreference, final boolean retryReads) { - this(collection, query, new DBCollectionFindOptions().projection(fields).readPreference(readPreference), retryReads); - } - - DBCursor(final DBCollection collection, @Nullable final DBObject filter, final DBCollectionFindOptions findOptions) { - this(collection, filter, findOptions, true); + this(collection, query, new DBCollectionFindOptions().projection(fields).readPreference(readPreference), retryReads, null); } DBCursor(final DBCollection collection, @Nullable final DBObject filter, final DBCollectionFindOptions findOptions, - final boolean retryReads) { + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting) { this(collection, filter, findOptions, collection.getExecutor(), collection.getDBDecoderFactory(), - collection.getObjectCodec(), retryReads); + collection.getObjectCodec(), retryReads, maxAdaptiveRetriesSetting); } private DBCursor(final DBCollection collection, @Nullable final DBObject filter, final DBCollectionFindOptions findOptions, final OperationExecutor executor, final DBDecoderFactory decoderFactory, final Decoder decoder, - final boolean retryReads) { + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting) { this.collection = notNull("collection", collection); this.filter = filter; this.executor = notNull("executor", executor); @@ -130,6 +128,7 @@ private DBCursor(final DBCollection collection, @Nullable final DBObject filter, this.decoderFactory = decoderFactory; this.decoder = notNull("decoder", decoder); this.retryReads = retryReads; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } /** @@ -138,7 +137,7 @@ private DBCursor(final DBCollection collection, @Nullable final DBObject filter, * @return the new cursor */ public DBCursor copy() { - return new DBCursor(collection, filter, findOptions, executor, decoderFactory, decoder, retryReads); + return new DBCursor(collection, filter, findOptions, executor, decoderFactory, decoder, retryReads, maxAdaptiveRetriesSetting); } /** @@ -415,7 +414,8 @@ public DBCursor partial(final boolean partial) { private FindOperation getQueryOperation(final Decoder decoder) { return new FindOperation<>( - collection.getNamespace(), decoder) + collection.getNamespace(), decoder, + maxAdaptiveRetriesSetting) .filter(collection.wrapAllowNull(filter)) .batchSize(findOptions.getBatchSize()) .skip(findOptions.getSkip()) diff --git a/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java b/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java index 1538324b861..3a5e135dc43 100644 --- a/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java +++ b/driver-legacy/src/main/com/mongodb/LegacyMixedBulkWriteOperation.java @@ -55,33 +55,48 @@ final class LegacyMixedBulkWriteOperation implements WriteOperation insertRequests) { - return new LegacyMixedBulkWriteOperation(namespace, ordered, writeConcern, retryWrites, insertRequests, INSERT); + final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, + final List insertRequests) { + return new LegacyMixedBulkWriteOperation(namespace, ordered, writeConcern, retryWrites, maxAdaptiveRetriesSetting, insertRequests, INSERT); } static LegacyMixedBulkWriteOperation createBulkWriteOperationForUpdate(final MongoNamespace namespace, final boolean ordered, - final WriteConcern writeConcern, final boolean retryWrites, final List updateRequests) { + final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, + final List updateRequests) { assertTrue(updateRequests.stream().allMatch(updateRequest -> updateRequest.getType() == UPDATE)); - return new LegacyMixedBulkWriteOperation(namespace, ordered, writeConcern, retryWrites, updateRequests, UPDATE); + return new LegacyMixedBulkWriteOperation(namespace, ordered, writeConcern, retryWrites, maxAdaptiveRetriesSetting, updateRequests, UPDATE); } static LegacyMixedBulkWriteOperation createBulkWriteOperationForReplace(final MongoNamespace namespace, final boolean ordered, - final WriteConcern writeConcern, final boolean retryWrites, final List replaceRequests) { + final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, + final List replaceRequests) { assertTrue(replaceRequests.stream().allMatch(updateRequest -> updateRequest.getType() == REPLACE)); - return new LegacyMixedBulkWriteOperation(namespace, ordered, writeConcern, retryWrites, replaceRequests, REPLACE); + return new LegacyMixedBulkWriteOperation(namespace, ordered, writeConcern, retryWrites, maxAdaptiveRetriesSetting, replaceRequests, REPLACE); } static LegacyMixedBulkWriteOperation createBulkWriteOperationForDelete(final MongoNamespace namespace, final boolean ordered, - final WriteConcern writeConcern, final boolean retryWrites, final List deleteRequests) { - return new LegacyMixedBulkWriteOperation(namespace, ordered, writeConcern, retryWrites, deleteRequests, DELETE); + final WriteConcern writeConcern, + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, + final List deleteRequests) { + return new LegacyMixedBulkWriteOperation(namespace, ordered, writeConcern, retryWrites, maxAdaptiveRetriesSetting, deleteRequests, DELETE); } private LegacyMixedBulkWriteOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern, - final boolean retryWrites, final List writeRequests, final WriteRequest.Type type) { + final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, + final List writeRequests, + final WriteRequest.Type type) { notNull("writeRequests", writeRequests); isTrueArgument("writeRequests is not an empty list", !writeRequests.isEmpty()); this.type = type; - this.wrappedOperation = new MixedBulkWriteOperation(namespace, writeRequests, ordered, writeConcern, retryWrites); + this.wrappedOperation = new MixedBulkWriteOperation(namespace, writeRequests, ordered, writeConcern, retryWrites, maxAdaptiveRetriesSetting); } List getWriteRequests() { diff --git a/driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy index 98cb8282c17..785044308eb 100644 --- a/driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy +++ b/driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy @@ -272,7 +272,8 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), - collection.getObjectCodec()) + collection.getObjectCodec(), + null) .filter(new BsonDocument()) .retryReads(true)) @@ -282,7 +283,8 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), - collection.getObjectCodec()) + collection.getObjectCodec(), + null) .filter(new BsonDocument()) .retryReads(true)) @@ -292,7 +294,8 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), - collection.getObjectCodec()) + collection.getObjectCodec(), + null) .filter(new BsonDocument()) .collation(collation) .retryReads(true)) @@ -315,7 +318,8 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), - collection.getObjectCodec()) + collection.getObjectCodec(), + null) .filter(new BsonDocument()) .limit(-1) .retryReads(true)) @@ -326,7 +330,8 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), - collection.getObjectCodec()) + collection.getObjectCodec(), + null) .filter(new BsonDocument()) .limit(-1) .retryReads(true)) @@ -337,7 +342,8 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), - collection.getObjectCodec()) + collection.getObjectCodec(), + null) .filter(new BsonDocument()) .limit(-1) .collation(collation) @@ -358,7 +364,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(new FindAndDeleteOperation(collection. - getNamespace(), WriteConcern.ACKNOWLEDGED, retryWrites, collection.getObjectCodec()).filter(new BsonDocument())) + getNamespace(), WriteConcern.ACKNOWLEDGED, retryWrites, null, collection.getObjectCodec()).filter(new BsonDocument())) } def 'findAndModify should create the correct FindAndUpdateOperation'() { @@ -378,7 +384,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(new FindAndUpdateOperation(collection.getNamespace(), - WriteConcern.ACKNOWLEDGED, retryWrites, collection.getObjectCodec(), bsonUpdate) + WriteConcern.ACKNOWLEDGED, retryWrites, null, collection.getObjectCodec(), bsonUpdate) .filter(new BsonDocument())) when: // With options @@ -387,7 +393,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(new FindAndUpdateOperation(collection.getNamespace(), WriteConcern.W3, - retryWrites, collection.getObjectCodec(), bsonUpdate) + retryWrites, null, collection.getObjectCodec(), bsonUpdate) .filter(new BsonDocument()) .collation(collation) .arrayFilters(bsonDocumentWrapperArrayFilters)) @@ -415,7 +421,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(new FindAndReplaceOperation(collection. - getNamespace(), WriteConcern.ACKNOWLEDGED, retryWrites, collection.getObjectCodec(), bsonReplace) + getNamespace(), WriteConcern.ACKNOWLEDGED, retryWrites, null, collection.getObjectCodec(), bsonReplace) .filter(new BsonDocument())) when: // With options @@ -424,7 +430,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(new FindAndReplaceOperation(collection.getNamespace(), WriteConcern.W3, - retryWrites, collection.getObjectCodec(), bsonReplace) + retryWrites, null, collection.getObjectCodec(), bsonReplace) .filter(new BsonDocument()) .collation(collation)) } @@ -439,7 +445,7 @@ class DBCollectionSpecification extends Specification { collection.count() then: - expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace()) + expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace(), null) .filter(new BsonDocument()).retryReads(true)) when: // Inherits from DB @@ -448,7 +454,7 @@ class DBCollectionSpecification extends Specification { executor.getReadConcern() == ReadConcern.MAJORITY then: - expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace()) + expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace(), null) .filter(new BsonDocument()).retryReads(true)) executor.getReadConcern() == ReadConcern.MAJORITY @@ -457,7 +463,7 @@ class DBCollectionSpecification extends Specification { collection.count(new BasicDBObject(), new DBCollectionCountOptions().collation(collation)) then: - expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace()) + expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace(), null) .filter(new BsonDocument()).retryReads(true) .collation(collation)) executor.getReadConcern() == ReadConcern.LOCAL @@ -485,7 +491,7 @@ class DBCollectionSpecification extends Specification { then: distinctFieldValues == [1, 2] expect executor.getReadOperation(), isTheSameAs(new DistinctOperation(collection.getNamespace(), 'field1', - new BsonValueCodec()).filter(new BsonDocument()).retryReads(true)) + new BsonValueCodec(), null).filter(new BsonDocument()).retryReads(true)) executor.getReadConcern() == ReadConcern.DEFAULT when: // Inherits from DB @@ -494,7 +500,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new DistinctOperation(collection.getNamespace(), 'field1', - new BsonValueCodec()) + new BsonValueCodec(), null) .filter(new BsonDocument()).retryReads(true)) executor.getReadConcern() == ReadConcern.MAJORITY @@ -504,7 +510,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new DistinctOperation(collection.getNamespace(), 'field1', - new BsonValueCodec()).collation(collation).retryReads(true)) + new BsonValueCodec(), null).collation(collation).retryReads(true)) executor.getReadConcern() == ReadConcern.LOCAL } @@ -620,7 +626,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), - bsonPipeline, collection.getDefaultDBObjectCodec()).retryReads(true)) + bsonPipeline, collection.getDefaultDBObjectCodec(), null).retryReads(true)) executor.getReadConcern() == ReadConcern.DEFAULT when: // Inherits from DB @@ -629,7 +635,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), - bsonPipeline, collection.getDefaultDBObjectCodec()).retryReads(true)) + bsonPipeline, collection.getDefaultDBObjectCodec(), null).retryReads(true)) executor.getReadConcern() == ReadConcern.MAJORITY when: @@ -638,7 +644,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), - bsonPipeline, collection.getDefaultDBObjectCodec()).collation(collation).retryReads(true)) + bsonPipeline, collection.getDefaultDBObjectCodec(), null).collation(collation).retryReads(true)) executor.getReadConcern() == ReadConcern.LOCAL } @@ -687,7 +693,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), - bsonPipeline, collection.getDefaultDBObjectCodec()).retryReads(true).collation(collation) + bsonPipeline, collection.getDefaultDBObjectCodec(), null).retryReads(true).collation(collation) .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER, new BsonDocumentCodec())) when: // Inherits from DB @@ -696,7 +702,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), - bsonPipeline, collection.getDefaultDBObjectCodec()).retryReads(true).collation(collation) + bsonPipeline, collection.getDefaultDBObjectCodec(), null).retryReads(true).collation(collation) .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER, new BsonDocumentCodec())) when: @@ -705,7 +711,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), - bsonPipeline, collection.getDefaultDBObjectCodec()).retryReads(true).collation(collation) + bsonPipeline, collection.getDefaultDBObjectCodec(), null).retryReads(true).collation(collation) .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER, new BsonDocumentCodec())) } @@ -726,7 +732,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(createBulkWriteOperationForUpdate(collection.getNamespace(), - true, WriteConcern.ACKNOWLEDGED, retryWrites, asList(updateRequest))) + true, WriteConcern.ACKNOWLEDGED, retryWrites, null, asList(updateRequest))) when: // Inherits from DB db.setWriteConcern(WriteConcern.W3) @@ -735,7 +741,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(createBulkWriteOperationForUpdate(collection.getNamespace(), - true, WriteConcern.W3, retryWrites, asList(updateRequest))) + true, WriteConcern.W3, retryWrites, null, asList(updateRequest))) when: collection.setWriteConcern(WriteConcern.W1) @@ -745,7 +751,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(createBulkWriteOperationForUpdate(collection.getNamespace(), - true, WriteConcern.W1, retryWrites, asList(updateRequest.arrayFilters(bsonDocumentWrapperArrayFilters)))) + true, WriteConcern.W1, retryWrites, null, asList(updateRequest.arrayFilters(bsonDocumentWrapperArrayFilters)))) where: dbObjectArrayFilters << [null, [], [new BasicDBObject('i.b', 1)]] @@ -768,7 +774,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(createBulkWriteOperationForDelete(collection.getNamespace(), - false, WriteConcern.ACKNOWLEDGED, retryWrites, asList(deleteRequest))) + false, WriteConcern.ACKNOWLEDGED, retryWrites, null, asList(deleteRequest))) when: // Inherits from DB db.setWriteConcern(WriteConcern.W3) @@ -776,7 +782,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(createBulkWriteOperationForDelete(collection.getNamespace(), - false, WriteConcern.W3, retryWrites, asList(deleteRequest))) + false, WriteConcern.W3, retryWrites, null, asList(deleteRequest))) when: collection.setWriteConcern(WriteConcern.W1) @@ -785,7 +791,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(createBulkWriteOperationForDelete(collection.getNamespace(), - false, WriteConcern.W1, retryWrites, asList(deleteRequest))) + false, WriteConcern.W1, retryWrites, null, asList(deleteRequest))) } def 'should create the correct MixedBulkWriteOperation'() { @@ -818,7 +824,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(new MixedBulkWriteOperation(collection.getNamespace(), writeRequests, ordered, - WriteConcern.ACKNOWLEDGED, false)) + WriteConcern.ACKNOWLEDGED, false, null)) when: // Inherits from DB db.setWriteConcern(WriteConcern.W3) @@ -826,7 +832,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(new MixedBulkWriteOperation(collection.getNamespace(), - writeRequests, ordered, WriteConcern.W3, false)) + writeRequests, ordered, WriteConcern.W3, false, null)) when: collection.setWriteConcern(WriteConcern.W1) @@ -834,7 +840,7 @@ class DBCollectionSpecification extends Specification { then: expect executor.getWriteOperation(), isTheSameAs(new MixedBulkWriteOperation(collection.getNamespace(), - writeRequests, ordered, WriteConcern.W1, false)) + writeRequests, ordered, WriteConcern.W1, false, null)) where: ordered << [true, false, true] diff --git a/driver-legacy/src/test/functional/com/mongodb/DBTest.java b/driver-legacy/src/test/functional/com/mongodb/DBTest.java index b483e326081..5b92651fbcf 100644 --- a/driver-legacy/src/test/functional/com/mongodb/DBTest.java +++ b/driver-legacy/src/test/functional/com/mongodb/DBTest.java @@ -343,7 +343,7 @@ public void shouldApplyUuidRepresentationToCommandEncodingAndDecoding() { } BsonDocument getCollectionInfo(final String collectionName) { - return new ListCollectionsOperation<>(getDefaultDatabaseName(), new BsonDocumentCodec()) + return new ListCollectionsOperation<>(getDefaultDatabaseName(), new BsonDocumentCodec(), null) .filter(new BsonDocument("name", new BsonString(collectionName))).execute(getBinding(), ClusterFixture.createOperationContext()).next().get(0); } diff --git a/driver-legacy/src/test/functional/com/mongodb/LegacyMixedBulkWriteOperationSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/LegacyMixedBulkWriteOperationSpecification.groovy index 2db1da67e22..2eb508fc49a 100644 --- a/driver-legacy/src/test/functional/com/mongodb/LegacyMixedBulkWriteOperationSpecification.groovy +++ b/driver-legacy/src/test/functional/com/mongodb/LegacyMixedBulkWriteOperationSpecification.groovy @@ -45,7 +45,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec def 'should throw IllegalArgumentException for empty list of requests'() { when: - createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, true, []) + createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, true, null, []) then: thrown(IllegalArgumentException) @@ -55,7 +55,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec given: def inserts = [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))), new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))] - def operation = createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, inserts) + def operation = createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, null, inserts) when: def result = execute(operation) @@ -72,7 +72,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec def 'should insert a single document'() { given: def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1))) - def operation = createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, asList(insert)) + def operation = createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, null, asList(insert)) when: execute(operation) @@ -84,7 +84,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec def 'should execute unacknowledged write'() { given: def binding = getSingleConnectionBinding() - def operation = createBulkWriteOperationForInsert(getNamespace(), true, UNACKNOWLEDGED, false, + def operation = createBulkWriteOperationForInsert(getNamespace(), true, UNACKNOWLEDGED, false, null, [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))), new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))]) @@ -106,7 +106,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec new InsertRequest(new BsonDocument('_id', new BsonInt32(1))), new InsertRequest(new BsonDocument('_id', new BsonInt32(2))), ] - def operation = createBulkWriteOperationForInsert(getNamespace(), false, ACKNOWLEDGED, false, documents) + def operation = createBulkWriteOperationForInsert(getNamespace(), false, ACKNOWLEDGED, false, null, documents) when: execute(operation) @@ -123,7 +123,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec new InsertRequest(new BsonDocument('_id', new BsonInt32(1))), new InsertRequest(new BsonDocument('_id', new BsonInt32(2))), ] - def operation = createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, documents) + def operation = createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, null, documents) when: execute(operation) @@ -137,7 +137,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec def 'should support retryable writes'() { given: def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1))) - def operation = createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, true, asList(insert)) + def operation = createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, true, null, asList(insert)) when: executeWithSession(operation, false) @@ -149,7 +149,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec def 'should remove a document'() { given: getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1)) - def operation = createBulkWriteOperationForDelete(getNamespace(), true, ACKNOWLEDGED, false, + def operation = createBulkWriteOperationForDelete(getNamespace(), true, ACKNOWLEDGED, false, null, [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))]) when: @@ -167,7 +167,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec given: def replacement = new UpdateRequest(new BsonDocument(), new BsonDocument('_id', new BsonInt32(1)), REPLACE) def operation = createBulkWriteOperationForReplace(getNamespace(), true, ACKNOWLEDGED, - false, asList(replacement)) + false, null, asList(replacement)) when: def result = execute(operation) @@ -183,13 +183,13 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec given: def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1))) def binding = getBinding() - createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, asList(insert)) + createBulkWriteOperationForInsert(getNamespace(), true, ACKNOWLEDGED, false, null, asList(insert)) .execute(binding, ClusterFixture.createOperationContext(binding.getReadPreference())) def replacement = new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)), new BsonDocument('_id', new BsonInt32(1)).append('x', new BsonInt32(1)), REPLACE) def operation = createBulkWriteOperationForReplace(getNamespace(), true, ACKNOWLEDGED, - false, asList(replacement)) + false, null, asList(replacement)) when: def result = execute(operation) @@ -209,7 +209,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec new BsonDocument('_id', new BsonInt32(1)).append('x', new BsonInt32(1)), REPLACE) .upsert(true) def operation = createBulkWriteOperationForReplace(getNamespace(), true, ACKNOWLEDGED, - false, asList(replacement)) + false, null, asList(replacement)) when: execute(operation) @@ -221,7 +221,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec def 'should update nothing if no documents match'() { given: def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, - false, asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)), + false, null, asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)), new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))), UPDATE).multi(false))) when: @@ -240,7 +240,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', 1), new Document('x', 1)) - def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, false, + def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, false, null, asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)), new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))), UPDATE).multi(false))) @@ -260,7 +260,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', 1), new Document('x', 1)) - def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, false, + def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, false, null, asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)), new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))), UPDATE).multi(true))) @@ -277,7 +277,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec def 'when upsert is true should insert a document if there are no matching documents'() { given: - def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, false, + def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, false, null, asList(new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)), new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))), UPDATE).upsert(true))) @@ -295,7 +295,7 @@ class LegacyMixedBulkWriteOperationSpecification extends OperationFunctionalSpec def 'should return correct result for upsert'() { given: def id = new ObjectId() - def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, false, + def operation = createBulkWriteOperationForUpdate(getNamespace(), true, ACKNOWLEDGED, false, null, asList(new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))), UPDATE).upsert(true))) diff --git a/driver-legacy/src/test/unit/com/mongodb/DBCursorSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/DBCursorSpecification.groovy index 59dceb6478a..d21914b281f 100644 --- a/driver-legacy/src/test/unit/com/mongodb/DBCursorSpecification.groovy +++ b/driver-legacy/src/test/unit/com/mongodb/DBCursorSpecification.groovy @@ -123,7 +123,8 @@ class DBCursorSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), - collection.getObjectCodec()) + collection.getObjectCodec(), + null) .filter(new BsonDocument()) .projection(new BsonDocument()) .retryReads(true)) @@ -142,7 +143,7 @@ class DBCursorSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs( - new FindOperation(collection.getNamespace(), collection.getObjectCodec()) + new FindOperation(collection.getNamespace(), collection.getObjectCodec(), null) .limit(-1) .filter(new BsonDocument()) .projection(new BsonDocument()) @@ -163,7 +164,7 @@ class DBCursorSpecification extends Specification { def readConcern = ReadConcern.LOCAL def readPreference = ReadPreference.nearest() def findOptions = new DBCollectionFindOptions() - def cursor = new DBCursor(collection, filter, findOptions) + def cursor = new DBCursor(collection, filter, findOptions, true, null) .setReadConcern(readConcern) .setReadPreference(readPreference) .setCollation(collation) @@ -181,7 +182,7 @@ class DBCursorSpecification extends Specification { then: expect executor.getReadOperation(), isTheSameAs( - new FindOperation(collection.getNamespace(), collection.getObjectCodec()) + new FindOperation(collection.getNamespace(), collection.getObjectCodec(), null) .batchSize(1) .collation(collation) .cursorType(cursorType) @@ -240,13 +241,13 @@ class DBCursorSpecification extends Specification { .returnKey(true) .showRecordId(true) - def cursor = new DBCursor(collection, filter, findOptions) + def cursor = new DBCursor(collection, filter, findOptions, true, null) when: cursor.toArray() then: - expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec()) + expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec(), null) .batchSize(1) .collation(collation) .cursorType(cursorType) @@ -280,7 +281,7 @@ class DBCursorSpecification extends Specification { then: result == 42 - expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace()) + expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace(), null) .filter(new BsonDocument()).retryReads(true)) executor.getReadConcern() == ReadConcern.MAJORITY } @@ -296,7 +297,7 @@ class DBCursorSpecification extends Specification { then: result == 42 - expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace()) + expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace(), null) .filter(new BsonDocument()).retryReads(true)) executor.getReadConcern() == ReadConcern.MAJORITY } diff --git a/driver-legacy/src/test/unit/com/mongodb/DBSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/DBSpecification.groovy index 5f0c81f28cc..c06dd67a3a3 100644 --- a/driver-legacy/src/test/unit/com/mongodb/DBSpecification.groovy +++ b/driver-legacy/src/test/unit/com/mongodb/DBSpecification.groovy @@ -197,7 +197,8 @@ class DBSpecification extends Specification { then: expect operation, isTheSameAs(new ListCollectionsOperation(databaseName, - new DBObjectCodec(getDefaultCodecRegistry())) + new DBObjectCodec(getDefaultCodecRegistry()), + null) .nameOnly(true)) when: @@ -206,7 +207,8 @@ class DBSpecification extends Specification { then: expect operation, isTheSameAs(new ListCollectionsOperation(databaseName, - new DBObjectCodec(getDefaultCodecRegistry())) + new DBObjectCodec(getDefaultCodecRegistry()), + null) .nameOnly(true)) } diff --git a/driver-legacy/src/test/unit/com/mongodb/MongoClientSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/MongoClientSpecification.groovy index f6a51e5607c..d9b37d5be00 100644 --- a/driver-legacy/src/test/unit/com/mongodb/MongoClientSpecification.groovy +++ b/driver-legacy/src/test/unit/com/mongodb/MongoClientSpecification.groovy @@ -347,7 +347,7 @@ class MongoClientSpecification extends Specification { then: expect database, isTheSameAs(new MongoDatabaseImpl('name', client.getCodecRegistry(), secondary(), - WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY, STANDARD, null, + WriteConcern.MAJORITY, true, true, null, ReadConcern.MAJORITY, STANDARD, null, TIMEOUT_SETTINGS.withMaxWaitTimeMS(120_000), client.getOperationExecutor())) } diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionPublisherImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionPublisherImpl.java index 511f9f62c6b..6239710139a 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionPublisherImpl.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionPublisherImpl.java @@ -48,9 +48,10 @@ final class ClientSessionPublisherImpl extends BaseClientSessionImpl implements ClientSession { - private final MongoClientImpl mongoClient; private final OperationExecutor executor; private final TracingManager tracingManager; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private TransactionState transactionState = TransactionState.NONE; private boolean messageSentInCurrentTransaction; private boolean commitInProgress; @@ -63,8 +64,8 @@ final class ClientSessionPublisherImpl extends BaseClientSessionImpl implements final ClientSessionOptions options, final OperationExecutor executor, final TracingManager tracingManager) { super(serverSessionPool, mongoClient, options); this.executor = executor; - this.mongoClient = mongoClient; this.tracingManager = tracingManager; + maxAdaptiveRetriesSetting = mongoClient.getSettings().getMaxAdaptiveRetries(); } @Override @@ -178,7 +179,7 @@ public Publisher commitTransaction() { WriteConcern writeConcern = assertNotNull(getWriteConcern(timeoutContext)); return executor .execute( - new CommitTransactionOperation(writeConcern, alreadyCommitted) + new CommitTransactionOperation(writeConcern, maxAdaptiveRetriesSetting, alreadyCommitted) .recoveryToken(getRecoveryToken()), readConcern, this) .doOnTerminate(() -> { commitInProgress = false; @@ -228,7 +229,7 @@ public Publisher abortTransaction() { TimeoutContext timeoutContext = getTimeoutContext(); WriteConcern writeConcern = assertNotNull(getWriteConcern(timeoutContext)); return executor - .execute(new AbortTransactionOperation(writeConcern) + .execute(new AbortTransactionOperation(writeConcern, maxAdaptiveRetriesSetting) .recoveryToken(getRecoveryToken()), readConcern, this) .onErrorResume(Throwable.class, (e) -> Mono.empty()) .doOnTerminate(() -> { diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MongoClientImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MongoClientImpl.java index dbcc27f5022..67153a35a95 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MongoClientImpl.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MongoClientImpl.java @@ -114,7 +114,7 @@ private MongoClientImpl(final MongoClientSettings settings, final MongoDriverInf settings.getUuidRepresentation()), settings.getReadPreference(), settings.getReadConcern(), settings.getWriteConcern(), - settings.getRetryWrites(), settings.getRetryReads(), + settings.getRetryWrites(), settings.getRetryReads(), settings.getMaxAdaptiveRetries(), settings.getUuidRepresentation(), settings.getAutoEncryptionSettings(), timeoutSettings, diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MongoOperationPublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MongoOperationPublisher.java index 84c810f1b5e..582453be5ea 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MongoOperationPublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MongoOperationPublisher.java @@ -95,6 +95,8 @@ public final class MongoOperationPublisher { private final Operations operations; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private final UuidRepresentation uuidRepresentation; @Nullable private final AutoEncryptionSettings autoEncryptionSettings; @@ -102,24 +104,27 @@ public final class MongoOperationPublisher { MongoOperationPublisher( final Class documentClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, - final ReadConcern readConcern, final WriteConcern writeConcern, final boolean retryWrites, final boolean retryReads, + final ReadConcern readConcern, final WriteConcern writeConcern, + final boolean retryWrites, final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final UuidRepresentation uuidRepresentation, @Nullable final AutoEncryptionSettings autoEncryptionSettings, final TimeoutSettings timeoutSettings, final OperationExecutor executor) { this(new MongoNamespace("_ignored", "_ignored"), documentClass, - codecRegistry, readPreference, readConcern, writeConcern, retryWrites, retryReads, + codecRegistry, readPreference, readConcern, writeConcern, retryWrites, retryReads, maxAdaptiveRetriesSetting, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } MongoOperationPublisher( final MongoNamespace namespace, final Class documentClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern, final WriteConcern writeConcern, - final boolean retryWrites, final boolean retryReads, final UuidRepresentation uuidRepresentation, + final boolean retryWrites, final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, + final UuidRepresentation uuidRepresentation, @Nullable final AutoEncryptionSettings autoEncryptionSettings, final TimeoutSettings timeoutSettings, final OperationExecutor executor) { this.operations = new Operations<>(namespace, notNull("documentClass", documentClass), notNull("readPreference", readPreference), notNull("codecRegistry", codecRegistry), notNull("readConcern", readConcern), notNull("writeConcern", writeConcern), - retryWrites, retryReads, timeoutSettings); + retryWrites, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation); this.autoEncryptionSettings = autoEncryptionSettings; this.executor = notNull("executor", executor); @@ -194,14 +199,14 @@ MongoOperationPublisher withNamespaceAndDocumentClass(final MongoNamespac } return new MongoOperationPublisher<>(notNull("namespace", namespace), notNull("documentClass", documentClass), getCodecRegistry(), getReadPreference(), getReadConcern(), getWriteConcern(), getRetryWrites(), getRetryReads(), - uuidRepresentation, autoEncryptionSettings, getTimeoutSettings(), executor); + maxAdaptiveRetriesSetting, uuidRepresentation, autoEncryptionSettings, getTimeoutSettings(), executor); } MongoOperationPublisher withCodecRegistry(final CodecRegistry codecRegistry) { return new MongoOperationPublisher<>(getNamespace(), getDocumentClass(), withUuidRepresentation(notNull("codecRegistry", codecRegistry), uuidRepresentation), getReadPreference(), getReadConcern(), getWriteConcern(), getRetryWrites(), getRetryReads(), - uuidRepresentation, autoEncryptionSettings, getTimeoutSettings(), executor); + maxAdaptiveRetriesSetting, uuidRepresentation, autoEncryptionSettings, getTimeoutSettings(), executor); } MongoOperationPublisher withReadPreference(final ReadPreference readPreference) { @@ -210,7 +215,7 @@ MongoOperationPublisher withReadPreference(final ReadPreference readPreferenc } return new MongoOperationPublisher<>(getNamespace(), getDocumentClass(), getCodecRegistry(), notNull("readPreference", readPreference), getReadConcern(), getWriteConcern(), getRetryWrites(), getRetryReads(), - uuidRepresentation, autoEncryptionSettings, getTimeoutSettings(), executor); + maxAdaptiveRetriesSetting, uuidRepresentation, autoEncryptionSettings, getTimeoutSettings(), executor); } MongoOperationPublisher withWriteConcern(final WriteConcern writeConcern) { @@ -218,8 +223,8 @@ MongoOperationPublisher withWriteConcern(final WriteConcern writeConcern) { return this; } return new MongoOperationPublisher<>(getNamespace(), getDocumentClass(), getCodecRegistry(), getReadPreference(), getReadConcern(), - notNull("writeConcern", writeConcern), getRetryWrites(), getRetryReads(), uuidRepresentation, autoEncryptionSettings, - getTimeoutSettings(), executor); + notNull("writeConcern", writeConcern), getRetryWrites(), getRetryReads(), + maxAdaptiveRetriesSetting, uuidRepresentation, autoEncryptionSettings, getTimeoutSettings(), executor); } MongoOperationPublisher withReadConcern(final ReadConcern readConcern) { @@ -228,7 +233,7 @@ MongoOperationPublisher withReadConcern(final ReadConcern readConcern) { } return new MongoOperationPublisher<>(getNamespace(), getDocumentClass(), getCodecRegistry(), getReadPreference(), notNull("readConcern", readConcern), - getWriteConcern(), getRetryWrites(), getRetryReads(), uuidRepresentation, + getWriteConcern(), getRetryWrites(), getRetryReads(), maxAdaptiveRetriesSetting, uuidRepresentation, autoEncryptionSettings, getTimeoutSettings(), executor); } @@ -239,7 +244,7 @@ MongoOperationPublisher withTimeout(final long timeout, final TimeUnit timeUn } return new MongoOperationPublisher<>(getNamespace(), getDocumentClass(), getCodecRegistry(), getReadPreference(), getReadConcern(), - getWriteConcern(), getRetryWrites(), getRetryReads(), uuidRepresentation, + getWriteConcern(), getRetryWrites(), getRetryReads(), maxAdaptiveRetriesSetting, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/RetryableWritesProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/RetryableWritesProseTest.java index fe1bcdfb97c..3b1e0e9f287 100644 --- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/RetryableWritesProseTest.java +++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/RetryableWritesProseTest.java @@ -18,7 +18,6 @@ import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient; import org.bson.Document; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.util.concurrent.TimeoutException; @@ -77,7 +76,6 @@ void retriesOnSameMongosWhenAnotherNotAvailable() { * Case 1: Test that drivers return the correct error when receiving only errors without NoWritesPerformed. */ @Test - @Disabled("TODO-BACKPRESSURE Valentin Enable when implementing JAVA-6055") void errorPropagationAfterEncounteringMultipleErrorsCase1() throws Exception { com.mongodb.client.RetryableWritesProseTest.errorPropagationAfterEncounteringMultipleErrorsCase1(SyncMongoClient::new); } diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/UnifiedClientBackpressureTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/UnifiedClientBackpressureTest.java new file mode 100644 index 00000000000..c8b398c0858 --- /dev/null +++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/UnifiedClientBackpressureTest.java @@ -0,0 +1,27 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.reactivestreams.client.unified; + +import org.junit.jupiter.params.provider.Arguments; + +import java.util.Collection; + +final class UnifiedClientBackpressureTest extends UnifiedReactiveStreamsTest { + private static Collection data() { + return getTestData("client-backpressure"); + } +} diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/AggregatePublisherImplTest.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/AggregatePublisherImplTest.java index cfbf5a0a5b8..f065d83fe77 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/AggregatePublisherImplTest.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/AggregatePublisherImplTest.java @@ -59,7 +59,8 @@ void shouldBuildTheExpectedOperation() { new AggregatePublisherImpl<>(null, createMongoOperationPublisher(executor), pipeline, AggregationLevel.COLLECTION); AggregateOperation expectedOperation = new AggregateOperation<>(NAMESPACE, pipeline, - getDefaultCodecRegistry().get(Document.class)) + getDefaultCodecRegistry().get(Document.class), + null) .batchSize(Integer.MAX_VALUE) .retryReads(true); @@ -80,8 +81,10 @@ void shouldBuildTheExpectedOperation() { .maxAwaitTime(1001, MILLISECONDS) .maxTime(101, MILLISECONDS); - expectedOperation = new AggregateOperation<>(NAMESPACE, pipeline, - getDefaultCodecRegistry().get(Document.class)) + expectedOperation = new AggregateOperation<>( + NAMESPACE, pipeline, + getDefaultCodecRegistry().get(Document.class), + null) .retryReads(true) .allowDiskUse(true) .batchSize(100) @@ -103,8 +106,10 @@ void shouldBuildTheExpectedOperationForHintString() { AggregatePublisher publisher = new AggregatePublisherImpl<>(null, createMongoOperationPublisher(executor), pipeline, AggregationLevel.COLLECTION); - AggregateOperation expectedOperation = new AggregateOperation<>(NAMESPACE, pipeline, - getDefaultCodecRegistry().get(Document.class)) + AggregateOperation expectedOperation = new AggregateOperation<>( + NAMESPACE, pipeline, + getDefaultCodecRegistry().get(Document.class), + null) .batchSize(Integer.MAX_VALUE) .retryReads(true); @@ -127,8 +132,10 @@ void shouldBuildTheExpectedOperationForHintPlusHintString() { AggregatePublisher publisher = new AggregatePublisherImpl<>(null, createMongoOperationPublisher(executor), pipeline, AggregationLevel.COLLECTION); - AggregateOperation expectedOperation = new AggregateOperation<>(NAMESPACE, pipeline, - getDefaultCodecRegistry().get(Document.class)) + AggregateOperation expectedOperation = new AggregateOperation<>( + NAMESPACE, pipeline, + getDefaultCodecRegistry().get(Document.class), + null) .batchSize(Integer.MAX_VALUE) .retryReads(true); @@ -190,7 +197,7 @@ void shouldBuildTheExpectedOperationsForDollarOut() { assertOperationIsTheSameAs(expectedOperation, operation.getReadOperation()); FindOperation expectedFindOperation = - new FindOperation<>(collectionNamespace, getDefaultCodecRegistry().get(Document.class)) + new FindOperation<>(collectionNamespace, getDefaultCodecRegistry().get(Document.class), null) .batchSize(100) .collation(COLLATION) .filter(new BsonDocument()) @@ -368,7 +375,7 @@ void shouldBuildTheExpectedOperationsForDollarMergeDocument() { assertOperationIsTheSameAs(expectedOperation, operation.getReadOperation()); FindOperation expectedFindOperation = - new FindOperation<>(collectionNamespace, getDefaultCodecRegistry().get(Document.class)) + new FindOperation<>(collectionNamespace, getDefaultCodecRegistry().get(Document.class), null) .batchSize(100) .collation(COLLATION) .filter(new BsonDocument()) @@ -422,7 +429,7 @@ void shouldBuildTheExpectedOperationsForDollarMergeString() { assertOperationIsTheSameAs(expectedOperation, operation.getReadOperation()); FindOperation expectedFindOperation = - new FindOperation<>(collectionNamespace, getDefaultCodecRegistry().get(Document.class)) + new FindOperation<>(collectionNamespace, getDefaultCodecRegistry().get(Document.class), null) .filter(new BsonDocument()) .batchSize(Integer.MAX_VALUE) .retryReads(true); diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/DistinctPublisherImplTest.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/DistinctPublisherImplTest.java index f9de792574c..e69b6d05d61 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/DistinctPublisherImplTest.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/DistinctPublisherImplTest.java @@ -44,7 +44,7 @@ void shouldBuildTheExpectedOperation() { new DistinctPublisherImpl<>(null, createMongoOperationPublisher(executor), fieldName, new Document()); DistinctOperation expectedOperation = new DistinctOperation<>(NAMESPACE, fieldName, - getDefaultCodecRegistry().get(Document.class)) + getDefaultCodecRegistry().get(Document.class), null) .retryReads(true).filter(new BsonDocument()); // default input should be as expected diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/FindPublisherImplTest.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/FindPublisherImplTest.java index eab28373f2a..f4805e7608f 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/FindPublisherImplTest.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/FindPublisherImplTest.java @@ -50,7 +50,8 @@ void shouldBuildTheExpectedOperation() { FindPublisher publisher = new FindPublisherImpl<>(null, createMongoOperationPublisher(executor), new Document()); FindOperation expectedOperation = new FindOperation<>(NAMESPACE, - getDefaultCodecRegistry().get(Document.class)) + getDefaultCodecRegistry().get(Document.class), + null) .batchSize(Integer.MAX_VALUE) .retryReads(true) .filter(new BsonDocument()); @@ -84,7 +85,8 @@ void shouldBuildTheExpectedOperation() { .allowDiskUse(false); expectedOperation = new FindOperation<>(NAMESPACE, - getDefaultCodecRegistry().get(Document.class)) + getDefaultCodecRegistry().get(Document.class), + null) .retryReads(true) .filter(new BsonDocument()) .allowDiskUse(false) diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListCollectionNamesPublisherImplTest.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListCollectionNamesPublisherImplTest.java index 6613723b49d..a241fd2640b 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListCollectionNamesPublisherImplTest.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListCollectionNamesPublisherImplTest.java @@ -35,7 +35,6 @@ final class ListCollectionNamesPublisherImplTest extends TestHelper { private static final String DATABASE_NAME = NAMESPACE.getDatabaseName(); - @SuppressWarnings("deprecation") @DisplayName("Should build the expected ListCollectionsOperation") @Test void shouldBuildTheExpectedOperation() { @@ -46,7 +45,8 @@ void shouldBuildTheExpectedOperation() { .authorizedCollections(true); ListCollectionsOperation expectedOperation = new ListCollectionsOperation<>(DATABASE_NAME, - getDefaultCodecRegistry().get(Document.class)) + getDefaultCodecRegistry().get(Document.class), + null) .batchSize(Integer.MAX_VALUE) .nameOnly(true) .authorizedCollections(true) @@ -65,7 +65,8 @@ void shouldBuildTheExpectedOperation() { .batchSize(100); expectedOperation = new ListCollectionsOperation<>(DATABASE_NAME, - getDefaultCodecRegistry().get(Document.class)) + getDefaultCodecRegistry().get(Document.class), + null) .nameOnly(true) .authorizedCollections(true) .retryReads(true) diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListCollectionsPublisherImplTest.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListCollectionsPublisherImplTest.java index a632edbae82..381a688e058 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListCollectionsPublisherImplTest.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListCollectionsPublisherImplTest.java @@ -43,7 +43,8 @@ void shouldBuildTheExpectedOperation() { .withDocumentClass(String.class), true); ListCollectionsOperation expectedOperation = new ListCollectionsOperation<>(DATABASE_NAME, - getDefaultCodecRegistry().get(String.class)) + getDefaultCodecRegistry().get(String.class), + null) .batchSize(Integer.MAX_VALUE) .nameOnly(true).retryReads(true); @@ -60,7 +61,8 @@ void shouldBuildTheExpectedOperation() { .batchSize(100); expectedOperation = new ListCollectionsOperation<>(DATABASE_NAME, - getDefaultCodecRegistry().get(String.class)) + getDefaultCodecRegistry().get(String.class), + null) .nameOnly(true) .retryReads(true) .filter(new BsonDocument("filter", new BsonInt32(1))) diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListDatabasesPublisherImplTest.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListDatabasesPublisherImplTest.java index c19a56f14cc..d7ea7ef2fab 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListDatabasesPublisherImplTest.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListDatabasesPublisherImplTest.java @@ -42,7 +42,8 @@ void shouldBuildTheExpectedOperation() { ListDatabasesPublisher publisher = new ListDatabasesPublisherImpl<>(null, createMongoOperationPublisher(executor)); ListDatabasesOperation expectedOperation = new ListDatabasesOperation<>( - getDefaultCodecRegistry().get(Document.class)) + getDefaultCodecRegistry().get(Document.class), + null) .retryReads(true); // default input should be as expected @@ -59,7 +60,8 @@ void shouldBuildTheExpectedOperation() { .batchSize(100); expectedOperation = new ListDatabasesOperation<>( - getDefaultCodecRegistry().get(Document.class)) + getDefaultCodecRegistry().get(Document.class), + null) .retryReads(true) .authorizedDatabasesOnly(true) .filter(new BsonDocument("filter", new BsonInt32(1))); diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListIndexesPublisherImplTest.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListIndexesPublisherImplTest.java index 5ae221b8a02..8870a4551af 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListIndexesPublisherImplTest.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/ListIndexesPublisherImplTest.java @@ -43,7 +43,7 @@ void shouldBuildTheExpectedOperation() { ListIndexesPublisher publisher = new ListIndexesPublisherImpl<>(null, createMongoOperationPublisher(executor)); ListIndexesOperation expectedOperation = - new ListIndexesOperation<>(NAMESPACE, getDefaultCodecRegistry().get(Document.class)) + new ListIndexesOperation<>(NAMESPACE, getDefaultCodecRegistry().get(Document.class), null) .batchSize(Integer.MAX_VALUE) .retryReads(true); @@ -58,7 +58,7 @@ void shouldBuildTheExpectedOperation() { .maxTime(100, MILLISECONDS); expectedOperation = - new ListIndexesOperation<>(NAMESPACE, getDefaultCodecRegistry().get(Document.class)) + new ListIndexesOperation<>(NAMESPACE, getDefaultCodecRegistry().get(Document.class), null) .batchSize(100) .retryReads(true); diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/MongoOperationPublisherTest.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/MongoOperationPublisherTest.java index 664cf1428d8..b0d1bdbc4ea 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/MongoOperationPublisherTest.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/MongoOperationPublisherTest.java @@ -54,7 +54,7 @@ public class MongoOperationPublisherTest { private static final MongoOperationPublisher DEFAULT_MOP = new MongoOperationPublisher<>( MONGO_NAMESPACE, Document.class, MongoClientSettings.getDefaultCodecRegistry(), ReadPreference.primary(), - ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, true, true, UuidRepresentation.STANDARD, + ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, true, true, null, UuidRepresentation.STANDARD, null, TIMEOUT_SETTINGS_WITH_TIMEOUT, OPERATION_EXECUTOR); @Test diff --git a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/TestHelper.java b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/TestHelper.java index 450536df2b8..08df6497039 100644 --- a/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/TestHelper.java +++ b/driver-reactive-streams/src/test/unit/com/mongodb/reactivestreams/client/internal/TestHelper.java @@ -106,7 +106,7 @@ public class TestHelper { static MongoOperationPublisher createMongoOperationPublisher(final OperationExecutor executor) { return new MongoOperationPublisher<>(NAMESPACE, Document.class, getDefaultCodecRegistry(), ReadPreference.primary(), ReadConcern.DEFAULT, - WriteConcern.ACKNOWLEDGED, true, true, + WriteConcern.ACKNOWLEDGED, true, true, null, UuidRepresentation.STANDARD, null, TIMEOUT_SETTINGS, executor); } diff --git a/driver-sync/src/main/com/mongodb/client/internal/AggregateIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/AggregateIterableImpl.java index 49ed63cba32..e69ca0d78cb 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/AggregateIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/AggregateIterableImpl.java @@ -67,21 +67,23 @@ class AggregateIterableImpl extends MongoIterableImpl documentClass, final Class resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor, - final List pipeline, final AggregationLevel aggregationLevel, final boolean retryReads, + final List pipeline, final AggregationLevel aggregationLevel, + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { this(clientSession, new MongoNamespace(databaseName, "_ignored"), documentClass, resultClass, codecRegistry, readPreference, - readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads, timeoutSettings); + readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @SuppressWarnings("checkstyle:ParameterNumber") AggregateIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class documentClass, final Class resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor, - final List pipeline, final AggregationLevel aggregationLevel, final boolean retryReads, + final List pipeline, final AggregationLevel aggregationLevel, + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { super(clientSession, executor, readConcern, readPreference, retryReads, timeoutSettings); this.operations = new Operations<>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern, - true, retryReads, timeoutSettings); + true, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); this.namespace = notNull("namespace", namespace); this.documentClass = notNull("documentClass", documentClass); this.resultClass = notNull("resultClass", resultClass); diff --git a/driver-sync/src/main/com/mongodb/client/internal/ChangeStreamIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ChangeStreamIterableImpl.java index b5b41b375f5..c0f9aaec8af 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/ChangeStreamIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/ChangeStreamIterableImpl.java @@ -72,21 +72,24 @@ public class ChangeStreamIterableImpl extends MongoIterableImpl pipeline, final Class resultClass, - final ChangeStreamLevel changeStreamLevel, final boolean retryReads, final TimeoutSettings timeoutSettings) { + final ChangeStreamLevel changeStreamLevel, final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, + final TimeoutSettings timeoutSettings) { this(clientSession, new MongoNamespace(databaseName, "_ignored"), codecRegistry, readPreference, readConcern, executor, pipeline, - resultClass, changeStreamLevel, retryReads, timeoutSettings); + resultClass, changeStreamLevel, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } public ChangeStreamIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern, final OperationExecutor executor, final List pipeline, final Class resultClass, - final ChangeStreamLevel changeStreamLevel, final boolean retryReads, final TimeoutSettings timeoutSettings) { + final ChangeStreamLevel changeStreamLevel, + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, + final TimeoutSettings timeoutSettings) { super(clientSession, executor, readConcern, readPreference, retryReads, timeoutSettings); this.codecRegistry = notNull("codecRegistry", codecRegistry); this.pipeline = notNull("pipeline", pipeline); this.codec = ChangeStreamDocument.createCodec(notNull("resultClass", resultClass), codecRegistry); this.changeStreamLevel = notNull("changeStreamLevel", changeStreamLevel); - this.operations = new Operations<>(namespace, resultClass, readPreference, codecRegistry, retryReads, timeoutSettings); + this.operations = new Operations<>(namespace, resultClass, readPreference, codecRegistry, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @Override diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java index 75c6c34a206..ac33794ccd3 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java @@ -66,13 +66,17 @@ final class ClientSessionImpl extends BaseClientSessionImpl implements ClientSes private boolean commitInProgress; private TransactionOptions transactionOptions; private final TracingManager tracingManager; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private TransactionSpan transactionSpan = null; + ClientSessionImpl(final ServerSessionPool serverSessionPool, final Object originator, final ClientSessionOptions options, - final OperationExecutor operationExecutor, final TracingManager tracingManager) { + final OperationExecutor operationExecutor, final TracingManager tracingManager, @Nullable final Integer maxAdaptiveRetriesSetting) { super(serverSessionPool, originator, options); this.operationExecutor = operationExecutor; this.tracingManager = tracingManager; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; } @Override @@ -147,7 +151,7 @@ public void abortTransaction() { TimeoutContext timeoutContext = getTimeoutContext(); WriteConcern writeConcern = assertNotNull(getWriteConcern(timeoutContext)); operationExecutor - .execute(new AbortTransactionOperation(writeConcern) + .execute(new AbortTransactionOperation(writeConcern, maxAdaptiveRetriesSetting) .recoveryToken(getRecoveryToken()), readConcern, this); } } catch (RuntimeException e) { @@ -229,7 +233,7 @@ private void commitTransaction(final boolean resetTimeout) { TimeoutContext timeoutContext = getTimeoutContext(); WriteConcern writeConcern = assertNotNull(getWriteConcern(timeoutContext)); operationExecutor - .execute(new CommitTransactionOperation(writeConcern, + .execute(new CommitTransactionOperation(writeConcern, maxAdaptiveRetriesSetting, transactionState == TransactionState.COMMITTED) .recoveryToken(getRecoveryToken()), readConcern, this); } @@ -320,7 +324,6 @@ public T withTransaction(final TransactionBody transactionBody, final Tra if (withTransactionTimeoutExpired.getAsBoolean()) { throw wrapInMongoTimeoutException(mongoException, timeoutMsConfigured); } - applyMajorityWriteConcernToTransactionOptions(); continue; } else if (mongoException.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL)) { if (transactionSpan != null) { @@ -358,23 +361,6 @@ public void close() { } } - // Apply majority write concern if the commit is to be retried. - private void applyMajorityWriteConcernToTransactionOptions() { - if (transactionOptions != null) { - TimeoutContext timeoutContext = getTimeoutContext(); - WriteConcern writeConcern = getWriteConcern(timeoutContext); - if (writeConcern != null) { - transactionOptions = TransactionOptions.merge(TransactionOptions.builder() - .writeConcern(writeConcern.withW("majority")).build(), transactionOptions); - } else { - transactionOptions = TransactionOptions.merge(TransactionOptions.builder() - .writeConcern(WriteConcern.MAJORITY).build(), transactionOptions); - } - } else { - transactionOptions = TransactionOptions.builder().writeConcern(WriteConcern.MAJORITY).build(); - } - } - private void cleanupTransaction(final TransactionState nextState) { messageSentInCurrentTransaction = false; transactionOptions = null; diff --git a/driver-sync/src/main/com/mongodb/client/internal/DistinctIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/DistinctIterableImpl.java index d3403738088..5108d1849e4 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/DistinctIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/DistinctIterableImpl.java @@ -52,9 +52,9 @@ class DistinctIterableImpl extends MongoIterableImpl documentClass, final Class resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern, final OperationExecutor executor, final String fieldName, final Bson filter, - final boolean retryReads, final TimeoutSettings timeoutSettings) { + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { super(clientSession, executor, readConcern, readPreference, retryReads, timeoutSettings); - this.operations = new Operations<>(namespace, documentClass, readPreference, codecRegistry, retryReads, timeoutSettings); + this.operations = new Operations<>(namespace, documentClass, readPreference, codecRegistry, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); this.resultClass = notNull("resultClass", resultClass); this.fieldName = notNull("mapFunction", fieldName); this.filter = filter; diff --git a/driver-sync/src/main/com/mongodb/client/internal/FindIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/FindIterableImpl.java index 9b0321abbbc..5524ca8c145 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/FindIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/FindIterableImpl.java @@ -40,7 +40,10 @@ import static com.mongodb.assertions.Assertions.notNull; -class FindIterableImpl extends MongoIterableImpl implements FindIterable { +/** + * This class is not part of the public API and may be removed or changed at any time. + */ +public class FindIterableImpl extends MongoIterableImpl implements FindIterable { private final Operations operations; @@ -50,12 +53,13 @@ class FindIterableImpl extends MongoIterableImpl im private Bson filter; - FindIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class documentClass, + public FindIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, + final Class documentClass, final Class resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, - final ReadConcern readConcern, final OperationExecutor executor, final Bson filter, final boolean retryReads, - final TimeoutSettings timeoutSettings) { + final ReadConcern readConcern, final OperationExecutor executor, final Bson filter, + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { super(clientSession, executor, readConcern, readPreference, retryReads, timeoutSettings); - this.operations = new Operations<>(namespace, documentClass, readPreference, codecRegistry, retryReads, timeoutSettings); + this.operations = new Operations<>(namespace, documentClass, readPreference, codecRegistry, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); this.resultClass = notNull("resultClass", resultClass); this.filter = notNull("filter", filter); this.findOptions = new FindOptions(); diff --git a/driver-sync/src/main/com/mongodb/client/internal/ListCollectionsIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ListCollectionsIterableImpl.java index 60755456811..8e9a7b9e04d 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/ListCollectionsIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/ListCollectionsIterableImpl.java @@ -49,10 +49,12 @@ class ListCollectionsIterableImpl extends MongoIterableImpl im ListCollectionsIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final boolean collectionNamesOnly, final Class resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, - final OperationExecutor executor, final boolean retryReads, final TimeoutSettings timeoutSettings) { + final OperationExecutor executor, final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, + final TimeoutSettings timeoutSettings) { super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads, timeoutSettings); // TODO: read concern? this.collectionNamesOnly = collectionNamesOnly; - this.operations = new Operations<>(BsonDocument.class, readPreference, codecRegistry, retryReads, timeoutSettings); + this.operations = new Operations<>( + BsonDocument.class, readPreference, codecRegistry, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); this.databaseName = notNull("databaseName", databaseName); this.resultClass = notNull("resultClass", resultClass); } diff --git a/driver-sync/src/main/com/mongodb/client/internal/ListDatabasesIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ListDatabasesIterableImpl.java index f6e7d9a5021..8b57e02ed0a 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/ListDatabasesIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/ListDatabasesIterableImpl.java @@ -51,9 +51,10 @@ public class ListDatabasesIterableImpl extends MongoIterableImpl resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, final OperationExecutor executor, - final boolean retryReads, final TimeoutSettings timeoutSettings) { + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads, timeoutSettings); // TODO: read concern? - this.operations = new Operations<>(BsonDocument.class, readPreference, codecRegistry, retryReads, timeoutSettings); + this.operations = new Operations<>( + BsonDocument.class, readPreference, codecRegistry, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); this.resultClass = notNull("clazz", resultClass); } diff --git a/driver-sync/src/main/com/mongodb/client/internal/ListIndexesIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ListIndexesIterableImpl.java index e555984422b..ae69b1c9fe6 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/ListIndexesIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/ListIndexesIterableImpl.java @@ -44,9 +44,9 @@ class ListIndexesIterableImpl extends MongoIterableImpl implem ListIndexesIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, final OperationExecutor executor, - final boolean retryReads, final TimeoutSettings timeoutSettings) { + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads, timeoutSettings); - this.operations = new Operations<>(namespace, BsonDocument.class, readPreference, codecRegistry, retryReads, timeoutSettings); + this.operations = new Operations<>(namespace, BsonDocument.class, readPreference, codecRegistry, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); this.resultClass = notNull("resultClass", resultClass); } diff --git a/driver-sync/src/main/com/mongodb/client/internal/ListSearchIndexesIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ListSearchIndexesIterableImpl.java index 7fd6ecd4a93..13fd7e71ba8 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/ListSearchIndexesIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/ListSearchIndexesIterableImpl.java @@ -43,7 +43,6 @@ final class ListSearchIndexesIterableImpl extends MongoIterableImpl resultClass; @Nullable private Boolean allowDiskUse; - @Nullable private long maxTimeMS; @Nullable private Collation collation; @@ -54,11 +53,12 @@ final class ListSearchIndexesIterableImpl extends MongoIterableImpl resultClass, final CodecRegistry codecRegistry, - final ReadPreference readPreference, final boolean retryReads, final TimeoutSettings timeoutSettings) { + final Class resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, + final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, + final TimeoutSettings timeoutSettings) { super(null, executor, ReadConcern.DEFAULT, readPreference, retryReads, timeoutSettings); this.resultClass = resultClass; - this.operations = new Operations<>(namespace, BsonDocument.class, readPreference, codecRegistry, retryReads, timeoutSettings); + this.operations = new Operations<>(namespace, BsonDocument.class, readPreference, codecRegistry, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); this.codecRegistry = codecRegistry; } diff --git a/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java index fd79242766e..66a712b0054 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java @@ -72,10 +72,11 @@ class MapReduceIterableImpl extends MongoIterableImpl documentClass, final Class resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor, - final String mapFunction, final String reduceFunction, final TimeoutSettings timeoutSettings) { + final String mapFunction, final String reduceFunction, + @Nullable final Integer maxAdaptiveRetriesSetting, final TimeoutSettings timeoutSettings) { super(clientSession, executor, readConcern, readPreference, false, timeoutSettings); this.operations = new Operations<>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern, - false, false, timeoutSettings); + false, false, maxAdaptiveRetriesSetting, timeoutSettings); this.namespace = notNull("namespace", namespace); this.resultClass = notNull("resultClass", resultClass); this.mapFunction = notNull("mapFunction", mapFunction); diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java index 2cd7ffffa5d..9c3f027c013 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java @@ -102,8 +102,9 @@ public MongoClientImpl(final Cluster cluster, withUuidRepresentation(settings.getCodecRegistry(), settings.getUuidRepresentation()), (SynchronousContextProvider) settings.getContextProvider(), autoEncryptionSettings == null ? null : createCrypt(settings, autoEncryptionSettings), this, - operationExecutor, settings.getReadConcern(), settings.getReadPreference(), settings.getRetryReads(), - settings.getRetryWrites(), settings.getEnableOverloadRetargeting(), settings.getServerApi(), + operationExecutor, settings.getReadConcern(), settings.getReadPreference(), + settings.getRetryReads(), settings.getRetryWrites(), settings.getMaxAdaptiveRetries(), + settings.getEnableOverloadRetargeting(), settings.getServerApi(), new ServerSessionPool(cluster, clientExecutor, TimeoutSettings.create(settings), settings.getServerApi()), TimeoutSettings.create(settings), settings.getUuidRepresentation(), settings.getWriteConcern(), clientExecutor, diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java index 9ed66d84f1d..0205f0a6ea8 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClusterImpl.java @@ -95,6 +95,8 @@ final class MongoClusterImpl implements MongoCluster { private final ReadPreference readPreference; private final boolean retryReads; private final boolean retryWrites; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private final boolean enableOverloadRetargeting; @Nullable private final ServerApi serverApi; @@ -110,7 +112,8 @@ final class MongoClusterImpl implements MongoCluster { @Nullable final AutoEncryptionSettings autoEncryptionSettings, final Cluster cluster, final CodecRegistry codecRegistry, @Nullable final SynchronousContextProvider contextProvider, @Nullable final Crypt crypt, final Object originator, @Nullable final OperationExecutor operationExecutor, final ReadConcern readConcern, final ReadPreference readPreference, - final boolean retryReads, final boolean retryWrites, final boolean enableOverloadRetargeting, + final boolean retryReads, final boolean retryWrites, + @Nullable final Integer maxAdaptiveRetriesSetting, final boolean enableOverloadRetargeting, @Nullable final ServerApi serverApi, final ServerSessionPool serverSessionPool, final TimeoutSettings timeoutSettings, final UuidRepresentation uuidRepresentation, final WriteConcern writeConcern, final AsyncClientExecutor clientExecutor, final TracingManager tracingManager) { @@ -125,6 +128,7 @@ final class MongoClusterImpl implements MongoCluster { this.readPreference = readPreference; this.retryReads = retryReads; this.retryWrites = retryWrites; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; this.enableOverloadRetargeting = enableOverloadRetargeting; this.serverApi = serverApi; this.serverSessionPool = serverSessionPool; @@ -142,6 +146,7 @@ final class MongoClusterImpl implements MongoCluster { writeConcern, retryWrites, retryReads, + maxAdaptiveRetriesSetting, timeoutSettings); } @@ -175,42 +180,43 @@ public Long getTimeout(final TimeUnit timeUnit) { @Override public MongoCluster withCodecRegistry(final CodecRegistry codecRegistry) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, - operationExecutor, readConcern, readPreference, retryReads, retryWrites, enableOverloadRetargeting, serverApi, serverSessionPool, timeoutSettings, - uuidRepresentation, writeConcern, clientExecutor, tracingManager); + operationExecutor, readConcern, readPreference, retryReads, retryWrites, maxAdaptiveRetriesSetting, enableOverloadRetargeting, + serverApi, serverSessionPool, timeoutSettings, uuidRepresentation, writeConcern, clientExecutor, tracingManager); } @Override public MongoCluster withReadPreference(final ReadPreference readPreference) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, - operationExecutor, readConcern, readPreference, retryReads, retryWrites, enableOverloadRetargeting, serverApi, serverSessionPool, timeoutSettings, - uuidRepresentation, writeConcern, clientExecutor, tracingManager); + operationExecutor, readConcern, readPreference, retryReads, retryWrites, maxAdaptiveRetriesSetting, enableOverloadRetargeting, + serverApi, serverSessionPool, timeoutSettings, uuidRepresentation, writeConcern, clientExecutor, tracingManager); } @Override public MongoCluster withWriteConcern(final WriteConcern writeConcern) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, - operationExecutor, readConcern, readPreference, retryReads, retryWrites, enableOverloadRetargeting, serverApi, serverSessionPool, timeoutSettings, - uuidRepresentation, writeConcern, clientExecutor, tracingManager); + operationExecutor, readConcern, readPreference, retryReads, retryWrites, maxAdaptiveRetriesSetting, enableOverloadRetargeting, + serverApi, serverSessionPool, timeoutSettings, uuidRepresentation, writeConcern, clientExecutor, tracingManager); } @Override public MongoCluster withReadConcern(final ReadConcern readConcern) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, - operationExecutor, readConcern, readPreference, retryReads, retryWrites, enableOverloadRetargeting, serverApi, serverSessionPool, timeoutSettings, - uuidRepresentation, writeConcern, clientExecutor, tracingManager); + operationExecutor, readConcern, readPreference, retryReads, retryWrites, maxAdaptiveRetriesSetting, enableOverloadRetargeting, + serverApi, serverSessionPool, timeoutSettings, uuidRepresentation, writeConcern, clientExecutor, tracingManager); } @Override public MongoCluster withTimeout(final long timeout, final TimeUnit timeUnit) { return new MongoClusterImpl(autoEncryptionSettings, cluster, codecRegistry, contextProvider, crypt, originator, - operationExecutor, readConcern, readPreference, retryReads, retryWrites, enableOverloadRetargeting, serverApi, serverSessionPool, - timeoutSettings.withTimeout(timeout, timeUnit), uuidRepresentation, writeConcern, clientExecutor, tracingManager); + operationExecutor, readConcern, readPreference, retryReads, retryWrites, maxAdaptiveRetriesSetting, enableOverloadRetargeting, + serverApi, serverSessionPool, timeoutSettings.withTimeout(timeout, timeUnit), uuidRepresentation, writeConcern, clientExecutor, + tracingManager); } @Override public MongoDatabase getDatabase(final String databaseName) { - return new MongoDatabaseImpl(databaseName, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern, - uuidRepresentation, autoEncryptionSettings, timeoutSettings, operationExecutor); + return new MongoDatabaseImpl(databaseName, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, maxAdaptiveRetriesSetting, + readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, operationExecutor); } public Cluster getCluster() { @@ -259,7 +265,7 @@ public ClientSession startSession(final ClientSessionOptions options) { .readPreference(readPreference) .build())) .build(); - return new ClientSessionImpl(serverSessionPool, originator, mergedOptions, operationExecutor, tracingManager); + return new ClientSessionImpl(serverSessionPool, originator, mergedOptions, operationExecutor, tracingManager, maxAdaptiveRetriesSetting); } @Override @@ -377,7 +383,8 @@ public ClientBulkWriteResult bulkWrite( } private ListDatabasesIterable createListDatabasesIterable(@Nullable final ClientSession clientSession, final Class clazz) { - return new ListDatabasesIterableImpl<>(clientSession, clazz, codecRegistry, ReadPreference.primary(), operationExecutor, retryReads, timeoutSettings); + return new ListDatabasesIterableImpl<>(clientSession, clazz, codecRegistry, ReadPreference.primary(), operationExecutor, + retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } private MongoIterable createListDatabaseNamesIterable(@Nullable final ClientSession clientSession) { @@ -390,7 +397,7 @@ private ChangeStreamIterable createChangeStreamIterable(@Null final List pipeline, final Class resultClass) { return new ChangeStreamIterableImpl<>(clientSession, "admin", codecRegistry, readPreference, readConcern, operationExecutor, pipeline, resultClass, ChangeStreamLevel.CLIENT, - retryReads, timeoutSettings); + retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } private ClientBulkWriteResult executeBulkWrite( diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoCollectionImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoCollectionImpl.java index 736e1541212..4619289bc28 100755 --- a/driver-sync/src/main/com/mongodb/client/internal/MongoCollectionImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MongoCollectionImpl.java @@ -97,6 +97,8 @@ class MongoCollectionImpl implements MongoCollection { private final WriteConcern writeConcern; private final boolean retryWrites; private final boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private final ReadConcern readConcern; private final Operations operations; private final UuidRepresentation uuidRepresentation; @@ -107,10 +109,10 @@ class MongoCollectionImpl implements MongoCollection { private final OperationExecutor executor; MongoCollectionImpl(final MongoNamespace namespace, final Class documentClass, final CodecRegistry codecRegistry, - final ReadPreference readPreference, final WriteConcern writeConcern, final boolean retryWrites, - final boolean retryReads, final ReadConcern readConcern, final UuidRepresentation uuidRepresentation, - @Nullable final AutoEncryptionSettings autoEncryptionSettings, final TimeoutSettings timeoutSettings, - final OperationExecutor executor) { + final ReadPreference readPreference, final WriteConcern writeConcern, + final boolean retryWrites, final boolean retryReads, @Nullable final Integer maxAdaptiveRetriesSetting, + final ReadConcern readConcern, final UuidRepresentation uuidRepresentation, + @Nullable final AutoEncryptionSettings autoEncryptionSettings, final TimeoutSettings timeoutSettings, final OperationExecutor executor) { this.namespace = notNull("namespace", namespace); this.documentClass = notNull("documentClass", documentClass); this.codecRegistry = notNull("codecRegistry", codecRegistry); @@ -118,13 +120,14 @@ class MongoCollectionImpl implements MongoCollection { this.writeConcern = notNull("writeConcern", writeConcern); this.retryWrites = retryWrites; this.retryReads = retryReads; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; this.readConcern = notNull("readConcern", readConcern); this.executor = notNull("executor", executor); this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation); this.autoEncryptionSettings = autoEncryptionSettings; this.timeoutSettings = timeoutSettings; this.operations = new Operations<>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern, - retryWrites, retryReads, timeoutSettings); + retryWrites, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @Override @@ -166,37 +169,44 @@ public Long getTimeout(final TimeUnit timeUnit) { @Override public MongoCollection withDocumentClass(final Class clazz) { - return new MongoCollectionImpl<>(namespace, clazz, codecRegistry, readPreference, writeConcern, retryWrites, - retryReads, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + return new MongoCollectionImpl<>(namespace, clazz, codecRegistry, readPreference, writeConcern, + retryWrites, retryReads, maxAdaptiveRetriesSetting, + readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoCollection withCodecRegistry(final CodecRegistry codecRegistry) { return new MongoCollectionImpl<>(namespace, documentClass, withUuidRepresentation(codecRegistry, uuidRepresentation), - readPreference, writeConcern, retryWrites, retryReads, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + readPreference, writeConcern, + retryWrites, retryReads, maxAdaptiveRetriesSetting, + readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoCollection withReadPreference(final ReadPreference readPreference) { - return new MongoCollectionImpl<>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites, - retryReads, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + return new MongoCollectionImpl<>(namespace, documentClass, codecRegistry, readPreference, writeConcern, + retryWrites, retryReads, maxAdaptiveRetriesSetting, + readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoCollection withWriteConcern(final WriteConcern writeConcern) { - return new MongoCollectionImpl<>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites, - retryReads, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + return new MongoCollectionImpl<>(namespace, documentClass, codecRegistry, readPreference, writeConcern, + retryWrites, retryReads, maxAdaptiveRetriesSetting, + readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoCollection withReadConcern(final ReadConcern readConcern) { - return new MongoCollectionImpl<>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites, - retryReads, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + return new MongoCollectionImpl<>(namespace, documentClass, codecRegistry, readPreference, writeConcern, + retryWrites, retryReads, maxAdaptiveRetriesSetting, + readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoCollection withTimeout(final long timeout, final TimeUnit timeUnit) { - return new MongoCollectionImpl<>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, + return new MongoCollectionImpl<>(namespace, documentClass, codecRegistry, readPreference, writeConcern, + retryWrites, retryReads, maxAdaptiveRetriesSetting, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings.withTimeout(timeout, timeUnit), executor); } @@ -273,7 +283,7 @@ public DistinctIterable distinct(final ClientSession clientSe private DistinctIterable createDistinctIterable(@Nullable final ClientSession clientSession, final String fieldName, final Bson filter, final Class resultClass) { return new DistinctIterableImpl<>(clientSession, namespace, documentClass, resultClass, codecRegistry, - readPreference, readConcern, executor, fieldName, filter, retryReads, timeoutSettings); + readPreference, readConcern, executor, fieldName, filter, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @Override @@ -324,7 +334,7 @@ public FindIterable find(final ClientSession clientSession, f private FindIterable createFindIterable(@Nullable final ClientSession clientSession, final Bson filter, final Class resultClass) { return new FindIterableImpl<>(clientSession, namespace, this.documentClass, resultClass, codecRegistry, - readPreference, readConcern, executor, filter, retryReads, timeoutSettings); + readPreference, readConcern, executor, filter, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @Override @@ -353,7 +363,8 @@ private AggregateIterable createAggregateIterable(@Nullable f final List pipeline, final Class resultClass) { return new AggregateIterableImpl<>(clientSession, namespace, documentClass, resultClass, codecRegistry, - readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, retryReads, timeoutSettings); + readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, + retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @Override @@ -402,7 +413,7 @@ private ChangeStreamIterable createChangeStreamIterable(@Null final List pipeline, final Class resultClass) { return new ChangeStreamIterableImpl<>(clientSession, namespace, codecRegistry, readPreference, readConcern, executor, - pipeline, resultClass, ChangeStreamLevel.COLLECTION, retryReads, timeoutSettings); + pipeline, resultClass, ChangeStreamLevel.COLLECTION, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @SuppressWarnings("deprecation") @@ -438,7 +449,8 @@ private com.mongodb.client.MapReduceIterable createMapReduceI final String mapFunction, final String reduceFunction, final Class resultClass) { return new MapReduceIterableImpl<>(clientSession, namespace, documentClass, resultClass, codecRegistry, - readPreference, readConcern, writeConcern, executor, mapFunction, reduceFunction, timeoutSettings); + readPreference, readConcern, writeConcern, executor, mapFunction, reduceFunction, + maxAdaptiveRetriesSetting, timeoutSettings); } @Override @@ -972,12 +984,12 @@ public ListIndexesIterable listIndexes(final ClientSession cl private ListIndexesIterable createListIndexesIterable(@Nullable final ClientSession clientSession, final Class resultClass) { return new ListIndexesIterableImpl<>(clientSession, getNamespace(), resultClass, codecRegistry, ReadPreference.primary(), - executor, retryReads, timeoutSettings); + executor, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } private ListSearchIndexesIterable createListSearchIndexesIterable(final Class resultClass) { return new ListSearchIndexesIterableImpl<>(getNamespace(), executor, resultClass, codecRegistry, readPreference, - retryReads, timeoutSettings); + retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @Override diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoDatabaseImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoDatabaseImpl.java index 1541fbe1c63..141564bc6e8 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/MongoDatabaseImpl.java +++ b/driver-sync/src/main/com/mongodb/client/internal/MongoDatabaseImpl.java @@ -61,6 +61,8 @@ public class MongoDatabaseImpl implements MongoDatabase { private final WriteConcern writeConcern; private final boolean retryWrites; private final boolean retryReads; + @Nullable + private final Integer maxAdaptiveRetriesSetting; private final ReadConcern readConcern; private final UuidRepresentation uuidRepresentation; @Nullable @@ -72,6 +74,7 @@ public class MongoDatabaseImpl implements MongoDatabase { public MongoDatabaseImpl(final String name, final CodecRegistry codecRegistry, final ReadPreference readPreference, final WriteConcern writeConcern, final boolean retryWrites, final boolean retryReads, + @Nullable final Integer maxAdaptiveRetriesSetting, final ReadConcern readConcern, final UuidRepresentation uuidRepresentation, @Nullable final AutoEncryptionSettings autoEncryptionSettings, final TimeoutSettings timeoutSettings, final OperationExecutor executor) { @@ -82,13 +85,14 @@ public MongoDatabaseImpl(final String name, final CodecRegistry codecRegistry, f this.writeConcern = notNull("writeConcern", writeConcern); this.retryWrites = retryWrites; this.retryReads = retryReads; + this.maxAdaptiveRetriesSetting = maxAdaptiveRetriesSetting; this.readConcern = notNull("readConcern", readConcern); this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation); this.autoEncryptionSettings = autoEncryptionSettings; this.timeoutSettings = timeoutSettings; this.executor = notNull("executor", executor); this.operations = new Operations<>(new MongoNamespace(name, "_ignored"), BsonDocument.class, readPreference, - codecRegistry, readConcern, writeConcern, retryWrites, retryReads, timeoutSettings); + codecRegistry, readConcern, writeConcern, retryWrites, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @Override @@ -126,31 +130,31 @@ public Long getTimeout(final TimeUnit timeUnit) { @Override public MongoDatabase withCodecRegistry(final CodecRegistry codecRegistry) { return new MongoDatabaseImpl(name, withUuidRepresentation(codecRegistry, uuidRepresentation), readPreference, writeConcern, retryWrites, - retryReads, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + retryReads, maxAdaptiveRetriesSetting, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoDatabase withReadPreference(final ReadPreference readPreference) { - return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern, - uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, + maxAdaptiveRetriesSetting, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoDatabase withWriteConcern(final WriteConcern writeConcern) { - return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern, - uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, + maxAdaptiveRetriesSetting, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoDatabase withReadConcern(final ReadConcern readConcern) { - return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern, - uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, + maxAdaptiveRetriesSetting, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override public MongoDatabase withTimeout(final long timeout, final TimeUnit timeUnit) { - return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern, - uuidRepresentation, autoEncryptionSettings, timeoutSettings.withTimeout(timeout, timeUnit), executor); + return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, + maxAdaptiveRetriesSetting, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings.withTimeout(timeout, timeUnit), executor); } @Override @@ -161,7 +165,8 @@ public MongoCollection getCollection(final String collectionName) { @Override public MongoCollection getCollection(final String collectionName, final Class documentClass) { return new MongoCollectionImpl<>(new MongoNamespace(name, collectionName), documentClass, codecRegistry, readPreference, - writeConcern, retryWrites, retryReads, readConcern, uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); + writeConcern, retryWrites, retryReads, maxAdaptiveRetriesSetting, readConcern, + uuidRepresentation, autoEncryptionSettings, timeoutSettings, executor); } @Override @@ -270,7 +275,7 @@ private ListCollectionsIterableImpl createListCollectionsIter final Class resultClass, final boolean collectionNamesOnly) { return new ListCollectionsIterableImpl<>(clientSession, name, collectionNamesOnly, resultClass, codecRegistry, - ReadPreference.primary(), executor, retryReads, timeoutSettings); + ReadPreference.primary(), executor, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } @Override @@ -393,14 +398,15 @@ private AggregateIterable createAggregateIterable(@Nullable f final List pipeline, final Class resultClass) { return new AggregateIterableImpl<>(clientSession, name, Document.class, resultClass, codecRegistry, - readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.DATABASE, retryReads, timeoutSettings); + readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.DATABASE, + retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } private ChangeStreamIterable createChangeStreamIterable(@Nullable final ClientSession clientSession, final List pipeline, final Class resultClass) { return new ChangeStreamIterableImpl<>(clientSession, name, codecRegistry, readPreference, readConcern, executor, - pipeline, resultClass, ChangeStreamLevel.DATABASE, retryReads, timeoutSettings); + pipeline, resultClass, ChangeStreamLevel.DATABASE, retryReads, maxAdaptiveRetriesSetting, timeoutSettings); } private void executeCreateView(@Nullable final ClientSession clientSession, final String viewName, final String viewOn, diff --git a/driver-sync/src/test/functional/com/mongodb/client/BackpressureProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/BackpressureProseTest.java index ec76ffa57af..a77f651e753 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/BackpressureProseTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/BackpressureProseTest.java @@ -19,11 +19,11 @@ import com.mongodb.MongoClientSettings; import com.mongodb.MongoServerException; import com.mongodb.internal.connection.TestCommandListener; +import com.mongodb.internal.time.ExponentialBackoff; import com.mongodb.internal.time.StartTime; import com.mongodb.lang.Nullable; import org.bson.BsonDocument; import org.bson.Document; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -34,6 +34,7 @@ import static com.mongodb.client.Fixture.getDefaultDatabaseName; import static com.mongodb.client.Fixture.getMongoClientSettings; import static com.mongodb.client.Fixture.getPrimary; +import static com.mongodb.internal.operation.CommandOperationHelper.DEFAULT_MAX_ADAPTIVE_RETRIES; import static java.lang.String.format; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -54,7 +55,6 @@ protected MongoClient createClient(final MongoClientSettings mongoClientSettings * Test 1: Operation Retry Uses Exponential Backoff. */ @Test - @Disabled("TODO-BACKPRESSURE Valentin Enable when implementing JAVA-5956, JAVA-6117, JAVA-6113, JAVA-6119, JAVA-6141 if PR 1899 is merged") void operationRetryUsesExponentialBackoff() throws InterruptedException { assumeTrue(serverVersionAtLeast(4, 4)); BsonDocument configureFailPoint = BsonDocument.parse( @@ -82,15 +82,13 @@ void operationRetryUsesExponentialBackoff() throws InterruptedException { } private static Duration measureFailedInsertDuration(final MongoCollection collection, final boolean retryBackoff) { - // TODO-BACKPRESSURE Valentin uncomment below when https://github.com/mongodb/mongo-java-driver/pull/1899 is merged - // ExponentialBackoff.setTestJitterSupplier(() -> retryBackoff ? 1 : 0); + ExponentialBackoff.setTestJitterSupplier(() -> retryBackoff ? 1 : 0); try { StartTime startTime = StartTime.now(); assertThrows(MongoServerException.class, () -> collection.insertOne(Document.parse("{a: 1}"))); return startTime.elapsed(); } finally { - // TODO-BACKPRESSURE Valentin uncomment below when https://github.com/mongodb/mongo-java-driver/pull/1899 is merged - // ExponentialBackoff.clearTestJitterSupplier(); + ExponentialBackoff.clearTestJitterSupplier(); } } @@ -99,7 +97,6 @@ private static Duration measureFailedInsertDuration(final MongoCollection. */ @Test - @Disabled("TODO-BACKPRESSURE Valentin Enable when implementing JAVA-5956, JAVA-6117, JAVA-6113, JAVA-6119, JAVA-6141") void overloadErrorsAreRetriedAtMostMaxRetriesTimes() throws InterruptedException { overloadErrorsAreRetriedLimitedNumberOfTimes(null); } @@ -109,7 +106,6 @@ void overloadErrorsAreRetriedAtMostMaxRetriesTimes() throws InterruptedException * Test 4: Overload Errors are Retried a Maximum of {@code maxAdaptiveRetries} times when configured. */ @Test - @Disabled("TODO-BACKPRESSURE Valentin Enable when implementing JAVA-5956, JAVA-6117, JAVA-6113, JAVA-6119, JAVA-6141") void overloadErrorsAreRetriedAtMostMaxAdaptiveRetriesTimesWhenConfigured() throws InterruptedException { overloadErrorsAreRetriedLimitedNumberOfTimes(1); } @@ -138,8 +134,7 @@ private void overloadErrorsAreRetriedLimitedNumberOfTimes(@Nullable final Intege MongoServerException exception = assertThrows(MongoServerException.class, () -> collection.find().first()); assertTrue(exception.hasErrorLabel(SYSTEM_OVERLOADED_ERROR_LABEL)); assertTrue(exception.hasErrorLabel(RETRYABLE_ERROR_LABEL)); - // TODO-BACKPRESSURE Valentin replace 2 with `MAX_RETRIES` when implementing JAVA-5956, JAVA-6117, JAVA-6113, JAVA-6119, JAVA-6141 - int expectedAttempts = (maxAdaptiveRetries == null ? 2 : maxAdaptiveRetries) + 1; + int expectedAttempts = (maxAdaptiveRetries == null ? DEFAULT_MAX_ADAPTIVE_RETRIES : maxAdaptiveRetries) + 1; assertEquals(expectedAttempts, commandListener.getCommandStartedEvents().size()); } } diff --git a/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesProseTest.java index d996cbd0dd7..e93beb33e4f 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesProseTest.java +++ b/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesProseTest.java @@ -40,7 +40,6 @@ import org.bson.BsonDocument; import org.bson.BsonInt32; import org.bson.Document; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.time.Duration; @@ -50,7 +49,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -72,6 +70,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -118,7 +117,7 @@ public static void poolClearedExceptionMustBeRetryable( * As a result, the client has to wait for at least its heartbeat delay until it hears back from a server * (while it waits for a response, calling `ServerMonitor.connect` has no effect). * Thus, we want to use small heartbeat delay to reduce delays in the test. */ - .heartbeatFrequency(50, TimeUnit.MILLISECONDS)) + .heartbeatFrequency(50, MILLISECONDS)) .retryReads(true) .retryWrites(true) .addCommandListener(commandListener) @@ -213,7 +212,7 @@ public static void originalErrorMustBePropagatedIfNoWritesPerformed( .addCommandListener(commandListener) .applyToServerSettings(builder -> // see `poolClearedExceptionMustBeRetryable` for the explanation - builder.heartbeatFrequency(50, TimeUnit.MILLISECONDS)) + builder.heartbeatFrequency(50, MILLISECONDS)) .build()); FailPoint ignored = FailPoint.enable(configureFailPoint, primaryServerAddress)) { MongoCollection collection = dropAndGetCollection("originalErrorMustBePropagatedIfNoWritesPerformed", client); @@ -361,7 +360,6 @@ public static void retriesOnSameMongosWhenAnotherNotAvailable( * Case 1: Test that drivers return the correct error when receiving only errors without NoWritesPerformed. */ @Test - @Disabled("TODO-BACKPRESSURE Valentin Enable when implementing JAVA-6055") void errorPropagationAfterEncounteringMultipleErrorsCase1() throws Exception { errorPropagationAfterEncounteringMultipleErrorsCase1(MongoClients::create); } @@ -509,6 +507,7 @@ private static void errorPropagationAfterEncounteringMultipleErrors( MongoClient client = clientCreator.apply(getMongoClientSettingsBuilder() .retryWrites(true) .addCommandListener(commandListener) + .applyToServerSettings(builder -> builder.heartbeatFrequency(500, MILLISECONDS)) .build()); FailPoint ignored = FailPoint.enable(configureFailPoint, primaryServerAddress)) { MongoCollection collection = dropAndGetCollection("errorPropagationAfterEncounteringMultipleErrors", client); diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedClientBackpressureTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedClientBackpressureTest.java new file mode 100644 index 00000000000..479c2051355 --- /dev/null +++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedClientBackpressureTest.java @@ -0,0 +1,27 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.client.unified; + +import org.junit.jupiter.params.provider.Arguments; + +import java.util.Collection; + +final class UnifiedClientBackpressureTest extends UnifiedSyncTest { + private static Collection data() { + return getTestData("client-backpressure"); + } +} diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java index ed52f518091..669daf39689 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java +++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java @@ -455,14 +455,61 @@ public static void applyCustomizations(final TestDef def) { def.skipNoncompliant("`MongoCluster.getWriteConcern`/`MongoCollection.getWriteConcern` are silently ignored in a transaction") .test("transactions", "client bulkWrite transactions", "client bulkWrite with writeConcern in a transaction causes a transaction error"); + // TODO-BACKPRESSURE enable the below tests when JAVA-5956 is done def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") - .file("transactions", "backpressure-retryable-writes"); + // TODO-BACKPRESSURE The problem is `CommandMessage` not adding `startTransaction` because `firstMessageInTransaction` is `false` + // `ClientSessionImpl.notifyMessageSent`, more specifically `messageSentInCurrentTransaction` is at play. + .test("transactions", "backpressure-retryable-writes", "retry succeeds if backpressure labels are added to the first operation in a transaction"); def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") - .file("transactions", "backpressure-retryable-reads"); + // TODO-BACKPRESSURE The problem is `CommitTransactionOperation.getRetryCommandModifier` adding `withW("majority")` + // `CommitTransactionOperation.alreadyCommitted` is at play. + .test("transactions", "backpressure-retryable-commit", "commitTransaction retries if backpressure labels are added"); + + // backpressure + + def.modify(WAIT_FOR_BATCH_CURSOR_CREATION) + .test("client-backpressure", "tests that operations retry at most maxAttempts=2 times", + "client.createChangeStream retries at most maxAttempts=2 times") + .test("client-backpressure", "tests that operations retry at most maxAttempts=2 times", + "database.createChangeStream retries at most maxAttempts=2 times") + .test("client-backpressure", "tests that operations retry at most maxAttempts=2 times", + "collection.createChangeStream retries at most maxAttempts=2 times") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", + "client.createChangeStream retries using operation loop") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", + "client.createChangeStream (read) does not retry if retryReads=false") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", + "database.createChangeStream retries using operation loop") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", + "database.createChangeStream (read) does not retry if retryReads=false") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", + "collection.createChangeStream retries using operation loop") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", + "collection.createChangeStream (read) does not retry if retryReads=false"); + + // TODO-BACKPRESSURE enable the below tests when JAVA-5956 is done + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", "database.runCommand retries using operation loop"); + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", "collection.createIndex retries using operation loop"); + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", "collection.dropIndex retries using operation loop"); + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", "collection.dropIndexes retries using operation loop"); + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations respect overload backoff retry loop", "collection.aggregate write retries using operation loop"); + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations retry at most maxAttempts=2 times", "database.runCommand retries at most maxAttempts=2 times"); + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations retry at most maxAttempts=2 times", "collection.createIndex retries at most maxAttempts=2 times"); + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations retry at most maxAttempts=2 times", "collection.dropIndex retries at most maxAttempts=2 times"); + def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") + .test("client-backpressure", "tests that operations retry at most maxAttempts=2 times", "collection.dropIndexes retries at most maxAttempts=2 times"); def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") - .file("transactions", "backpressure-retryable-commit"); + .test("client-backpressure", "tests that operations retry at most maxAttempts=2 times", "collection.aggregate write retries at most maxAttempts=2 times"); def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956") - .file("transactions", "backpressure-retryable-abort"); + .file("client-backpressure", "getMore-retried-backpressure"); // valid-pass diff --git a/driver-sync/src/test/unit/com/mongodb/client/MongoClientSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/MongoClientSpecification.groovy index f8a825b96ab..cad75491fb5 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/MongoClientSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/MongoClientSpecification.groovy @@ -82,7 +82,7 @@ class MongoClientSpecification extends Specification { where: expectedDatabase << new MongoDatabaseImpl('name', withUuidRepresentation(CODEC_REGISTRY, UNSPECIFIED), secondary(), - WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY, UNSPECIFIED, null, + WriteConcern.MAJORITY, true, true, null, ReadConcern.MAJORITY, UNSPECIFIED, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) } @@ -98,14 +98,14 @@ class MongoClientSpecification extends Specification { then: expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl<>(session, Document, - withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), primary(), executor, true, TIMEOUT_SETTINGS)) + withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), primary(), executor, true, null, TIMEOUT_SETTINGS)) when: listDatabasesIterable = execute(listDatabasesMethod, session, BsonDocument) then: expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl<>(session, BsonDocument, - withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), primary(), executor, true, TIMEOUT_SETTINGS)) + withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), primary(), executor, true, null, TIMEOUT_SETTINGS)) when: def listDatabaseNamesIterable = execute(listDatabasesNamesMethod, session) as MongoIterable @@ -113,7 +113,7 @@ class MongoClientSpecification extends Specification { then: // listDatabaseNamesIterable is an instance of a MappingIterable, so have to get the mapped iterable inside it expect listDatabaseNamesIterable.getMapped(), isTheSameAs(new ListDatabasesIterableImpl<>(session, BsonDocument, - withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), primary(), executor, true, TIMEOUT_SETTINGS) + withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), primary(), executor, true, null, TIMEOUT_SETTINGS) .nameOnly(true)) cleanup: @@ -143,7 +143,7 @@ class MongoClientSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), - readPreference, readConcern, executor, [], Document, ChangeStreamLevel.CLIENT, true, TIMEOUT_SETTINGS), + readPreference, readConcern, executor, [], Document, ChangeStreamLevel.CLIENT, true, null, TIMEOUT_SETTINGS), ['codec']) when: @@ -153,7 +153,7 @@ class MongoClientSpecification extends Specification { expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), readPreference, readConcern, executor, [new Document('$match', 1)], Document, ChangeStreamLevel.CLIENT, - true, TIMEOUT_SETTINGS), ['codec']) + true, null, TIMEOUT_SETTINGS), ['codec']) when: changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument) @@ -162,7 +162,7 @@ class MongoClientSpecification extends Specification { expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, withUuidRepresentation(getDefaultCodecRegistry(), UNSPECIFIED), readPreference, readConcern, executor, [new Document('$match', 1)], BsonDocument, - ChangeStreamLevel.CLIENT, true, TIMEOUT_SETTINGS), ['codec']) + ChangeStreamLevel.CLIENT, true, null, TIMEOUT_SETTINGS), ['codec']) where: session << [null, Stub(ClientSession)] diff --git a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy index cb34236c627..143da45fc98 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy @@ -64,7 +64,7 @@ class GridFSBucketSpecification extends Specification { def registry = MongoClientSettings.getDefaultCodecRegistry() def database = databaseWithExecutor(Stub(OperationExecutor)) def databaseWithExecutor(OperationExecutor executor) { - new MongoDatabaseImpl('test', registry, primary(), WriteConcern.ACKNOWLEDGED, false, false, readConcern, + new MongoDatabaseImpl('test', registry, primary(), WriteConcern.ACKNOWLEDGED, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) } @@ -160,7 +160,7 @@ class GridFSBucketSpecification extends Specification { given: def defaultChunkSizeBytes = 255 * 1024 def database = new MongoDatabaseImpl('test', fromProviders(new DocumentCodecProvider()), secondary(), WriteConcern.ACKNOWLEDGED, - false, false, readConcern, JAVA_LEGACY, null, + false, false, null, readConcern, JAVA_LEGACY, null, new TimeoutSettings(0, 0, 0, null, 0), new TestOperationExecutor([])) @@ -604,7 +604,8 @@ class GridFSBucketSpecification extends Specification { then: executor.getReadPreference() == primary() - expect executor.getReadOperation(), isTheSameAs(new FindOperation(new MongoNamespace('test.fs.files'), decoder) + expect executor.getReadOperation(), isTheSameAs(new FindOperation(new MongoNamespace('test.fs.files'), decoder, + null) .filter(new BsonDocument())) when: @@ -615,7 +616,7 @@ class GridFSBucketSpecification extends Specification { then: executor.getReadPreference() == secondary() expect executor.getReadOperation(), isTheSameAs( - new FindOperation(new MongoNamespace('test.fs.files'), decoder).filter(filter)) + new FindOperation(new MongoNamespace('test.fs.files'), decoder, null).filter(filter)) } def 'should throw an exception if file not found when opening by name'() { diff --git a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy index 0064cc9aad8..ef980fd7271 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy @@ -35,8 +35,8 @@ class GridFSBucketsSpecification extends Specification { def 'should create a GridFSBucket with default bucket name'() { given: - def database = new MongoDatabaseImpl('db', Stub(CodecRegistry), Stub(ReadPreference), Stub(WriteConcern), false, true, readConcern, - JAVA_LEGACY, null, ClusterFixture.TIMEOUT_SETTINGS, Stub(OperationExecutor)) + def database = new MongoDatabaseImpl('db', Stub(CodecRegistry), Stub(ReadPreference), Stub(WriteConcern), false, true, null, + readConcern, JAVA_LEGACY, null, ClusterFixture.TIMEOUT_SETTINGS, Stub(OperationExecutor)) when: def gridFSBucket = GridFSBuckets.create(database) @@ -48,8 +48,8 @@ class GridFSBucketsSpecification extends Specification { def 'should create a GridFSBucket with custom bucket name'() { given: - def database = new MongoDatabaseImpl('db', Stub(CodecRegistry), Stub(ReadPreference), Stub(WriteConcern), false, true, readConcern, - JAVA_LEGACY, null, ClusterFixture.TIMEOUT_SETTINGS, Stub(OperationExecutor)) + def database = new MongoDatabaseImpl('db', Stub(CodecRegistry), Stub(ReadPreference), Stub(WriteConcern), false, true, null, + readConcern, JAVA_LEGACY, null, ClusterFixture.TIMEOUT_SETTINGS, Stub(OperationExecutor)) def customName = 'custom' when: diff --git a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy index 40cd03bc7e9..7aabe09dd21 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy @@ -57,7 +57,7 @@ class GridFSFindIterableSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null]) def underlying = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor, - new Document(), true, TIMEOUT_SETTINGS) + new Document(), true, null, TIMEOUT_SETTINGS) def findIterable = new GridFSFindIterableImpl(underlying) when: 'default input should be as expected' @@ -67,7 +67,8 @@ class GridFSFindIterableSpecification extends Specification { def readPreference = executor.getReadPreference() then: - expect operation, isTheSameAs(new FindOperation(namespace, gridFSFileCodec) + expect operation, isTheSameAs(new FindOperation(namespace, gridFSFileCodec, + null) .filter(new BsonDocument()).retryReads(true)) readPreference == secondary() @@ -85,7 +86,8 @@ class GridFSFindIterableSpecification extends Specification { operation = executor.getReadOperation() as FindOperation then: 'should use the overrides' - expect operation, isTheSameAs(new FindOperation(namespace, gridFSFileCodec) + expect operation, isTheSameAs(new FindOperation(namespace, gridFSFileCodec, + null) .filter(new BsonDocument('filter', new BsonInt32(2))) .sort(new BsonDocument('sort', new BsonInt32(2))) .batchSize(99) @@ -101,7 +103,7 @@ class GridFSFindIterableSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null]) def findIterable = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, - executor, new Document('filter', 1), true, TIMEOUT_SETTINGS) + executor, new Document('filter', 1), true, null, TIMEOUT_SETTINGS) when: findIterable.filter(new Document('filter', 1)) @@ -111,7 +113,8 @@ class GridFSFindIterableSpecification extends Specification { def operation = executor.getReadOperation() as FindOperation then: - expect operation, isTheSameAs(new FindOperation(namespace, gridFSFileCodec) + expect operation, isTheSameAs(new FindOperation(namespace, gridFSFileCodec, + null) .filter(new BsonDocument('filter', new BsonInt32(1))) .sort(new BsonDocument('sort', new BsonInt32(1))) .cursorType(CursorType.NonTailable) @@ -130,7 +133,7 @@ class GridFSFindIterableSpecification extends Specification { , null), ] def cursor = { - def batchToReturn = cannedResults.collect(); + def batchToReturn = cannedResults.collect() Stub(BatchCursor) { def count = 0 def results @@ -149,7 +152,7 @@ class GridFSFindIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]) def underlying = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor, - new Document(), true, TIMEOUT_SETTINGS) + new Document(), true, null, TIMEOUT_SETTINGS) def mongoIterable = new GridFSFindIterableImpl(underlying) when: diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/AggregateIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/AggregateIterableSpecification.groovy index 467e9614424..01c94a882f9 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/AggregateIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/AggregateIterableSpecification.groovy @@ -63,7 +63,7 @@ class AggregateIterableSpecification extends Specification { def pipeline = [new Document('$match', 1)] def aggregationIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, - true, TIMEOUT_SETTINGS) + true, null, TIMEOUT_SETTINGS) when: 'default input should be as expected' aggregationIterable.iterator() @@ -73,7 +73,7 @@ class AggregateIterableSpecification extends Specification { then: expect operation, isTheSameAs(new AggregateOperation(namespace, - [new BsonDocument('$match', new BsonInt32(1))], new DocumentCodec()) + [new BsonDocument('$match', new BsonInt32(1))], new DocumentCodec(), null) .retryReads(true)) readPreference == secondary() @@ -90,7 +90,7 @@ class AggregateIterableSpecification extends Specification { then: 'should use the overrides' expect operation, isTheSameAs(new AggregateOperation(namespace, - [new BsonDocument('$match', new BsonInt32(1))], new DocumentCodec()) + [new BsonDocument('$match', new BsonInt32(1))], new DocumentCodec(), null) .retryReads(true) .collation(collation) .hint(new BsonDocument('a', new BsonInt32(1))) @@ -98,7 +98,7 @@ class AggregateIterableSpecification extends Specification { when: 'both hint and hint string are set' aggregationIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) aggregationIterable .hint(new Document('a', 1)) @@ -109,7 +109,7 @@ class AggregateIterableSpecification extends Specification { then: 'should use hint not hint string' expect operation, isTheSameAs(new AggregateOperation(namespace, - [new BsonDocument('$match', new BsonInt32(1))], new DocumentCodec()) + [new BsonDocument('$match', new BsonInt32(1))], new DocumentCodec(), null) .hint(new BsonDocument('a', new BsonInt32(1)))) } @@ -122,7 +122,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $out' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) .batchSize(99) .allowDiskUse(true) .collation(collation) @@ -152,7 +152,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $out and is at the database level' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.DATABASE, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.DATABASE, false, null, TIMEOUT_SETTINGS) .batchSize(99) .maxTime(100, MILLISECONDS) .allowDiskUse(true) @@ -185,7 +185,7 @@ class AggregateIterableSpecification extends Specification { when: 'toCollection should work as expected' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) .allowDiskUse(true) .collation(collation) .hint(new Document('a', 1)) @@ -212,7 +212,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $out and hint string' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) .hintString('x_1').iterator() def operation = executor.getReadOperation() as AggregateToCollectionOperation @@ -226,7 +226,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $out and hint and hint string' executor = new TestOperationExecutor([null, null, null, null, null]) new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) .hint(new BsonDocument('x', new BsonInt32(1))) .hintString('x_1').iterator() @@ -250,7 +250,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $merge' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) .batchSize(99) .allowDiskUse(true) .collation(collation) @@ -281,7 +281,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $merge into a different database' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipelineWithIntoDocument, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + pipelineWithIntoDocument, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) .batchSize(99) .maxTime(100, MILLISECONDS) .allowDiskUse(true) @@ -314,7 +314,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $merge and is at the database level' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.DATABASE, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.DATABASE, false, null, TIMEOUT_SETTINGS) .batchSize(99) .maxTime(100, MILLISECONDS) .allowDiskUse(true) @@ -346,7 +346,7 @@ class AggregateIterableSpecification extends Specification { when: 'toCollection should work as expected' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) .allowDiskUse(true) .collation(collation) .hint(new Document('a', 1)) @@ -375,7 +375,7 @@ class AggregateIterableSpecification extends Specification { when: new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) .iterator() def operation = executor.getReadOperation() as AggregateToCollectionOperation @@ -419,7 +419,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $out' def aggregateIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) aggregateIterable.toCollection() def operation = executor.getReadOperation() as AggregateToCollectionOperation @@ -438,7 +438,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $out and is at the database level' aggregateIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, pipeline, AggregationLevel.DATABASE, false, TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, pipeline, AggregationLevel.DATABASE, false, null, TIMEOUT_SETTINGS) aggregateIterable.toCollection() operation = executor.getReadOperation() as AggregateToCollectionOperation @@ -457,7 +457,7 @@ class AggregateIterableSpecification extends Specification { when: 'toCollection should work as expected' aggregateIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) aggregateIterable.toCollection() operation = executor.getReadOperation() as AggregateToCollectionOperation @@ -475,7 +475,7 @@ class AggregateIterableSpecification extends Specification { when: 'aggregation includes $out with namespace' aggregateIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, outWithDBpipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, outWithDBpipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) aggregateIterable.toCollection() operation = executor.getReadOperation() as AggregateToCollectionOperation @@ -502,7 +502,7 @@ class AggregateIterableSpecification extends Specification { def executor = new TestOperationExecutor([batchCursor, batchCursor]) def pipeline = [new Document('$match', 1)] def aggregationIterable = new AggregateIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) when: aggregationIterable.first() @@ -528,7 +528,7 @@ class AggregateIterableSpecification extends Specification { def executor = new TestOperationExecutor([null, batchCursor, null, batchCursor, null]) def pipeline = [new Document('$match', 1), new Document('$out', 'collName')] def aggregationIterable = new AggregateIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) when: aggregationIterable.first() @@ -559,7 +559,7 @@ class AggregateIterableSpecification extends Specification { def executor = new TestOperationExecutor([new MongoException('failure')]) def pipeline = [new BsonDocument('$match', new BsonInt32(1))] def aggregationIterable = new AggregateIterableImpl(null, namespace, BsonDocument, BsonDocument, codecRegistry, readPreference, - readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) when: 'The operation fails with an exception' aggregationIterable.iterator() @@ -575,14 +575,14 @@ class AggregateIterableSpecification extends Specification { when: 'a codec is missing' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - pipeline, AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS).iterator() + pipeline, AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS).iterator() then: thrown(CodecConfigurationException) when: 'pipeline contains null' new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - [null], AggregationLevel.COLLECTION, false, TIMEOUT_SETTINGS).iterator() + [null], AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS).iterator() then: thrown(IllegalArgumentException) @@ -611,7 +611,7 @@ class AggregateIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]) def mongoIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, [new Document('$match', 1)], AggregationLevel.COLLECTION, false, + readConcern, writeConcern, executor, [new Document('$match', 1)], AggregationLevel.COLLECTION, false, null, TIMEOUT_SETTINGS) when: @@ -657,7 +657,7 @@ class AggregateIterableSpecification extends Specification { def batchSize = 5 def mongoIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, Stub(OperationExecutor), [new Document('$match', 1)], AggregationLevel.COLLECTION, - false, TIMEOUT_SETTINGS) + false, null, TIMEOUT_SETTINGS) then: mongoIterable.getBatchSize() == null diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ChangeStreamIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ChangeStreamIterableSpecification.groovy index fdf31a76b56..9915f8109eb 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/ChangeStreamIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ChangeStreamIterableSpecification.groovy @@ -61,7 +61,7 @@ class ChangeStreamIterableSpecification extends Specification { def executor = new TestOperationExecutor([null, null, null, null, null]) def pipeline = [new Document('$match', 1)] def changeStreamIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, - executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS) + executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS) when: 'default input should be as expected' changeStreamIterable.iterator() @@ -73,7 +73,7 @@ class ChangeStreamIterableSpecification extends Specification { then: expect operation, isTheSameAs(new ChangeStreamOperation(namespace, FullDocument.DEFAULT, FullDocumentBeforeChange.DEFAULT, [BsonDocument.parse('{$match: 1}')], codec, - ChangeStreamLevel.COLLECTION) + ChangeStreamLevel.COLLECTION, null) .retryReads(true)) readPreference == secondary() @@ -92,7 +92,7 @@ class ChangeStreamIterableSpecification extends Specification { then: 'should use the overrides' expect operation, isTheSameAs(new ChangeStreamOperation(namespace, FullDocument.UPDATE_LOOKUP, FullDocumentBeforeChange.WHEN_AVAILABLE, [BsonDocument.parse('{$match: 1}')], codec, - ChangeStreamLevel.COLLECTION) + ChangeStreamLevel.COLLECTION, null) .retryReads(true) .collation(collation) .resumeAfter(resumeToken) @@ -107,7 +107,7 @@ class ChangeStreamIterableSpecification extends Specification { } def executor = new TestOperationExecutor([batchCursor, batchCursor]) def changeStreamIterable = new ChangeStreamIterableImpl(clientSession, namespace, codecRegistry, readPreference, readConcern, - executor, [], Document, ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS) + executor, [], Document, ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS) when: changeStreamIterable.first() @@ -131,7 +131,7 @@ class ChangeStreamIterableSpecification extends Specification { def executor = new TestOperationExecutor([new MongoException('failure')]) def pipeline = [new BsonDocument('$match', new BsonInt32(1))] def changeStreamIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, - executor, pipeline, BsonDocument, ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS) + executor, pipeline, BsonDocument, ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS) when: 'The operation fails with an exception' changeStreamIterable.iterator() @@ -141,14 +141,14 @@ class ChangeStreamIterableSpecification extends Specification { when: 'a codec is missing' new ChangeStreamIterableImpl(null, namespace, altRegistry, readPreference, readConcern, executor, pipeline, Document, - ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS).iterator() + ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS).iterator() then: thrown(CodecConfigurationException) when: 'pipeline contains null' new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [null], Document, - ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS).iterator() + ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS).iterator() then: thrown(IllegalArgumentException) @@ -163,7 +163,7 @@ class ChangeStreamIterableSpecification extends Specification { def executor = new TestOperationExecutor([cursor(cannedResults.collect()), cursor(cannedResults.collect()), cursor(cannedResults.collect()), cursor(cannedResults.collect())]) def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [], - Document, ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS) + Document, ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS) when: def results = mongoIterable.first() @@ -212,7 +212,7 @@ class ChangeStreamIterableSpecification extends Specification { cursor(cannedResults.collect()), cursor(cannedResults.collect()), cursor(cannedResults.collect())]) def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [], - Document, ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS).withDocumentClass(RawBsonDocument) + Document, ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS).withDocumentClass(RawBsonDocument) when: def results = mongoIterable.first() @@ -256,7 +256,7 @@ class ChangeStreamIterableSpecification extends Specification { when: def batchSize = 5 def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, - Stub(OperationExecutor), [BsonDocument.parse('{$match: 1}')], BsonDocument, ChangeStreamLevel.COLLECTION, true, + Stub(OperationExecutor), [BsonDocument.parse('{$match: 1}')], BsonDocument, ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS) then: diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/DistinctIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/DistinctIterableSpecification.groovy index 82c4bf9a037..bb7aac6f3c9 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/DistinctIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/DistinctIterableSpecification.groovy @@ -56,7 +56,7 @@ class DistinctIterableSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null]) def distinctIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, - executor, 'field', new BsonDocument(), true, TIMEOUT_SETTINGS) + executor, 'field', new BsonDocument(), true, null, TIMEOUT_SETTINGS) when: 'default input should be as expected' distinctIterable.iterator() @@ -65,7 +65,7 @@ class DistinctIterableSpecification extends Specification { def readPreference = executor.getReadPreference() then: - expect operation, isTheSameAs(new DistinctOperation(namespace, 'field', new DocumentCodec()) + expect operation, isTheSameAs(new DistinctOperation(namespace, 'field', new DocumentCodec(), null) .filter(new BsonDocument()).retryReads(true)) readPreference == secondary() @@ -76,7 +76,7 @@ class DistinctIterableSpecification extends Specification { then: 'should use the overrides' expect operation, isTheSameAs( - new DistinctOperation(namespace, 'field', new DocumentCodec()) + new DistinctOperation(namespace, 'field', new DocumentCodec(), null) .filter(new BsonDocument('field', new BsonInt32(1))).collation(collation).retryReads(true)) } @@ -87,7 +87,7 @@ class DistinctIterableSpecification extends Specification { } def executor = new TestOperationExecutor([batchCursor, batchCursor]) def distinctIterable = new DistinctIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference, - readConcern, executor, 'field', new BsonDocument(), true, TIMEOUT_SETTINGS) + readConcern, executor, 'field', new BsonDocument(), true, null, TIMEOUT_SETTINGS) when: distinctIterable.first() @@ -110,7 +110,7 @@ class DistinctIterableSpecification extends Specification { def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()]) def executor = new TestOperationExecutor([new MongoException('failure')]) def distinctIterable = new DistinctIterableImpl(null, namespace, Document, BsonDocument, codecRegistry, readPreference, - readConcern, executor, 'field', new BsonDocument(), true, TIMEOUT_SETTINGS) + readConcern, executor, 'field', new BsonDocument(), true, null, TIMEOUT_SETTINGS) when: 'The operation fails with an exception' distinctIterable.iterator() @@ -147,7 +147,7 @@ class DistinctIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]) def mongoIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, ReadConcern.LOCAL, - executor, 'field', new BsonDocument(), true, TIMEOUT_SETTINGS) + executor, 'field', new BsonDocument(), true, null, TIMEOUT_SETTINGS) when: def results = mongoIterable.first() @@ -191,7 +191,7 @@ class DistinctIterableSpecification extends Specification { when: def batchSize = 5 def mongoIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, - Stub(OperationExecutor), 'field', new BsonDocument(), true, TIMEOUT_SETTINGS) + Stub(OperationExecutor), 'field', new BsonDocument(), true, null, TIMEOUT_SETTINGS) then: mongoIterable.getBatchSize() == null diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/FindIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/FindIterableSpecification.groovy index 78ab9a3601b..24b3bea0512 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/FindIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/FindIterableSpecification.groovy @@ -58,7 +58,7 @@ class FindIterableSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null, null]) def findIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, - executor, new Document('filter', 1), true, TIMEOUT_SETTINGS) + executor, new Document('filter', 1), true, null, TIMEOUT_SETTINGS) .sort(new Document('sort', 1)) .projection(new Document('projection', 1)) .batchSize(100) @@ -83,7 +83,8 @@ class FindIterableSpecification extends Specification { def readPreference = executor.getReadPreference() then: - expect operation, isTheSameAs(new FindOperation(namespace, new DocumentCodec()) + expect operation, isTheSameAs(new FindOperation(namespace, new DocumentCodec(), + null) .filter(new BsonDocument('filter', new BsonInt32(1))) .sort(new BsonDocument('sort', new BsonInt32(1))) .projection(new BsonDocument('projection', new BsonInt32(1))) @@ -128,7 +129,8 @@ class FindIterableSpecification extends Specification { then: 'should use the overrides' expect operation, isTheSameAs( - new FindOperation(namespace, new DocumentCodec()) + new FindOperation(namespace, new DocumentCodec(), + null) .filter(new BsonDocument('filter', new BsonInt32(2))) .sort(new BsonDocument('sort', new BsonInt32(2))) .projection(new BsonDocument('projection', new BsonInt32(2))) @@ -151,7 +153,7 @@ class FindIterableSpecification extends Specification { when: 'passing nulls to nullable methods' new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, - executor, new Document('filter', 1), true, TIMEOUT_SETTINGS) + executor, new Document('filter', 1), true, null, TIMEOUT_SETTINGS) .filter(null as Bson) .collation(null) .projection(null) @@ -165,7 +167,8 @@ class FindIterableSpecification extends Specification { operation = executor.getReadOperation() as FindOperation then: 'should set an empty doc for the filter' - expect operation, isTheSameAs(new FindOperation(namespace, new DocumentCodec()) + expect operation, isTheSameAs(new FindOperation(namespace, new DocumentCodec(), + null) .filter(new BsonDocument()).retryReads(true)) } @@ -176,7 +179,7 @@ class FindIterableSpecification extends Specification { } def executor = new TestOperationExecutor([batchCursor, batchCursor]) def findIterable = new FindIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference, readConcern, - executor, new Document('filter', 1), true, TIMEOUT_SETTINGS) + executor, new Document('filter', 1), true, null, TIMEOUT_SETTINGS) when: findIterable.first() @@ -198,7 +201,7 @@ class FindIterableSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null]) def findIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, - executor, new Document('filter', 1), true, TIMEOUT_SETTINGS) + executor, new Document('filter', 1), true, null, TIMEOUT_SETTINGS) when: findIterable.filter(new Document('filter', 1)) @@ -208,7 +211,8 @@ class FindIterableSpecification extends Specification { def operation = executor.getReadOperation() as FindOperation then: - expect operation, isTheSameAs(new FindOperation(namespace, new DocumentCodec()) + expect operation, isTheSameAs(new FindOperation(namespace, new DocumentCodec(), + null) .filter(new BsonDocument('filter', new BsonInt32(1))) .sort(new BsonDocument('sort', new BsonInt32(1))) .cursorType(CursorType.NonTailable) @@ -239,7 +243,7 @@ class FindIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]) def mongoIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, - executor, new Document(), true, TIMEOUT_SETTINGS) + executor, new Document(), true, null, TIMEOUT_SETTINGS) when: def results = mongoIterable.first() @@ -283,7 +287,7 @@ class FindIterableSpecification extends Specification { when: def batchSize = 5 def mongoIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, Stub(OperationExecutor), new Document(), true, TIMEOUT_SETTINGS) + readConcern, Stub(OperationExecutor), new Document(), true, null, TIMEOUT_SETTINGS) then: mongoIterable.getBatchSize() == null @@ -305,7 +309,7 @@ class FindIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor]) def mongoIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, - executor, new Document(), true, TIMEOUT_SETTINGS) + executor, new Document(), true, null, TIMEOUT_SETTINGS) when: mongoIterable.forEach(new Consumer() { diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ListCollectionsIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ListCollectionsIterableSpecification.groovy index 12556430167..b6950e4d950 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/ListCollectionsIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ListCollectionsIterableSpecification.groovy @@ -49,11 +49,11 @@ class ListCollectionsIterableSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null, null, null]) def listCollectionIterable = new ListCollectionsIterableImpl(null, 'db', false, Document, codecRegistry, - readPreference, executor, true, TIMEOUT_SETTINGS) + readPreference, executor, true, null, TIMEOUT_SETTINGS) .filter(new Document('filter', 1)) .batchSize(100) def listCollectionNamesIterable = new ListCollectionsIterableImpl(null, 'db', true, Document, codecRegistry, - readPreference, executor, true, TIMEOUT_SETTINGS) + readPreference, executor, true, null, TIMEOUT_SETTINGS) when: 'default input should be as expected' listCollectionIterable.iterator() @@ -62,7 +62,7 @@ class ListCollectionsIterableSpecification extends Specification { def readPreference = executor.getReadPreference() then: - expect operation, isTheSameAs(new ListCollectionsOperation('db', new DocumentCodec()) + expect operation, isTheSameAs(new ListCollectionsOperation('db', new DocumentCodec(), null) .filter(new BsonDocument('filter', new BsonInt32(1))).batchSize(100) .retryReads(true) .authorizedCollections(false)) @@ -74,7 +74,7 @@ class ListCollectionsIterableSpecification extends Specification { operation = executor.getReadOperation() as ListCollectionsOperation then: 'should use the overrides' - expect operation, isTheSameAs(new ListCollectionsOperation('db', new DocumentCodec()) + expect operation, isTheSameAs(new ListCollectionsOperation('db', new DocumentCodec(), null) .filter(new BsonDocument('filter', new BsonInt32(2))).batchSize(99) .retryReads(true)) @@ -84,7 +84,7 @@ class ListCollectionsIterableSpecification extends Specification { operation = executor.getReadOperation() as ListCollectionsOperation then: 'should create operation with nameOnly' - expect operation, isTheSameAs(new ListCollectionsOperation('db', new DocumentCodec()).nameOnly(true) + expect operation, isTheSameAs(new ListCollectionsOperation('db', new DocumentCodec(), null).nameOnly(true) .retryReads(true)) when: 'requesting `authorizedCollections`' @@ -92,7 +92,7 @@ class ListCollectionsIterableSpecification extends Specification { operation = executor.getReadOperation() as ListCollectionsOperation then: 'should create operation with `authorizedCollections`' - expect operation, isTheSameAs(new ListCollectionsOperation('db', new DocumentCodec()) + expect operation, isTheSameAs(new ListCollectionsOperation('db', new DocumentCodec(), null) .authorizedCollections(true) .nameOnly(true) .retryReads(true)) @@ -105,7 +105,7 @@ class ListCollectionsIterableSpecification extends Specification { } def executor = new TestOperationExecutor([batchCursor, batchCursor]) def listCollectionIterable = new ListCollectionsIterableImpl(clientSession, 'db', false, Document, codecRegistry, - readPreference, executor, true, TIMEOUT_SETTINGS) + readPreference, executor, true, null, TIMEOUT_SETTINGS) when: listCollectionIterable.first() @@ -146,7 +146,7 @@ class ListCollectionsIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]) def mongoIterable = new ListCollectionsIterableImpl(null, 'db', false, Document, codecRegistry, readPreference, - executor, true, TIMEOUT_SETTINGS) + executor, true, null, TIMEOUT_SETTINGS) when: def results = mongoIterable.first() @@ -190,7 +190,7 @@ class ListCollectionsIterableSpecification extends Specification { when: def batchSize = 5 def mongoIterable = new ListCollectionsIterableImpl(null, 'db', false, Document, codecRegistry, readPreference, - Stub(OperationExecutor), true, TIMEOUT_SETTINGS) + Stub(OperationExecutor), true, null, TIMEOUT_SETTINGS) then: mongoIterable.getBatchSize() == null diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ListDatabasesIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ListDatabasesIterableSpecification.groovy index 627cc13ef3c..eed19a5a063 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/ListDatabasesIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ListDatabasesIterableSpecification.groovy @@ -46,8 +46,8 @@ class ListDatabasesIterableSpecification extends Specification { def 'should build the expected listCollectionOperation'() { given: def executor = new TestOperationExecutor([null, null, null]) - def listDatabaseIterable = new ListDatabasesIterableImpl(null, Document, codecRegistry, readPreference, executor, true, - TIMEOUT_SETTINGS) + def listDatabaseIterable = new ListDatabasesIterableImpl(null, Document, codecRegistry, readPreference, executor, + true, null, TIMEOUT_SETTINGS) when: 'default input should be as expected' listDatabaseIterable.iterator() @@ -56,7 +56,7 @@ class ListDatabasesIterableSpecification extends Specification { def readPreference = executor.getReadPreference() then: - expect operation, isTheSameAs(new ListDatabasesOperation(new DocumentCodec()) + expect operation, isTheSameAs(new ListDatabasesOperation(new DocumentCodec(), null) .retryReads(true)) readPreference == secondary() @@ -66,7 +66,7 @@ class ListDatabasesIterableSpecification extends Specification { operation = executor.getReadOperation() as ListDatabasesOperation then: 'should use the overrides' - expect operation, isTheSameAs(new ListDatabasesOperation(new DocumentCodec()) + expect operation, isTheSameAs(new ListDatabasesOperation(new DocumentCodec(), null) .filter(BsonDocument.parse('{a: 1}')).nameOnly(true).retryReads(true)) when: 'overriding initial options' @@ -75,7 +75,7 @@ class ListDatabasesIterableSpecification extends Specification { operation = executor.getReadOperation() as ListDatabasesOperation then: 'should use the overrides' - expect operation, isTheSameAs(new ListDatabasesOperation(new DocumentCodec()) + expect operation, isTheSameAs(new ListDatabasesOperation(new DocumentCodec(), null) .filter(BsonDocument.parse('{a: 1}')).nameOnly(true).authorizedDatabasesOnly(true).retryReads(true)) } @@ -102,7 +102,7 @@ class ListDatabasesIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]) def mongoIterable = new ListDatabasesIterableImpl(null, Document, codecRegistry, readPreference, executor, - true, TIMEOUT_SETTINGS) + true, null, TIMEOUT_SETTINGS) when: def results = mongoIterable.first() @@ -145,8 +145,8 @@ class ListDatabasesIterableSpecification extends Specification { def 'should get and set batchSize as expected'() { when: def batchSize = 5 - def mongoIterable = new ListDatabasesIterableImpl(null, Document, codecRegistry, readPreference, - Stub(OperationExecutor), true, TIMEOUT_SETTINGS) + def mongoIterable = new ListDatabasesIterableImpl(null, Document, codecRegistry, readPreference, Stub(OperationExecutor), + true, null, TIMEOUT_SETTINGS) then: mongoIterable.getBatchSize() == null diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ListIndexesIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ListIndexesIterableSpecification.groovy index f7bad5189dd..10b63480893 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/ListIndexesIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ListIndexesIterableSpecification.groovy @@ -49,7 +49,7 @@ class ListIndexesIterableSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null]) def listIndexesIterable = new ListIndexesIterableImpl(null, namespace, Document, codecRegistry, readPreference, - executor, true, TIMEOUT_SETTINGS).batchSize(100) + executor, true, null, TIMEOUT_SETTINGS).batchSize(100) when: 'default input should be as expected' listIndexesIterable.iterator() @@ -58,7 +58,7 @@ class ListIndexesIterableSpecification extends Specification { def readPreference = executor.getReadPreference() then: - expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()) + expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec(), null) .batchSize(100).retryReads(true)) readPreference == secondary() @@ -70,7 +70,7 @@ class ListIndexesIterableSpecification extends Specification { operation = executor.getReadOperation() as ListIndexesOperation then: 'should use the overrides' - expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()) + expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec(), null) .batchSize(99).retryReads(true)) } @@ -81,7 +81,7 @@ class ListIndexesIterableSpecification extends Specification { } def executor = new TestOperationExecutor([batchCursor, batchCursor]) def listIndexesIterable = new ListIndexesIterableImpl(clientSession, namespace, Document, codecRegistry, readPreference, - executor, true, TIMEOUT_SETTINGS) + executor, true, null, TIMEOUT_SETTINGS) when: listIndexesIterable.first() @@ -123,7 +123,7 @@ class ListIndexesIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]) def mongoIterable = new ListIndexesIterableImpl(null, namespace, Document, codecRegistry, readPreference, - executor, true, TIMEOUT_SETTINGS) + executor, true, null, TIMEOUT_SETTINGS) when: def results = mongoIterable.first() @@ -167,7 +167,7 @@ class ListIndexesIterableSpecification extends Specification { when: def batchSize = 5 def mongoIterable = new ListIndexesIterableImpl(null, namespace, Document, codecRegistry, readPreference, - Stub(OperationExecutor), true, TIMEOUT_SETTINGS) + Stub(OperationExecutor), true, null, TIMEOUT_SETTINGS) then: mongoIterable.getBatchSize() == null diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MapReduceIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MapReduceIterableSpecification.groovy index b2b7faa6b2a..e51cb062e76 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/MapReduceIterableSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MapReduceIterableSpecification.groovy @@ -63,7 +63,7 @@ class MapReduceIterableSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null]) def mapReduceIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, 'map', 'reduce', TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, 'map', 'reduce', null, TIMEOUT_SETTINGS) when: 'default input should be as expected' mapReduceIterable.iterator() @@ -110,7 +110,7 @@ class MapReduceIterableSpecification extends Specification { when: 'mapReduce to a collection' def collectionNamespace = new MongoNamespace('dbName', 'collName') def mapReduceIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, - readPreference, readConcern, writeConcern, executor, 'map', 'reduce', TIMEOUT_SETTINGS) + readPreference, readConcern, writeConcern, executor, 'map', 'reduce', null, TIMEOUT_SETTINGS) .collectionName(collectionNamespace.getCollectionName()) .databaseName(collectionNamespace.getDatabaseName()) .filter(new Document('filter', 1)) @@ -169,7 +169,7 @@ class MapReduceIterableSpecification extends Specification { } def executor = new TestOperationExecutor([batchCursor, batchCursor]) def mapReduceIterable = new MapReduceIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, 'map', 'reduce', TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, 'map', 'reduce', null, TIMEOUT_SETTINGS) when: mapReduceIterable.first() @@ -194,7 +194,7 @@ class MapReduceIterableSpecification extends Specification { } def executor = new TestOperationExecutor([null, batchCursor, null, batchCursor, null]) def mapReduceIterable = new MapReduceIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, executor, 'map', 'reduce', TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, 'map', 'reduce', null, TIMEOUT_SETTINGS) .collectionName('collName') when: @@ -227,7 +227,7 @@ class MapReduceIterableSpecification extends Specification { def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()]) def executor = new TestOperationExecutor([new MongoException('failure')]) def mapReduceIterable = new MapReduceIterableImpl(null, namespace, BsonDocument, BsonDocument, codecRegistry, - readPreference, readConcern, writeConcern, executor, 'map', 'reduce', TIMEOUT_SETTINGS) + readPreference, readConcern, writeConcern, executor, 'map', 'reduce', null, TIMEOUT_SETTINGS) when: 'The operation fails with an exception' @@ -244,7 +244,7 @@ class MapReduceIterableSpecification extends Specification { when: 'a codec is missing' new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, - 'map', 'reduce', TIMEOUT_SETTINGS).iterator() + 'map', 'reduce', null, TIMEOUT_SETTINGS).iterator() then: thrown(CodecConfigurationException) @@ -274,7 +274,7 @@ class MapReduceIterableSpecification extends Specification { } def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]) def mongoIterable = new MapReduceIterableImpl(null, namespace, BsonDocument, BsonDocument, codecRegistry, readPreference, - readConcern, writeConcern, executor, 'map', 'reduce', TIMEOUT_SETTINGS) + readConcern, writeConcern, executor, 'map', 'reduce', null, TIMEOUT_SETTINGS) when: def results = mongoIterable.first() @@ -318,7 +318,7 @@ class MapReduceIterableSpecification extends Specification { when: def batchSize = 5 def mongoIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, - readConcern, writeConcern, Stub(OperationExecutor), 'map', 'reduce', TIMEOUT_SETTINGS) + readConcern, writeConcern, Stub(OperationExecutor), 'map', 'reduce', null, TIMEOUT_SETTINGS) then: mongoIterable.getBatchSize() == null diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy index b6469cfb829..77464fa0183 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoClusterSpecification.groovy @@ -78,7 +78,7 @@ class MongoClusterSpecification extends Specification { where: expectedDatabase << new MongoDatabaseImpl('name', CODEC_REGISTRY, secondary(), - WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY, UNSPECIFIED, null, + WriteConcern.MAJORITY, true, true, null, ReadConcern.MAJORITY, UNSPECIFIED, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) } @@ -163,14 +163,14 @@ class MongoClusterSpecification extends Specification { then: expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl<>(session, Document, - CLIENT_SETTINGS.codecRegistry, primary(), executor, true, TIMEOUT_SETTINGS)) + CLIENT_SETTINGS.codecRegistry, primary(), executor, true, null, TIMEOUT_SETTINGS)) when: listDatabasesIterable = execute(listDatabasesMethod, session, BsonDocument) then: expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl<>(session, BsonDocument, - CLIENT_SETTINGS.codecRegistry, primary(), executor, true, TIMEOUT_SETTINGS)) + CLIENT_SETTINGS.codecRegistry, primary(), executor, true, null, TIMEOUT_SETTINGS)) when: def listDatabaseNamesIterable = execute(listDatabasesNamesMethod, session) as MongoIterable @@ -178,7 +178,7 @@ class MongoClusterSpecification extends Specification { then: // listDatabaseNamesIterable is an instance of a MappingIterable, so have to get the mapped iterable inside it expect listDatabaseNamesIterable.getMapped(), isTheSameAs(new ListDatabasesIterableImpl<>(session, BsonDocument, - CLIENT_SETTINGS.codecRegistry, primary(), executor, true, TIMEOUT_SETTINGS) + CLIENT_SETTINGS.codecRegistry, primary(), executor, true, null, TIMEOUT_SETTINGS) .nameOnly(true)) where: @@ -204,7 +204,7 @@ class MongoClusterSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, settings.codecRegistry, - readPreference, readConcern, executor, [], Document, ChangeStreamLevel.CLIENT, true, TIMEOUT_SETTINGS), + readPreference, readConcern, executor, [], Document, ChangeStreamLevel.CLIENT, true, null, TIMEOUT_SETTINGS), ['codec']) when: @@ -213,7 +213,7 @@ class MongoClusterSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, settings.codecRegistry, readPreference, readConcern, executor, [new Document('$match', 1)], Document, ChangeStreamLevel.CLIENT, - true, TIMEOUT_SETTINGS), ['codec']) + true, null, TIMEOUT_SETTINGS), ['codec']) when: changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument) @@ -221,7 +221,7 @@ class MongoClusterSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, settings.codecRegistry, readPreference, readConcern, executor, [new Document('$match', 1)], BsonDocument, - ChangeStreamLevel.CLIENT, true, TIMEOUT_SETTINGS), ['codec']) + ChangeStreamLevel.CLIENT, true, null, TIMEOUT_SETTINGS), ['codec']) where: session << [null, Stub(ClientSession)] @@ -259,7 +259,8 @@ class MongoClusterSpecification extends Specification { MongoClusterImpl createMongoCluster(final MongoClientSettings settings, final OperationExecutor operationExecutor) { new MongoClusterImpl(null, cluster, settings.codecRegistry, null, null, - originator, operationExecutor, settings.readConcern, settings.readPreference, settings.retryReads, settings.retryWrites, + originator, operationExecutor, settings.readConcern, settings.readPreference, + settings.retryReads, settings.retryWrites, null, settings.enableOverloadRetargeting, null, serverSessionPool, TimeoutSettings.create(settings), settings.uuidRepresentation, settings.writeConcern, AsyncClientExecutor.NO_OP, TracingManager.NO_OP) } diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoCollectionSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoCollectionSpecification.groovy index cbe43c10517..fa7c8685093 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoCollectionSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoCollectionSpecification.groovy @@ -123,7 +123,7 @@ class MongoCollectionSpecification extends Specification { def 'should return the correct name from getName'() { given: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true, - true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([null])) + true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([null])) expect: collection.getNamespace() == namespace @@ -136,12 +136,12 @@ class MongoCollectionSpecification extends Specification { when: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor).withDocumentClass(newClass) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor).withDocumentClass(newClass) then: collection.getDocumentClass() == newClass expect collection, isTheSameAs(new MongoCollectionImpl(namespace, newClass, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) } def 'should behave correctly when using withCodecRegistry'() { @@ -151,12 +151,12 @@ class MongoCollectionSpecification extends Specification { when: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, C_SHARP_LEGACY, null, TIMEOUT_SETTINGS, executor).withCodecRegistry(newCodecRegistry) + true, true, null, readConcern, C_SHARP_LEGACY, null, TIMEOUT_SETTINGS, executor).withCodecRegistry(newCodecRegistry) then: (collection.getCodecRegistry().get(UUID) as UuidCodec).getUuidRepresentation() == C_SHARP_LEGACY expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, collection.getCodecRegistry(), readPreference, - ACKNOWLEDGED, true, true, readConcern, C_SHARP_LEGACY, null, TIMEOUT_SETTINGS, executor)) + ACKNOWLEDGED, true, true, null, readConcern, C_SHARP_LEGACY, null, TIMEOUT_SETTINGS, executor)) } def 'should behave correctly when using withReadPreference'() { @@ -166,12 +166,12 @@ class MongoCollectionSpecification extends Specification { when: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor).withReadPreference(newReadPreference) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor).withReadPreference(newReadPreference) then: collection.getReadPreference() == newReadPreference expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, newReadPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) } def 'should behave correctly when using withWriteConcern'() { @@ -181,12 +181,12 @@ class MongoCollectionSpecification extends Specification { when: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor).withWriteConcern(newWriteConcern) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor).withWriteConcern(newWriteConcern) then: collection.getWriteConcern() == newWriteConcern expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, newWriteConcern, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) } def 'should behave correctly when using withReadConcern'() { @@ -196,19 +196,19 @@ class MongoCollectionSpecification extends Specification { when: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor).withReadConcern(newReadConcern) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor).withReadConcern(newReadConcern) then: collection.getReadConcern() == newReadConcern expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, newReadConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) + true, true, null, newReadConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) } def 'should behave correctly when using withTimeout'() { given: def executor = new TestOperationExecutor([]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: def newCollection = collection.withTimeout(10_000, MILLISECONDS) @@ -216,7 +216,7 @@ class MongoCollectionSpecification extends Specification { then: newCollection.getTimeout(MILLISECONDS) == 10_000 expect newCollection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS.withTimeout(10_000, MILLISECONDS), executor)) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS.withTimeout(10_000, MILLISECONDS), executor)) when: collection.withTimeout(500, TimeUnit.NANOSECONDS) @@ -230,8 +230,8 @@ class MongoCollectionSpecification extends Specification { def executor = new TestOperationExecutor([1L, 2L, 3L, 4L]) def filter = new BsonDocument() def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true, - true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) - def expectedOperation = new CountDocumentsOperation(namespace) + true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + def expectedOperation = new CountDocumentsOperation(namespace, null) .filter(filter).retryReads(true) def countMethod = collection.&countDocuments @@ -271,8 +271,8 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([1L, 2L]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true, - true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) - def expectedOperation = new EstimatedDocumentCountOperation(namespace) + true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + def expectedOperation = new EstimatedDocumentCountOperation(namespace, null) .retryReads(true) def countMethod = collection.&estimatedDocumentCount @@ -286,7 +286,7 @@ class MongoCollectionSpecification extends Specification { expect operation, isTheSameAs(expectedOperation) when: - expectedOperation = new EstimatedDocumentCountOperation(namespace).retryReads(true) + expectedOperation = new EstimatedDocumentCountOperation(namespace, null).retryReads(true) execute(countMethod, session, new EstimatedDocumentCountOptions().maxTime(100, MILLISECONDS)) operation = executor.getReadOperation() as EstimatedDocumentCountOperation @@ -302,7 +302,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def filter = new Document('a', 1) def distinctMethod = collection.&distinct @@ -311,14 +311,14 @@ class MongoCollectionSpecification extends Specification { then: expect distinctIterable, isTheSameAs(new DistinctIterableImpl<>(session, namespace, Document, String, - codecRegistry, readPreference, readConcern, executor, 'field', new BsonDocument(), true, TIMEOUT_SETTINGS)) + codecRegistry, readPreference, readConcern, executor, 'field', new BsonDocument(), true, null, TIMEOUT_SETTINGS)) when: distinctIterable = execute(distinctMethod, session, 'field', String).filter(filter) then: expect distinctIterable, isTheSameAs(new DistinctIterableImpl<>(session, namespace, Document, String, - codecRegistry, readPreference, readConcern, executor, 'field', filter, true, TIMEOUT_SETTINGS)) + codecRegistry, readPreference, readConcern, executor, 'field', filter, true, null, TIMEOUT_SETTINGS)) where: session << [null, Stub(ClientSession)] @@ -328,7 +328,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def findMethod = collection.&find when: @@ -336,28 +336,28 @@ class MongoCollectionSpecification extends Specification { then: expect findIterable, isTheSameAs(new FindIterableImpl<>(session, namespace, Document, Document, codecRegistry, - readPreference, readConcern, executor, new BsonDocument(), true, TIMEOUT_SETTINGS)) + readPreference, readConcern, executor, new BsonDocument(), true, null, TIMEOUT_SETTINGS)) when: findIterable = execute(findMethod, session, BsonDocument) then: expect findIterable, isTheSameAs(new FindIterableImpl<>(session, namespace, Document, BsonDocument, - codecRegistry, readPreference, readConcern, executor, new BsonDocument(), true, TIMEOUT_SETTINGS)) + codecRegistry, readPreference, readConcern, executor, new BsonDocument(), true, null, TIMEOUT_SETTINGS)) when: findIterable = execute(findMethod, session, new Document()) then: expect findIterable, isTheSameAs(new FindIterableImpl<>(session, namespace, Document, Document, - codecRegistry, readPreference, readConcern, executor, new Document(), true, TIMEOUT_SETTINGS)) + codecRegistry, readPreference, readConcern, executor, new Document(), true, null, TIMEOUT_SETTINGS)) when: findIterable = execute(findMethod, session, new Document(), BsonDocument) then: expect findIterable, isTheSameAs(new FindIterableImpl<>(session, namespace, Document, BsonDocument, - codecRegistry, readPreference, readConcern, executor, new Document(), true, TIMEOUT_SETTINGS)) + codecRegistry, readPreference, readConcern, executor, new Document(), true, null, TIMEOUT_SETTINGS)) where: session << [null, Stub(ClientSession)] @@ -367,7 +367,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def aggregateMethod = collection.&aggregate when: @@ -376,7 +376,7 @@ class MongoCollectionSpecification extends Specification { then: expect aggregateIterable, isTheSameAs(new AggregateIterableImpl<>(session, namespace, Document, Document, codecRegistry, readPreference, readConcern, ACKNOWLEDGED, executor, [new Document('$match', 1)], - AggregationLevel.COLLECTION, true, TIMEOUT_SETTINGS)) + AggregationLevel.COLLECTION, true, null, TIMEOUT_SETTINGS)) when: aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)], BsonDocument) @@ -384,7 +384,7 @@ class MongoCollectionSpecification extends Specification { then: expect aggregateIterable, isTheSameAs(new AggregateIterableImpl<>(session, namespace, Document, BsonDocument, codecRegistry, readPreference, readConcern, ACKNOWLEDGED, executor, [new Document('$match', 1)], - AggregationLevel.COLLECTION, true, TIMEOUT_SETTINGS)) + AggregationLevel.COLLECTION, true, null, TIMEOUT_SETTINGS)) where: session << [null, Stub(ClientSession)] @@ -394,7 +394,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: collection.aggregate(null) @@ -413,7 +413,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def watchMethod = collection.&watch when: @@ -421,7 +421,7 @@ class MongoCollectionSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, codecRegistry, - readPreference, readConcern, executor, [], Document, ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS), + readPreference, readConcern, executor, [], Document, ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS), ['codec']) when: @@ -430,7 +430,7 @@ class MongoCollectionSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, codecRegistry, readPreference, readConcern, executor, [new Document('$match', 1)], Document, - ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS), ['codec']) + ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS), ['codec']) when: changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument) @@ -438,7 +438,7 @@ class MongoCollectionSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, codecRegistry, readPreference, readConcern, executor, [new Document('$match', 1)], BsonDocument, - ChangeStreamLevel.COLLECTION, true, TIMEOUT_SETTINGS), ['codec']) + ChangeStreamLevel.COLLECTION, true, null, TIMEOUT_SETTINGS), ['codec']) where: session << [null, Stub(ClientSession)] @@ -448,7 +448,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: collection.watch((Class) null) @@ -467,7 +467,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def mapReduceMethod = collection.&mapReduce when: @@ -475,14 +475,14 @@ class MongoCollectionSpecification extends Specification { then: expect mapReduceIterable, isTheSameAs(new MapReduceIterableImpl<>(session, namespace, Document, Document, - codecRegistry, readPreference, readConcern, ACKNOWLEDGED, executor, 'map', 'reduce', TIMEOUT_SETTINGS)) + codecRegistry, readPreference, readConcern, ACKNOWLEDGED, executor, 'map', 'reduce', null, TIMEOUT_SETTINGS)) when: mapReduceIterable = execute(mapReduceMethod, session, 'map', 'reduce', BsonDocument) then: expect mapReduceIterable, isTheSameAs(new MapReduceIterableImpl<>(session, namespace, Document, BsonDocument, - codecRegistry, readPreference, readConcern, ACKNOWLEDGED, executor, 'map', 'reduce', TIMEOUT_SETTINGS)) + codecRegistry, readPreference, readConcern, ACKNOWLEDGED, executor, 'map', 'reduce', null, TIMEOUT_SETTINGS)) where: session << [null, Stub(ClientSession)] @@ -494,7 +494,7 @@ class MongoCollectionSpecification extends Specification { writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, 0, [], []) : unacknowledged() }) def collection = new MongoCollectionImpl(namespace, BsonDocument, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassValidation, List filters -> new MixedBulkWriteOperation(namespace, [ new InsertRequest(BsonDocument.parse('{_id: 1}')), @@ -507,7 +507,7 @@ class MongoCollectionSpecification extends Specification { .upsert(true).collation(collation).arrayFilters(filters).hint(hint).hintString(hintString), new DeleteRequest(BsonDocument.parse('{a: 5}')).multi(false), new DeleteRequest(BsonDocument.parse('{a: 6}')).multi(true).collation(collation) - ], ordered, wc, retryWrites).bypassDocumentValidation(bypassValidation) + ], ordered, wc, retryWrites, null).bypassDocumentValidation(bypassValidation) } def updateOptions = new UpdateOptions().upsert(true).collation(collation).arrayFilters(arrayFilters) .hint(hint).hintString(hintString) @@ -561,7 +561,7 @@ class MongoCollectionSpecification extends Specification { def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()]) def executor = new TestOperationExecutor([new MongoException('failure')]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: collection.bulkWrite(null) @@ -588,10 +588,10 @@ class MongoCollectionSpecification extends Specification { writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, 0, [], []) : unacknowledged() }) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = { WriteConcern wc, Boolean bypassDocumentValidation -> new MixedBulkWriteOperation(namespace, [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))], - true, wc, retryWrites).bypassDocumentValidation(bypassDocumentValidation) + true, wc, retryWrites, null).bypassDocumentValidation(bypassDocumentValidation) } def insertOneMethod = collection.&insertOne @@ -633,12 +633,12 @@ class MongoCollectionSpecification extends Specification { writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, 0, [], []) : unacknowledged() }) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassDocumentValidation -> new MixedBulkWriteOperation(namespace, [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))), new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))], - ordered, wc, retryWrites).bypassDocumentValidation(bypassDocumentValidation) + ordered, wc, retryWrites, null).bypassDocumentValidation(bypassDocumentValidation) } def insertManyMethod = collection.&insertMany @@ -679,7 +679,7 @@ class MongoCollectionSpecification extends Specification { def 'should validate the insertMany data correctly'() { given: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, Stub(OperationExecutor)) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, Stub(OperationExecutor)) when: collection.insertMany(null) @@ -701,7 +701,7 @@ class MongoCollectionSpecification extends Specification { }) def expectedResult = writeConcern.isAcknowledged() ? DeleteResult.acknowledged(1) : DeleteResult.unacknowledged() def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def deleteOneMethod = collection.&deleteOne when: @@ -712,7 +712,7 @@ class MongoCollectionSpecification extends Specification { result.wasAcknowledged() == writeConcern.isAcknowledged() expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace, [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(false)], - true, writeConcern, retryWrites)) + true, writeConcern, retryWrites, null)) result == expectedResult executor.getClientSession() == session @@ -724,7 +724,7 @@ class MongoCollectionSpecification extends Specification { result.wasAcknowledged() == writeConcern.isAcknowledged() expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace, [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(false).collation(collation)], - true, writeConcern, retryWrites)) + true, writeConcern, retryWrites, null)) result == expectedResult executor.getClientSession() == session @@ -743,7 +743,7 @@ class MongoCollectionSpecification extends Specification { def executor = new TestOperationExecutor([bulkWriteException]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: collection.deleteOne(new Document('_id', 1)) @@ -764,7 +764,7 @@ class MongoCollectionSpecification extends Specification { }) def expectedResult = writeConcern.isAcknowledged() ? DeleteResult.acknowledged(1) : DeleteResult.unacknowledged() def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def deleteManyMethod = collection.&deleteMany when: @@ -775,7 +775,7 @@ class MongoCollectionSpecification extends Specification { result.wasAcknowledged() == writeConcern.isAcknowledged() expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace, [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(true)], - true, writeConcern, retryWrites)) + true, writeConcern, retryWrites, null)) result == expectedResult when: @@ -786,7 +786,7 @@ class MongoCollectionSpecification extends Specification { result.wasAcknowledged() == writeConcern.isAcknowledged() expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace, [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(true).collation(collation)], - true, writeConcern, retryWrites)) + true, writeConcern, retryWrites, null)) result == expectedResult where: @@ -808,12 +808,13 @@ class MongoCollectionSpecification extends Specification { def expectedResult = writeConcern.isAcknowledged() ? UpdateResult.acknowledged(1, modifiedCount, upsertedId) : UpdateResult.unacknowledged() def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassValidation, Collation collation -> new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), REPLACE) - .collation(collation).upsert(upsert).hint(hint).hintString(hintString).sort(sort)], true, wc, retryWrites) + .collation(collation).upsert(upsert).hint(hint).hintString(hintString).sort(sort)], true, wc, + retryWrites, null) .bypassDocumentValidation(bypassValidation) } def replaceOneMethod = collection.&replaceOne @@ -851,7 +852,7 @@ class MongoCollectionSpecification extends Specification { def executor = new TestOperationExecutor([bulkWriteException]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: collection.replaceOne(new Document('_id', 1), new Document('_id', 1)) @@ -879,13 +880,13 @@ class MongoCollectionSpecification extends Specification { }) def expectedResult = writeConcern.isAcknowledged() ? UpdateResult.acknowledged(1, 0, null) : UpdateResult.unacknowledged() def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation, Collation collation, List filters, BsonDocument hintDoc, String hintStr, BsonDocument sortDoc -> new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), UPDATE) .multi(false).upsert(upsert).collation(collation).arrayFilters(filters) - .hint(hintDoc).hintString(hintStr).sort(sortDoc)], true, wc, retryWrites) + .hint(hintDoc).hintString(hintStr).sort(sortDoc)], true, wc, retryWrites, null) .bypassDocumentValidation(bypassDocumentValidation) } def updateOneMethod = collection.&updateOne @@ -929,13 +930,13 @@ class MongoCollectionSpecification extends Specification { }) def expectedResult = writeConcern.isAcknowledged() ? UpdateResult.acknowledged(5, 3, null) : UpdateResult.unacknowledged() def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation, Collation collation, List filters, BsonDocument hintDoc, String hintStr -> new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), UPDATE) .multi(true).upsert(upsert).collation(collation).arrayFilters(filters) - .hint(hintDoc).hintString(hintStr)], true, wc, retryWrites) + .hint(hintDoc).hintString(hintStr)], true, wc, retryWrites, null) .bypassDocumentValidation(bypassDocumentValidation) } def updateManyMethod = collection.&updateMany @@ -973,7 +974,7 @@ class MongoCollectionSpecification extends Specification { def 'should translate MongoBulkWriteException to MongoWriteException'() { given: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: collection.insertOne(new Document('_id', 1)) @@ -995,7 +996,7 @@ class MongoCollectionSpecification extends Specification { new WriteConcernError(42, 'codeName', 'Message', new BsonDocument()), new ServerAddress(), [] as Set)]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: collection.insertOne(new Document('_id', 1)) @@ -1011,8 +1012,8 @@ class MongoCollectionSpecification extends Specification { writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : unacknowledged() }) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) - def expectedOperation = new FindAndDeleteOperation(namespace, ACKNOWLEDGED, retryWrites, + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + def expectedOperation = new FindAndDeleteOperation(namespace, ACKNOWLEDGED, retryWrites, null, new DocumentCodec()) .filter(new BsonDocument('a', new BsonInt32(1))) def findOneAndDeleteMethod = collection.&findOneAndDelete @@ -1026,7 +1027,7 @@ class MongoCollectionSpecification extends Specification { when: expectedOperation = - new FindAndDeleteOperation(namespace, ACKNOWLEDGED, retryWrites, new DocumentCodec()) + new FindAndDeleteOperation(namespace, ACKNOWLEDGED, retryWrites, null, new DocumentCodec()) .filter(new BsonDocument('a', new BsonInt32(1))) .projection(new BsonDocument('projection', new BsonInt32(1))) .collation(collation) @@ -1054,9 +1055,9 @@ class MongoCollectionSpecification extends Specification { writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : WriteConcernResult.unacknowledged() }) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = new FindAndReplaceOperation(namespace, writeConcern, - retryWrites, new DocumentCodec(), new BsonDocument('a', new BsonInt32(10))) + retryWrites, null, new DocumentCodec(), new BsonDocument('a', new BsonInt32(10))) .filter(new BsonDocument('a', new BsonInt32(1))) def findOneAndReplaceMethod = collection.&findOneAndReplace @@ -1069,7 +1070,7 @@ class MongoCollectionSpecification extends Specification { when: expectedOperation = new FindAndReplaceOperation(namespace, writeConcern, - retryWrites, new DocumentCodec(), new BsonDocument('a', new BsonInt32(10))) + retryWrites, null, new DocumentCodec(), new BsonDocument('a', new BsonInt32(10))) .filter(new BsonDocument('a', new BsonInt32(1))) .projection(new BsonDocument('projection', new BsonInt32(1))) .bypassDocumentValidation(false) @@ -1099,8 +1100,8 @@ class MongoCollectionSpecification extends Specification { writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : unacknowledged() }) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, - retryWrites, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) - def expectedOperation = new FindAndUpdateOperation(namespace, writeConcern, retryWrites, + retryWrites, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + def expectedOperation = new FindAndUpdateOperation(namespace, writeConcern, retryWrites, null, new DocumentCodec(), new BsonDocument('a', new BsonInt32(10))) .filter(new BsonDocument('a', new BsonInt32(1))) def findOneAndUpdateMethod = collection.&findOneAndUpdate @@ -1113,7 +1114,7 @@ class MongoCollectionSpecification extends Specification { expect operation, isTheSameAs(expectedOperation) when: - expectedOperation = new FindAndUpdateOperation(namespace, writeConcern, retryWrites, + expectedOperation = new FindAndUpdateOperation(namespace, writeConcern, retryWrites, null, new DocumentCodec(), new BsonDocument('a', new BsonInt32(10))) .filter(new BsonDocument('a', new BsonInt32(1))) .projection(new BsonDocument('projection', new BsonInt32(1))) @@ -1147,7 +1148,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([null]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = new DropCollectionOperation(namespace, ACKNOWLEDGED) def dropMethod = collection.&drop @@ -1167,7 +1168,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null, null, null, null]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def createIndexMethod = collection.&createIndex def createIndexesMethod = collection.&createIndexes @@ -1280,7 +1281,7 @@ class MongoCollectionSpecification extends Specification { def 'should validate the createIndexes data correctly'() { given: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, Stub(OperationExecutor)) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, Stub(OperationExecutor)) when: collection.createIndexes(null) @@ -1300,7 +1301,7 @@ class MongoCollectionSpecification extends Specification { def batchCursor = Stub(BatchCursor) def executor = new TestOperationExecutor([batchCursor, batchCursor, batchCursor]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def listIndexesMethod = collection.&listIndexes when: @@ -1308,7 +1309,7 @@ class MongoCollectionSpecification extends Specification { def operation = executor.getReadOperation() as ListIndexesOperation then: - expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()).retryReads(true)) + expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec(), null).retryReads(true)) executor.getClientSession() == session when: @@ -1317,7 +1318,7 @@ class MongoCollectionSpecification extends Specification { indexes == [] then: - expect operation, isTheSameAs(new ListIndexesOperation(namespace, new BsonDocumentCodec()).retryReads(true)) + expect operation, isTheSameAs(new ListIndexesOperation(namespace, new BsonDocumentCodec(), null).retryReads(true)) executor.getClientSession() == session when: @@ -1325,7 +1326,7 @@ class MongoCollectionSpecification extends Specification { operation = executor.getReadOperation() as ListIndexesOperation then: - expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()).batchSize(10) + expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec(), null).batchSize(10) .retryReads(true)) executor.getClientSession() == session @@ -1337,7 +1338,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null, null]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def dropIndexMethod = collection.&dropIndex when: @@ -1376,7 +1377,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def expectedOperation = new DropIndexOperation(namespace, '*', ACKNOWLEDGED) def dropIndexesMethod = collection.&dropIndexes @@ -1405,7 +1406,7 @@ class MongoCollectionSpecification extends Specification { given: def executor = new TestOperationExecutor([null, null]) def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def newNamespace = new MongoNamespace(namespace.getDatabaseName(), 'newName') def renameCollectionOptions = new RenameCollectionOptions().dropTarget(dropTarget) def expectedOperation = new RenameCollectionOperation(namespace, newNamespace, ACKNOWLEDGED) @@ -1436,7 +1437,7 @@ class MongoCollectionSpecification extends Specification { def executor = new TestOperationExecutor([acknowledged(INSERT, 1, 0, [], [])]) def customCodecRegistry = CodecRegistries.fromRegistries(fromProviders(new ImmutableDocumentCodecProvider()), codecRegistry) def collection = new MongoCollectionImpl(namespace, ImmutableDocument, customCodecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def document = new ImmutableDocument(['a': 1]) when: @@ -1458,7 +1459,7 @@ class MongoCollectionSpecification extends Specification { def executor = new TestOperationExecutor([null]) def customCodecRegistry = CodecRegistries.fromRegistries(fromProviders(new ImmutableDocumentCodecProvider()), codecRegistry) def collection = new MongoCollectionImpl(namespace, ImmutableDocument, customCodecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def document = new ImmutableDocument(['a': 1]) when: @@ -1478,7 +1479,7 @@ class MongoCollectionSpecification extends Specification { def 'should validate the client session correctly'() { given: def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, - true, true, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, + true, true, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, Stub(OperationExecutor)) when: diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoDatabaseSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoDatabaseSpecification.groovy index 56b55f61332..d606cdfd049 100644 --- a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoDatabaseSpecification.groovy +++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoDatabaseSpecification.groovy @@ -68,8 +68,8 @@ class MongoDatabaseSpecification extends Specification { def 'should throw IllegalArgumentException if name is invalid'() { when: - new MongoDatabaseImpl('a.b', codecRegistry, readPreference, writeConcern, false, false, readConcern, - JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) + new MongoDatabaseImpl('a.b', codecRegistry, readPreference, writeConcern, false, false, null, + readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) then: thrown(IllegalArgumentException) @@ -77,8 +77,8 @@ class MongoDatabaseSpecification extends Specification { def 'should throw IllegalArgumentException from getCollection if collectionName is invalid'() { given: - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, - JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, + readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) when: database.getCollection('') @@ -89,8 +89,8 @@ class MongoDatabaseSpecification extends Specification { def 'should return the correct name from getName'() { given: - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, - JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, + readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) expect: database.getName() == name @@ -102,14 +102,15 @@ class MongoDatabaseSpecification extends Specification { def executor = new TestOperationExecutor([]) when: - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern, - C_SHARP_LEGACY, null, TIMEOUT_SETTINGS, executor) + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, null, + readConcern, C_SHARP_LEGACY, null, TIMEOUT_SETTINGS, executor) .withCodecRegistry(newCodecRegistry) then: (database.getCodecRegistry().get(UUID) as UuidCodec).getUuidRepresentation() == C_SHARP_LEGACY expect database, isTheSameAs(new MongoDatabaseImpl(name, database.getCodecRegistry(), readPreference, writeConcern, - false, true, readConcern, C_SHARP_LEGACY, null, TIMEOUT_SETTINGS, executor)) + false, true, null, + readConcern, C_SHARP_LEGACY, null, TIMEOUT_SETTINGS, executor)) } def 'should behave correctly when using withReadPreference'() { @@ -118,13 +119,13 @@ class MongoDatabaseSpecification extends Specification { def executor = new TestOperationExecutor([]) when: - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) .withReadPreference(newReadPreference) then: database.getReadPreference() == newReadPreference - expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, newReadPreference, writeConcern, false, false, + expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, newReadPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) } @@ -134,13 +135,13 @@ class MongoDatabaseSpecification extends Specification { def executor = new TestOperationExecutor([]) when: - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) .withWriteConcern(newWriteConcern) then: database.getWriteConcern() == newWriteConcern - expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, newWriteConcern, false, false, + expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, newWriteConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) } @@ -150,20 +151,20 @@ class MongoDatabaseSpecification extends Specification { def executor = new TestOperationExecutor([]) when: - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) .withReadConcern(newReadConcern) then: database.getReadConcern() == newReadConcern - expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, newReadConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor)) } def 'should behave correctly when using withTimeout'() { given: def executor = new TestOperationExecutor([]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: @@ -171,7 +172,7 @@ class MongoDatabaseSpecification extends Specification { then: newDatabase.getTimeout(TimeUnit.MILLISECONDS) == 10_000 - expect newDatabase, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + expect newDatabase, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS.withTimeout(10_000, TimeUnit.MILLISECONDS), executor)) when: @@ -185,7 +186,7 @@ class MongoDatabaseSpecification extends Specification { given: def command = new BsonDocument('command', new BsonInt32(1)) def executor = new TestOperationExecutor([null, null, null, null]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def runCommandMethod = database.&runCommand @@ -228,7 +229,7 @@ class MongoDatabaseSpecification extends Specification { def 'should use DropDatabaseOperation correctly'() { given: def executor = new TestOperationExecutor([null]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def dropMethod = database.&drop @@ -247,7 +248,7 @@ class MongoDatabaseSpecification extends Specification { def 'should use ListCollectionsOperation correctly'() { given: def executor = new TestOperationExecutor([null, null, null]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def listCollectionsMethod = database.&listCollections def listCollectionNamesMethod = database.&listCollectionNames @@ -257,14 +258,14 @@ class MongoDatabaseSpecification extends Specification { then: expect listCollectionIterable, isTheSameAs(new ListCollectionsIterableImpl<>(session, name, false, - Document, codecRegistry, primary(), executor, false, TIMEOUT_SETTINGS)) + Document, codecRegistry, primary(), executor, false, null, TIMEOUT_SETTINGS)) when: listCollectionIterable = execute(listCollectionsMethod, session, BsonDocument) then: expect listCollectionIterable, isTheSameAs(new ListCollectionsIterableImpl<>(session, name, false, - BsonDocument, codecRegistry, primary(), executor, false, TIMEOUT_SETTINGS)) + BsonDocument, codecRegistry, primary(), executor, false, null, TIMEOUT_SETTINGS)) when: def listCollectionNamesIterable = execute(listCollectionNamesMethod, session) @@ -272,7 +273,7 @@ class MongoDatabaseSpecification extends Specification { then: // `listCollectionNamesIterable` is an instance of a `ListCollectionNamesIterableImpl`, so have to get the wrapped iterable from it expect listCollectionNamesIterable.getWrapped(), isTheSameAs(new ListCollectionsIterableImpl<>(session, name, - true, BsonDocument, codecRegistry, primary(), executor, false, TIMEOUT_SETTINGS)) + true, BsonDocument, codecRegistry, primary(), executor, false, null, TIMEOUT_SETTINGS)) where: session << [null, Stub(ClientSession)] @@ -282,7 +283,7 @@ class MongoDatabaseSpecification extends Specification { given: def collectionName = 'collectionName' def executor = new TestOperationExecutor([null, null]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def createCollectionMethod = database.&createCollection @@ -333,7 +334,7 @@ class MongoDatabaseSpecification extends Specification { def pipeline = [new Document('$match', new Document('x', true))] def writeConcern = WriteConcern.JOURNALED def executor = new TestOperationExecutor([null, null]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def createViewMethod = database.&createView @@ -363,7 +364,7 @@ class MongoDatabaseSpecification extends Specification { given: def viewName = 'view1' def viewOn = 'col1' - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, Stub(OperationExecutor)) when: @@ -383,7 +384,7 @@ class MongoDatabaseSpecification extends Specification { given: def executor = new TestOperationExecutor([]) def namespace = new MongoNamespace(name, '_ignored') - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def watchMethod = database.&watch @@ -392,7 +393,7 @@ class MongoDatabaseSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, codecRegistry, - readPreference, readConcern, executor, [], Document, ChangeStreamLevel.DATABASE, false, TIMEOUT_SETTINGS), + readPreference, readConcern, executor, [], Document, ChangeStreamLevel.DATABASE, false, null, TIMEOUT_SETTINGS), ['codec']) when: @@ -401,7 +402,7 @@ class MongoDatabaseSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, codecRegistry, readPreference, readConcern, executor, [new Document('$match', 1)], Document, - ChangeStreamLevel.DATABASE, false, TIMEOUT_SETTINGS), ['codec']) + ChangeStreamLevel.DATABASE, false, null, TIMEOUT_SETTINGS), ['codec']) when: changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument) @@ -409,7 +410,7 @@ class MongoDatabaseSpecification extends Specification { then: expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl<>(session, namespace, codecRegistry, readPreference, readConcern, executor, [new Document('$match', 1)], BsonDocument, - ChangeStreamLevel.DATABASE, false, TIMEOUT_SETTINGS), ['codec']) + ChangeStreamLevel.DATABASE, false, null, TIMEOUT_SETTINGS), ['codec']) where: session << [null, Stub(ClientSession)] @@ -418,7 +419,7 @@ class MongoDatabaseSpecification extends Specification { def 'should validate the ChangeStreamIterable pipeline data correctly'() { given: def executor = new TestOperationExecutor([]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: @@ -437,7 +438,7 @@ class MongoDatabaseSpecification extends Specification { def 'should create AggregateIterable correctly'() { given: def executor = new TestOperationExecutor([]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) def aggregateMethod = database.&aggregate @@ -447,7 +448,7 @@ class MongoDatabaseSpecification extends Specification { then: expect aggregateIterable, isTheSameAs(new AggregateIterableImpl<>(session, name, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, [], AggregationLevel.DATABASE, - false, TIMEOUT_SETTINGS), ['codec']) + false, null, TIMEOUT_SETTINGS), ['codec']) when: aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)]) @@ -455,7 +456,7 @@ class MongoDatabaseSpecification extends Specification { then: expect aggregateIterable, isTheSameAs(new AggregateIterableImpl<>(session, name, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor, [new Document('$match', 1)], - AggregationLevel.DATABASE, false, TIMEOUT_SETTINGS), ['codec']) + AggregationLevel.DATABASE, false, null, TIMEOUT_SETTINGS), ['codec']) when: aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)], BsonDocument) @@ -463,7 +464,7 @@ class MongoDatabaseSpecification extends Specification { then: expect aggregateIterable, isTheSameAs(new AggregateIterableImpl<>(session, name, Document, BsonDocument, codecRegistry, readPreference, readConcern, writeConcern, executor, [new Document('$match', 1)], - AggregationLevel.DATABASE, false, TIMEOUT_SETTINGS), ['codec']) + AggregationLevel.DATABASE, false, null, TIMEOUT_SETTINGS), ['codec']) where: session << [null, Stub(ClientSession)] @@ -472,7 +473,7 @@ class MongoDatabaseSpecification extends Specification { def 'should validate the AggregationIterable pipeline data correctly'() { given: def executor = new TestOperationExecutor([]) - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, executor) when: @@ -497,7 +498,7 @@ class MongoDatabaseSpecification extends Specification { def 'should pass the correct options to getCollection'() { given: def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()]) - def database = new MongoDatabaseImpl('databaseName', codecRegistry, secondary(), WriteConcern.MAJORITY, true, true, + def database = new MongoDatabaseImpl('databaseName', codecRegistry, secondary(), WriteConcern.MAJORITY, true, true, null, ReadConcern.MAJORITY, JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) when: @@ -509,14 +510,14 @@ class MongoDatabaseSpecification extends Specification { where: expectedCollection = new MongoCollectionImpl(new MongoNamespace('databaseName', 'collectionName'), Document, fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()]), secondary(), - WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY, JAVA_LEGACY, null, TIMEOUT_SETTINGS, + WriteConcern.MAJORITY, true, true, null, ReadConcern.MAJORITY, JAVA_LEGACY, null, TIMEOUT_SETTINGS, new TestOperationExecutor([])) } def 'should validate the client session correctly'() { given: - def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, - false, readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, Stub(OperationExecutor)) + def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, null, + readConcern, JAVA_LEGACY, null, TIMEOUT_SETTINGS, Stub(OperationExecutor)) when: database.createCollection(null, 'newColl')