chore(shell-api): query config.chunks like the legacy shell MONGOSH-1179 (#1419)

Author: addaleax

packages/shell-api/src/collection.ts

@@ -32,7 +32,8 @@ import {
   isValidCollectionName,
   scaleIndividualShardStatistics,
   shouldRunAggregationImmediately,
-  coerceToJSNumber
+  coerceToJSNumber,
+  buildConfigChunksCollectionMatch
 } from './helpers';
 import {
   AnyBulkWriteOperation,
@@ -1898,7 +1899,6 @@ export default class Collection extends ShellApiWithMongoClass {
     }
 
     const collStats = await (await this.aggregate({ '$collStats': { storageStats: {} } })).toArray();
-    const uuid = configCollectionsInfo?.uuid ?? null;
 
     const totals = { numChunks: 0, size: 0, count: 0 };
     const conciseShardsStats: {
@@ -1918,7 +1918,7 @@ export default class Collection extends ShellApiWithMongoClass {
         // If we have an UUID, use that for lookups. If we have only the ns,
         // use that. (On 5.0+ servers, config.chunk has uses the UUID, before
         // that it had the ns).
-        const countChunksQuery = uuid ? { $or: [ { uuid }, { ns } ], shard } : { ns, shard };
+        const countChunksQuery = { ...buildConfigChunksCollectionMatch(configCollectionsInfo), shard };
         const [ host, numChunks ] = await Promise.all([
           config.getCollection('shards').findOne({ _id: extShardStats.shard }),
           config.getCollection('chunks').countDocuments(countChunksQuery)

packages/shell-api/src/helpers.ts

@@ -430,8 +430,7 @@ export async function getPrintableShardStatus(configDB: Database, verbose: boole
           collRes.balancing = [ !coll.noBalance, { noBalance: coll.noBalance } ];
         }
         const chunksRes = [];
-        const chunksCollMatch =
-          coll.uuid ? { $or: [ { uuid: coll.uuid }, { ns: coll._id } ] } : { ns: coll._id };
+        const chunksCollMatch = buildConfigChunksCollectionMatch(coll);
         const chunks = await
         (await chunksColl.aggregate([
           { $match: chunksCollMatch },
@@ -474,7 +473,9 @@ export async function getPrintableShardStatus(configDB: Database, verbose: boole
         }
 
         const tagsRes: any[] = [];
-        for await (const tag of (await configDB.getCollection('tags').find(chunksCollMatch)).sort({ min: 1 })) {
+        for await (const tag of (await configDB.getCollection('tags').find({
+          ns: coll._id
+        })).sort({ min: 1 })) {
           tagsRes.push({
             tag: tag.tag,
             min: tag.min,
@@ -851,3 +852,13 @@ export function shallowClone<T>(input: T): T {
   if (!input || typeof input !== 'object') return input;
   return Array.isArray(input) ? ([...input] as unknown as T) : { ...input };
 }
+
+// Take a document from config.collections and return a corresponding match filter
+// for config.chunks.
+// https://jira.mongodb.org/browse/MONGOSH-1179
+// https://github.com/mongodb/mongo/commit/aeb430b26171d5afc55f1278a29cc0f998f6a4e1
+export function buildConfigChunksCollectionMatch(configCollectionsInfo: Document): Document {
+  return Object.prototype.hasOwnProperty.call(configCollectionsInfo, 'timestamp') ?
+    { uuid: configCollectionsInfo.uuid } : // new format
+    { ns: configCollectionsInfo._id }; // old format
+}