Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions src/MongoDB.Driver/Core/Bindings/IChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
188 changes: 0 additions & 188 deletions src/MongoDB.Driver/Core/Servers/Server.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand Down
Loading