TOOLS-4105 Allow mongorestore to handle forceNonUnique option in collMod ops (#901)

This commit allows mongorestore to handle `forceNonUnique` option in
collMod ops. The logic to handle index collMod is modified so that
`forceNonUnique` don't conflict with `unique`.

Author: tdq45gj

common/idx/index_catalog.go

@@ -331,9 +331,22 @@ func (i *IndexCatalog) collMod(database, collection string, indexModValue any) e
 			continue
 		}
 
-		if k == "expireAfterSeconds" || k == "hidden" || k == "prepareUnique" || k == "unique" {
+		if k == "expireAfterSeconds" || k == "hidden" || k == "prepareUnique" {
 			matchingIndex.Options[k] = element.Value
+		} else if k == "unique" || k == "forceNonUnique" {
+			v, boolOk := element.Value.(bool)
+			if !boolOk {
+				return errors.Errorf("cannot convert %s value to bool: %v", k, element.Value)
+			}
+
+			if k == "unique" && v {
+				delete(matchingIndex.Options, "forceNonUnique")
+			}
 
+			if k == "forceNonUnique" && v {
+				delete(matchingIndex.Options, "unique")
+			}
+			matchingIndex.Options[k] = v
 		} else {
 			return errors.Errorf("unknown index option: %v", k)
 		}

mongodump/oplog_dump_test.go

@@ -136,7 +136,7 @@ func vectoredInsert(ctx context.Context) error {
 	return nil
 }
 
-func TestOplogDumpCollModPrepareUnique(t *testing.T) {
+func TestOplogDumpCollModIndexUniqueness(t *testing.T) {
 	testtype.SkipUnlessTestType(t, testtype.IntegrationTestType)
 	// Oplog is not available in a standalone topology.
 	testtype.SkipUnlessTestType(t, testtype.ReplSetTestType)
@@ -157,6 +157,9 @@ func TestOplogDumpCollModPrepareUnique(t *testing.T) {
 
 	testCollName := testCollectionNames[0]
 
+	err = session.Database(testDB).Collection(testCollName).Drop(ctx)
+	require.NoError(t, err)
+
 	err = session.Database(testDB).CreateCollection(ctx, testCollName)
 	require.NoError(t, err)
 	//nolint:errcheck
@@ -167,7 +170,7 @@ func TestOplogDumpCollModPrepareUnique(t *testing.T) {
 
 	md.ToolOptions.DB = ""
 	md.OutputOptions.Oplog = true
-	md.OutputOptions.Out = "collMod_prepareUnique"
+	md.OutputOptions.Out = "collMod_indexUniqueness"
 
 	require.NoError(t, md.Init())
 
@@ -176,7 +179,7 @@ func TestOplogDumpCollModPrepareUnique(t *testing.T) {
 	defer failpoint.Reset()
 
 	go func() {
-		require.NoError(t, createIndexesAndRunCollModPrepareUnique(ctx))
+		require.NoError(t, createIndexesAndCollModIndexUniqueness(ctx))
 	}()
 
 	//nolint:errcheck
@@ -187,7 +190,7 @@ func TestOplogDumpCollModPrepareUnique(t *testing.T) {
 	path, err := os.Getwd()
 	require.NoError(t, err)
 
-	dumpDir := util.ToUniversalPath(filepath.Join(path, "collMod_prepareUnique"))
+	dumpDir := util.ToUniversalPath(filepath.Join(path, "collMod_indexUniqueness"))
 	dumpDBDir := util.ToUniversalPath(filepath.Join(dumpDir, testDB))
 	oplogFilePath := util.ToUniversalPath(filepath.Join(dumpDir, "oplog.bson"))
 	require.True(t, fileDirExists(dumpDir))
@@ -203,28 +206,33 @@ func TestOplogDumpCollModPrepareUnique(t *testing.T) {
 	bsonSrc := db.NewDecodedBSONSource(db.NewBufferlessBSONSource(oplogFile))
 	prepareUniqueTrueCount := 0
 	prepareUniqueFalseCount := 0
+	forceNonUniqueCount := 0
 
 	var oplog db.Oplog
 	for bsonSrc.Next(&oplog) {
 		require.NoError(t, bsonSrc.Err())
 
 		if oplog.Namespace == testDB+".$cmd" {
 			indexDoc, ok := bsonutil.ToMap(oplog.Object)["index"].(bson.D)
+			indexDocMap := bsonutil.ToMap(indexDoc)
 			if ok {
-				if bsonutil.ToMap(indexDoc)["prepareUnique"] == true {
+				if indexDocMap["prepareUnique"] == true {
 					prepareUniqueTrueCount++
-				} else {
+				} else if indexDocMap["prepareUnique"] == false {
 					prepareUniqueFalseCount++
+				} else if indexDocMap["forceNonUnique"] == true {
+					forceNonUniqueCount++
 				}
 			}
 		}
 	}
 	require.NoError(t, oplogFile.Close())
 	require.Equal(t, 8, prepareUniqueTrueCount)
 	require.Equal(t, 4, prepareUniqueFalseCount)
+	require.Equal(t, 4, forceNonUniqueCount)
 }
 
-func createIndexesAndRunCollModPrepareUnique(ctx context.Context) error {
+func createIndexesAndCollModIndexUniqueness(ctx context.Context) error {
 	client, err := testutil.GetBareSession()
 	if err != nil {
 		return err
@@ -274,6 +282,22 @@ func createIndexesAndRunCollModPrepareUnique(ctx context.Context) error {
 				return res.Err()
 			}
 		}
+
+		for _, option := range []string{"unique", "forceNonUnique"} {
+			res := client.Database(testDB).RunCommand(
+				ctx,
+				bson.D{
+					{"collMod", testCollName},
+					{"index", bson.D{
+						{"keyPattern", index.Keys},
+						{option, true},
+					}},
+				},
+			)
+			if res.Err() != nil {
+				return res.Err()
+			}
+		}
 	}
 
 	return nil

mongorestore/oplog_test.go

@@ -769,7 +769,7 @@ func testOplogRestoreVectoredInsert(t *testing.T, linked bool) {
 	require.Equal(t, len(expectedDocs), i)
 }
 
-func TestOplogRestoreCollModPrepareUnique(t *testing.T) {
+func TestOplogRestoreCollModIndexUniqueness(t *testing.T) {
 	testtype.SkipUnlessTestType(t, testtype.IntegrationTestType)
 
 	ctx := t.Context()
@@ -793,7 +793,7 @@ func TestOplogRestoreCollModPrepareUnique(t *testing.T) {
 	require.NoError(t, session.Database("mongodump_test_db").Drop(ctx))
 	require.NoError(t, session.Database("mongodump_test_db").CreateCollection(ctx, "coll1"))
 
-	oplogFileName := "testdata/oplogs/bson/collMod_prepareUnique.bson"
+	oplogFileName := "testdata/oplogs/bson/collMod_indexUniqueness.bson"
 
 	args := []string{
 		DirectoryOption, "testdata/coll_without_index",