Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 8 insertions, 6 deletions

diff --git a/src/mongo/db/pipeline/dependencies_test.cpp b/src/mongo/db/pipeline/dependencies_test.cpp
index 75451b258b8..938130b91bd 100644
--- a/src/mongo/db/pipeline/dependencies_test.cpp
+++ b/src/mongo/db/pipeline/dependencies_test.cpp
@@ -45,8 +45,8 @@ using std::set;
 using std::string;
 
 template <size_t ArrayLen>
-OrderedPathSet arrayToSet(const char* (&array)[ArrayLen]) {
-    OrderedPathSet out;
+set<string> arrayToSet(const char* (&array)[ArrayLen]) {
+    set<string> out;
     for (size_t i = 0; i < ArrayLen; i++)
         out.insert(array[i]);
     return out;
@@ -306,17 +306,19 @@ TEST(DependenciesToProjectionTest, SortFieldPaths) {
                            "b.a"
                            "b.aa"
                            "b.🌲d"};
-    auto fields = arrayToSet(array);
+    DepsTracker deps;
+    deps.fields = arrayToSet(array);
     // our custom sort will restore the ordering above
-    auto itr = fields.begin();
-    for (unsigned long i = 0; i < fields.size(); i++) {
+    std::list<std::string> fieldPathSorted = deps.sortedFields();
+    auto itr = fieldPathSorted.begin();
+    for (unsigned long i = 0; i < fieldPathSorted.size(); i++) {
         ASSERT_EQ(*itr, array[i]);
         ++itr;
     }
 }
 
 TEST(DependenciesToProjectionTest, PathLessThan) {
-    auto lessThan = PathComparator();
+    auto lessThan = PathPrefixComparator();
     ASSERT_FALSE(lessThan("a", "a"));
     ASSERT_TRUE(lessThan("a", "aa"));
     ASSERT_TRUE(lessThan("a", "b"));