CSHARP-5617: Remove unused IChannel.Query methods (#1711)

Author: sanych-sun

src/MongoDB.Driver/Core/Bindings/IChannel.cs

@@ -59,74 +59,6 @@ Task<TResult> CommandAsync<TResult>(
             IBsonSerializer<TResult> resultSerializer,
             MessageEncoderSettings messageEncoderSettings,
             CancellationToken cancellationToken);
-
-        CursorBatch<TDocument> Query<TDocument>(
-            CollectionNamespace collectionNamespace,
-            BsonDocument query,
-            BsonDocument fields,
-            IElementNameValidator queryValidator,
-            int skip,
-            int batchSize,
-            bool secondaryOk,
-            bool partialOk,
-            bool noCursorTimeout,
-            bool tailableCursor,
-            bool awaitData,
-            IBsonSerializer<TDocument> serializer,
-            MessageEncoderSettings messageEncoderSettings,
-            CancellationToken cancellationToken);
-
-        [Obsolete("Use an overload that does not have an oplogReplay parameter instead.")]
-        CursorBatch<TDocument> Query<TDocument>(
-            CollectionNamespace collectionNamespace,
-            BsonDocument query,
-            BsonDocument fields,
-            IElementNameValidator queryValidator,
-            int skip,
-            int batchSize,
-            bool secondaryOk,
-            bool partialOk,
-            bool noCursorTimeout,
-            bool oplogReplay, // obsolete: OplogReplay is ignored by server versions 4.4.0 and newer
-            bool tailableCursor,
-            bool awaitData,
-            IBsonSerializer<TDocument> serializer,
-            MessageEncoderSettings messageEncoderSettings,
-            CancellationToken cancellationToken);
-
-        Task<CursorBatch<TDocument>> QueryAsync<TDocument>(
-            CollectionNamespace collectionNamespace,
-            BsonDocument query,
-            BsonDocument fields,
-            IElementNameValidator queryValidator,
-            int skip,
-            int batchSize,
-            bool secondaryOk,
-            bool partialOk,
-            bool noCursorTimeout,
-            bool tailableCursor,
-            bool awaitData,
-            IBsonSerializer<TDocument> serializer,
-            MessageEncoderSettings messageEncoderSettings,
-            CancellationToken cancellationToken);
-
-        [Obsolete("Use an overload that does not have an oplogReplay parameter instead.")]
-        Task<CursorBatch<TDocument>> QueryAsync<TDocument>(
-            CollectionNamespace collectionNamespace,
-            BsonDocument query,
-            BsonDocument fields,
-            IElementNameValidator queryValidator,
-            int skip,
-            int batchSize,
-            bool secondaryOk,
-            bool partialOk,
-            bool noCursorTimeout,
-            bool oplogReplay, // obsolete: OplogReplay is ignored by server versions 4.4.0 and newer
-            bool tailableCursor,
-            bool awaitData,
-            IBsonSerializer<TDocument> serializer,
-            MessageEncoderSettings messageEncoderSettings,
-            CancellationToken cancellationToken);
     }
 
     internal interface IChannelHandle : IChannel

src/MongoDB.Driver/Core/Servers/Server.cs

@@ -379,176 +379,11 @@ public void Dispose()
                 }
             }
 
