SERVER-100216 Fix json strings with extra braces in the middle. (#32262)

GitOrigin-RevId: 99b771420811aefbce63d55f1530ba518709f83c

Author: rsteinkeX

src/mongo/db/exec/exclusion_projection_executor_test.cpp

@@ -401,8 +401,8 @@ TEST(ExclusionProjectionExecutionTest, ShouldAddMetaExpressionsToDependencies) {
                                                             "i: {$meta: 'recordId'}, "
                                                             "j: {$meta: 'indexKey'}, "
                                                             "k: {$meta: 'sortKey'}, "
-                                                            "l: {$meta: 'searchScoreDetails'}}, "
-                                                            "m: {$meta: 'vectorSearchScore'}"));
+                                                            "l: {$meta: 'searchScoreDetails'}, "
+                                                            "m: {$meta: 'vectorSearchScore'}}"));
 
     DepsTracker deps;
     exclusion->addDependencies(&deps);

src/mongo/db/exec/inclusion_projection_executor_test.cpp

@@ -812,8 +812,8 @@ TEST_F(InclusionProjectionExecutionTestWithFallBackToDefault,
                                                             "i: {$meta: 'recordId'}, "
                                                             "j: {$meta: 'indexKey'}, "
                                                             "k: {$meta: 'sortKey'}, "
-                                                            "l: {$meta: 'searchScoreDetails'}}, "
-                                                            "m: {$meta: 'vectorSearchScore'}"));
+                                                            "l: {$meta: 'searchScoreDetails'}, "
+                                                            "m: {$meta: 'vectorSearchScore'}}"));
 
     DepsTracker deps;
     inclusion->addDependencies(&deps);

src/mongo/db/pipeline/document_source_internal_unpack_bucket_test/optimize_lastpoint_test.cpp

@@ -124,7 +124,7 @@ TEST_F(InternalUnpackBucketOptimizeLastpointTest, NonLastpointDoesNotParticipate
         {"{$_internalUnpackBucket: {exclude: [], timeField: 't', metaField: 'm', "
          "bucketMaxSpanSeconds: 60}}",
          "{$group: {_id: '$nonMeta', lastpoint1: {$top: {output: {b: '$b', c: '$c'}, sortBy: "
-         "{'m.a': 1, t: -1}}}}}, lastpoint2: {$bottom: {output: {b: '$b', c: '$c'}, sortBy: "
+         "{'m.a': 1, t: -1}}}, lastpoint2: {$bottom: {output: {b: '$b', c: '$c'}, sortBy: "
          "{'m.a': 1, t: 1}}}}}"});
 
     // We disallow the rewrite for firstpoint queries due to rounding behaviour on control.min.time.

src/mongo/db/update/document_diff_test.cpp

@@ -85,18 +85,18 @@ std::vector<BSONObj> getDocumentsRepo() {
                                  "{level1Field1: {}}, field3: {level1Field3: ['val']}}"),
         createObjWithLargePrefix(
             "{field3: {level1Field1: [{level1Field1: [1, 2]}]}, field1: "
-            "{level1Field1: {}}, field2: {level1Field3: ['val']}}, field4: [[]]"),
+            "{level1Field1: {}}, field2: {level1Field3: ['val']}, field4: [[]]}"),
 
         // Unrelated documents.
         createObjWithLargePrefix(
             "{newField1: {level1Field1: [{level1Field1: [1, 2]}]}, newField2: {level1Field1: {}}, "
-            "newField4: {level1Field3: ['val']}}, newField3: [[]]"),
+            "newField4: {level1Field3: ['val']}, newField3: [[]]}"),
         createObjWithLargePrefix(
             "{newField2: {level1Field1: {}}, newField1: {level1Field1: [{level1Field1: [1, 2]}]},"
-            "newField4: {level1Field3: ['val']}}, newField3: [[]]"),
+            "newField4: {level1Field3: ['val']}, newField3: [[]]}"),
         createObjWithLargePrefix(
             "{newField3: {level1Field1: [{level1Field1: [1, 2]}]}, newField2: {level1Field1: {}}, "
-            "newField4: {level1Field3: ['val']}}, newField1: [[]]"),
+            "newField4: {level1Field3: ['val']}, newField1: [[]]}"),
     };
     return documents;
 }
