mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-47522 Distinct command: Convert usage of getCollectionDescription_DEPRECATED to getCollectionDescription

Browse Source
This commit is contained in:
Tommaso Tocci 2020-04-14 14:23:59 +02:00 committed by Evergreen Agent
parent 75e46058ca
commit ca7c12950c
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jstests/core/txns/view_reads_in_transaction.js
View File

@ -21,18 +21,14 @@ assert.commandWorked(coll.insert(testDoc, {writeConcern: {w: "majority"}}));
assert.commandWorked(view.runCommand(
"create", {viewOn: coll.getName(), pipeline: [], writeConcern: {w: "majority"}}));
const isMongos = assert.commandWorked(db.runCommand("ismaster")).msg === "isdbgrid";
if (isMongos) {
// Refresh the router's and shard's database versions so the distinct run below can succeed.
// This is necessary because shards always abort their local transaction on stale version
// errors and mongos is not allowed to retry on these errors in a transaction if the stale
// shard has completed at least one earlier statement.
assert.eq(view.distinct("_id"), ["kyle"]);
}
// Run a dummy find to start the transaction.
jsTestLog("Starting transaction.");
session.startTransaction({readConcern: {level: "snapshot"}});
// Refresh the router's and shard's database versions so the distinct run below can succeed.
// This is necessary because shards always abort their local transaction on stale version
// errors and mongos is not allowed to retry on these errors in a transaction if the stale
// shard has completed at least one earlier statement.
assert.eq(view.distinct("_id"), ["kyle"]);
let cursor = coll.find();
cursor.next();

15
src/mongo/db/commands/distinct.cpp
View File

@ -191,14 +191,13 @@ public:
// Distinct doesn't filter orphan documents so it is not allowed to run on sharded
// collections in multi-document transactions.
uassert(ErrorCodes::OperationNotSupportedInTransaction,
"Cannot run 'distinct' on a sharded collection in a multi-document transaction. "
"Please see http://dochub.mongodb.org/core/transaction-distinct for a recommended "
"alternative.",
!opCtx->inMultiDocumentTransaction() ||
!CollectionShardingState::get(opCtx, nss)
->getCollectionDescription_DEPRECATED()
.isSharded());
uassert(
ErrorCodes::OperationNotSupportedInTransaction,
"Cannot run 'distinct' on a sharded collection in a multi-document transaction. "
"Please see http://dochub.mongodb.org/core/transaction-distinct for a recommended "
"alternative.",
!opCtx->inMultiDocumentTransaction() ||
!CollectionShardingState::get(opCtx, nss)->getCollectionDescription().isSharded());
const ExtensionsCallbackReal extensionsCallback(opCtx, &nss);
auto defaultCollation =