-            public CursorBatch<TDocument> Query<TDocument>(
-                CollectionNamespace collectionNamespace,
-                BsonDocument query,
-                BsonDocument fields,
-                IElementNameValidator queryValidator,
-                int skip,
-                int batchSize,
-                bool secondaryOk,
-                bool partialOk,
-                bool noCursorTimeout,
-                bool tailableCursor,
-                bool awaitData,
-                IBsonSerializer<TDocument> serializer,
-                MessageEncoderSettings messageEncoderSettings,
-                CancellationToken cancellationToken)
-            {
-#pragma warning disable 618
-                return Query(
-                    collectionNamespace,
-                    query,
-                    fields,
-                    queryValidator,
-                    skip,
-                    batchSize,
-                    secondaryOk,
-                    partialOk,
-                    noCursorTimeout,
-                    oplogReplay: false,
-                    tailableCursor,
-                    awaitData,
-                    serializer,
-                    messageEncoderSettings,
-                    cancellationToken);
-#pragma warning restore 618
-            }
-
-            [Obsolete("Use the newest overload instead.")]
-            public CursorBatch<TDocument> Query<TDocument>(
-                CollectionNamespace collectionNamespace,
-                BsonDocument query,
-                BsonDocument fields,
-                IElementNameValidator queryValidator,
-                int skip,
-                int batchSize,
-                bool secondaryOk,
-                bool partialOk,
-                bool noCursorTimeout,
-                bool oplogReplay,
-                bool tailableCursor,
-                bool awaitData,
-                IBsonSerializer<TDocument> serializer,
-                MessageEncoderSettings messageEncoderSettings,
-                CancellationToken cancellationToken)
-            {
-                secondaryOk = GetEffectiveSecondaryOk(secondaryOk);
-#pragma warning disable 618
-                var protocol = new QueryWireProtocol<TDocument>(
-                    collectionNamespace,
-                    query,
-                    fields,
-                    queryValidator,
-                    skip,
-                    batchSize,
-                    secondaryOk,
-                    partialOk,
-                    noCursorTimeout,
-                    oplogReplay,
-                    tailableCursor,
-                    awaitData,
-                    serializer,
-                    messageEncoderSettings);
-#pragma warning restore 618
-
-                return ExecuteProtocol(protocol, cancellationToken);
-            }
-
-            public Task<CursorBatch<TDocument>> QueryAsync<TDocument>(
-                CollectionNamespace collectionNamespace,
-                BsonDocument query,
-                BsonDocument fields,
-                IElementNameValidator queryValidator,
-                int skip,
-                int batchSize,
-                bool secondaryOk,
-                bool partialOk,
-                bool noCursorTimeout,
-                bool tailableCursor,
-                bool awaitData,
-                IBsonSerializer<TDocument> serializer,
-                MessageEncoderSettings messageEncoderSettings,
-                CancellationToken cancellationToken)
-            {
-#pragma warning disable 618
-                return QueryAsync(
-                    collectionNamespace,
-                    query,
-                    fields,
-                    queryValidator,
-                    skip,
-                    batchSize,
-                    secondaryOk,
-                    partialOk,
-                    noCursorTimeout,
-                    oplogReplay: false,
-                    tailableCursor,
-                    awaitData,
-                    serializer,
-                    messageEncoderSettings,
-                    cancellationToken);
-#pragma warning restore 618
-            }
-
-            [Obsolete("Use the newest overload instead.")]
-            public Task<CursorBatch<TDocument>> QueryAsync<TDocument>(
-                CollectionNamespace collectionNamespace,
-                BsonDocument query,
-                BsonDocument fields,
-                IElementNameValidator queryValidator,
-                int skip,
-                int batchSize,
-                bool secondaryOk,
-                bool partialOk,
-                bool noCursorTimeout,
-                bool oplogReplay,
-                bool tailableCursor,
-                bool awaitData,
-                IBsonSerializer<TDocument> serializer,
-                MessageEncoderSettings messageEncoderSettings,
-                CancellationToken cancellationToken)
-            {
-                secondaryOk = GetEffectiveSecondaryOk(secondaryOk);
-#pragma warning disable 618
-                var protocol = new QueryWireProtocol<TDocument>(
-                    collectionNamespace,
-                    query,
-                    fields,
-                    queryValidator,
-                    skip,
-                    batchSize,
-                    secondaryOk,
-                    partialOk,
-                    noCursorTimeout,
-                    oplogReplay,
-                    tailableCursor,
-                    awaitData,
-                    serializer,
-                    messageEncoderSettings);
-#pragma warning restore 618
-
-                return ExecuteProtocolAsync(protocol, cancellationToken);
-            }
-
             private ICoreSession CreateClusterClockAdvancingCoreSession(ICoreSession session)
             {
                 return new ClusterClockAdvancingCoreSession(session, _server.ClusterClock);
             }
 
-            private TResult ExecuteProtocol<TResult>(IWireProtocol<TResult> protocol, CancellationToken cancellationToken)
-            {
-                try
-                {
-                    return protocol.Execute(_connection, cancellationToken);
-                }
-                catch (Exception ex)
-                {
-                    _server.HandleChannelException(_connection, ex);
-                    throw;
-                }
-            }
-
             private TResult ExecuteProtocol<TResult>(IWireProtocol<TResult> protocol, ICoreSession session, CancellationToken cancellationToken)
             {
                 try
@@ -563,19 +398,6 @@ private TResult ExecuteProtocol<TResult>(IWireProtocol<TResult> protocol, ICoreS
                 }
             }
 
-            private async Task<TResult> ExecuteProtocolAsync<TResult>(IWireProtocol<TResult> protocol, CancellationToken cancellationToken)
-            {
-                try
-                {
-                    return await protocol.ExecuteAsync(_connection, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _server.HandleChannelException(_connection, ex);
-                    throw;
-                }
-            }
-
             private async Task<TResult> ExecuteProtocolAsync<TResult>(IWireProtocol<TResult> protocol, ICoreSession session, CancellationToken cancellationToken)
             {
                 try
@@ -597,16 +419,6 @@ public IChannelHandle Fork()
                 return new ServerChannel(_server, _connection.Fork(), false);
             }
 
-            private bool GetEffectiveSecondaryOk(bool secondaryOk)
-            {
-                if (_server.DirectConnection && _server.Description.Type != ServerType.ShardRouter)
-                {
-                    return true;
-                }
-
-                return secondaryOk;
-            }
-
             private void MarkSessionDirtyIfNeeded(ICoreSession session, Exception ex)
             {
                 if (ex is MongoConnectionException)