Merge branch 'main' into REP-5218-roll-back-tasks

Author: FGasper

go.mod

@@ -3,24 +3,25 @@ module github.com/10gen/migration-verifier
 go 1.20
 
 require (
+	github.com/cespare/permute/v2 v2.0.0-beta2
 	github.com/deckarep/golang-set/v2 v2.3.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/gin-gonic/gin v1.8.1
 	github.com/google/uuid v1.3.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.28.0
+	github.com/samber/lo v1.47.0
 	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli v1.22.9
 	go.mongodb.org/mongo-driver v1.17.1
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/sync v0.8.0
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )
 
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
-	github.com/cespare/permute/v2 v2.0.0-beta2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
@@ -50,7 +51,6 @@ require (
 	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/sys v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

internal/documentmap/documentmap.go

@@ -151,6 +151,10 @@ func (p *Partition) GetFindOptions(buildInfo *bson.M, filterAndPredicates bson.A
 		sort := bson.E{"sort", bson.D{{"$natural", 1}}}
 		findOptions = append(findOptions, sort)
 	} else {
+		// For non-capped collections, sort by _id to minimize the amount of time
+		// that a given document spends cached in memory.
+		findOptions = append(findOptions, bson.E{"sort", bson.D{{"_id", 1}}})
+
 		// For non-capped collections, the cursor should use the ID filter and the _id index.
 		// Get the bounded query filter from the partition to be used in the Find command.
 		allowTypeBracketing := false

internal/documentmap/documentmap_test.go

@@ -23,6 +23,7 @@ func (suite *UnitTestSuite) TestPartitionFindCmd() {
 				{"afterClusterTime", startAt},
 			}},
 			{"noCursorTimeout", true},
+			{"sort", bson.D{{"_id", 1}}},
 			{"hint", bson.D{{"_id", 1}}},
 			{"filter", expectedFilter},
 		}