@@ -113,8 +113,8 @@ std::vector<BSONObj> getDocumentsRepoAppendOnly() {
         createObjWithLargePrefix(
             "{field1: {level1Field1: {level1Field1: 1}, level1Field2: 'val2'}, field2: "
             "{level1Field1: {level2Field1: {}}}, field3: {level1Field3: 'va2', level1Field4: "
-            "'va4'}, field4: ['arrayVal1', 'arrayVal2', 'arrayVal3', 'arrayVal4', 'arrayVal5']}, "
-            "field5: {}, field6: 'va6'"),
+            "'va4'}, field4: ['arrayVal1', 'arrayVal2', 'arrayVal3', 'arrayVal4', 'arrayVal5'], "
+            "field5: {}, field6: 'va6'}"),
     };
     return documents;
 }

src/mongo/db/update/update_driver_test.cpp

@@ -513,7 +513,7 @@ TEST_F(CreateFromQuery, ImmutableFieldsOp) {
 }
 
 TEST_F(CreateFromQuery, ShardKeyRepl) {
-    BSONObj query = fromjson("{a:{$eq:1}}, b:2}");
+    BSONObj query = fromjson("{a:{$eq:1}, b:2}");
     std::vector<std::unique_ptr<FieldRef>> immutablePathsVector;
     immutablePathsVector.push_back(std::make_unique<FieldRef>("a"));
     immutablePathsVector.push_back(std::make_unique<FieldRef>("_id"));
@@ -524,7 +524,7 @@ TEST_F(CreateFromQuery, ShardKeyRepl) {
 }
 
 TEST_F(CreateFromQuery, NestedShardKeyRepl) {
-    BSONObj query = fromjson("{a:{$eq:1},'b.c':2},d:2}");
+    BSONObj query = fromjson("{a:{$eq:1},'b.c':2, d:2}");
     std::vector<std::unique_ptr<FieldRef>> immutablePathsVector;
     immutablePathsVector.push_back(std::make_unique<FieldRef>("a"));
     immutablePathsVector.push_back(std::make_unique<FieldRef>("b.c"));
@@ -536,19 +536,19 @@ TEST_F(CreateFromQuery, NestedShardKeyRepl) {
 }
 
 TEST_F(CreateFromQuery, NestedShardKeyOp) {
-    BSONObj query = fromjson("{a:{$eq:1},'b.c':2,d:{$all:[3]}},e:2}");
+    BSONObj query = fromjson("{a:{$eq:1},'b.c':2,d:{$all:[3]},e:2}");
     std::vector<std::unique_ptr<FieldRef>> immutablePathsVector;
     immutablePathsVector.push_back(std::make_unique<FieldRef>("a"));
     immutablePathsVector.push_back(std::make_unique<FieldRef>("b.c"));
     immutablePathsVector.push_back(std::make_unique<FieldRef>("_id"));
     FieldRefSet immutablePaths;
     immutablePaths.fillFrom(immutablePathsVector);
     ASSERT_OK(driverOps().populateDocumentWithQueryFields(opCtx(), query, immutablePaths, doc()));
-    assertSameFields(fromjson("{a:1,b:{c:2},d:3}"), doc().getObject());
+    assertSameFields(fromjson("{a:1,b:{c:2},d:3,e:2}"), doc().getObject());
 }
 
 TEST_F(CreateFromQuery, NotFullShardKeyRepl) {
-    BSONObj query = fromjson("{a:{$eq:1}, 'b.c':2}, d:2}");
+    BSONObj query = fromjson("{a:{$eq:1}, 'b.c':2, d:2}");
     std::vector<std::unique_ptr<FieldRef>> immutablePathsVector;
     immutablePathsVector.push_back(std::make_unique<FieldRef>("a"));
     immutablePathsVector.push_back(std::make_unique<FieldRef>("b"));

src/mongo/s/collection_routing_info_targeter_test.cpp

@@ -463,7 +463,7 @@ void CollectionRoutingInfoTargeterTest::
     }
 
     res = criTargeter.targetInsert(operationContext(),
-                                   fromjson("{a: {b: 0}}, c: 5}"),
+                                   fromjson("{a: {b: 0}, c: 5}"),
                                    checkChunkRanges ? &chunkRanges : nullptr);
     ASSERT_EQUALS(res.shardName, "1");
     if (checkChunkRanges) {