divjot comments

Author: iwysiu

mongo/gridfs/bucket.go

@@ -458,35 +458,38 @@ func indexDocsEqual(expected, actual bsoncore.Document) (bool, error) {
 		return true, nil
 	}
 
-	keyElemElems, err := actual.Elements()
+	actualElems, err := actual.Elements()
 	if err != nil {
 		return false, err
 	}
-	modelKeysElems, err := expected.Elements()
+	expectedElems, err := expected.Elements()
 	if err != nil {
 		return false, err
 	}
 
-	if len(keyElemElems) != len(modelKeysElems) {
+	if len(actualElems) != len(expectedElems) {
 		return false, nil
 	}
 
-	for _, elem := range keyElemElems {
-		key := elem.Key()
-		modelVal, err := expected.LookupErr(key)
-		if err != nil {
+	for idx, expectedElem := range expectedElems {
+		actualElem := actualElems[idx]
+		if actualElem.Key() != expectedElem.Key() {
 			return false, nil
 		}
 
-		val := elem.Value()
-		if !val.IsNumber() || !modelVal.IsNumber() {
-			if val.Equal(modelVal) {
+		actualVal := actualElem.Value()
+		expectedVal := expectedElem.Value()
+		actualInt, actualOK := actualVal.AsInt64OK()
+		expectedInt, expectedOK := expectedVal.AsInt64OK()
+
+		if !actualOK || !expectedOK {
+			if actualVal.Equal(expectedVal) {
 				continue
 			}
 			return false, nil
 		}
 
-		if val.AsInt64() != modelVal.AsInt64() {
+		if actualInt != expectedInt {
 			return false, nil
 		}
 	}
@@ -509,29 +512,25 @@ func createIndexIfNotExists(ctx context.Context, iv mongo.IndexView, model mongo
 	}
 	modelKeysDoc := bsoncore.Document(modelKeysBytes)
 
-	var found bool
-	for c.Next(ctx) && !found {
+	for c.Next(ctx) {
 		keyElem, err := c.Current.LookupErr("key")
 		if err != nil {
 			return err
 		}
 
 		keyElemDoc := bsoncore.Value{Type: keyElem.Type, Data: keyElem.Value}.Document()
 
-		found, err = indexDocsEqual(modelKeysDoc, keyElemDoc)
+		found, err := indexDocsEqual(modelKeysDoc, keyElemDoc)
 		if err != nil {
 			return err
 		}
-	}
-
-	if !found {
-		_, err = iv.CreateOne(ctx, model)
-		if err != nil {
-			return err
+		if found {
+			return nil
 		}
 	}
 
-	return nil
+	_, err = iv.CreateOne(ctx, model)
+	return err
 }
 
 // create indexes on the files and chunks collection if needed

mongo/integration/gridfs_test.go

@@ -48,7 +48,7 @@ func TestGridFS(x *testing.T) {
 	})
 	// should not create a new index if index is numerically the same
 	mt.Run("numericallyEqualIndexes", func(mt *mtest.T) {
-		//add indexes with floats to collections manually
+		// add indexes with floats to collections manually
 		res := mt.DB.RunCommand(context.Background(),
 			bson.D{
 				{"createIndexes", "fs.files"},
@@ -88,7 +88,9 @@ func TestGridFS(x *testing.T) {
 				return evt.CommandName == "createIndexes"
 			})
 			evt := mt.GetStartedEvent()
-			assert.Nil(mt, evt, "Expected that createIndexes wasn't called: %v", evt)
+			if evt != nil {
+				mt.Fatalf("expected no createIndexes events but got %v", evt.Command)
+			}
 		})
 		mt.Run("UploadFromStream", func(mt *mtest.T) {
 			var fileContent []byte
@@ -102,7 +104,9 @@ func TestGridFS(x *testing.T) {
 				return evt.CommandName == "createIndexes"
 			})
 			evt := mt.GetStartedEvent()
-			assert.Nil(mt, evt, "Expected that createIndexes wasn't called: %v", evt)
+			if evt != nil {
+				mt.Fatalf("expected no createIndexes events but got %v", evt.Command)
+			}
 		})
 	})
 
@@ -191,18 +195,6 @@ func findIndex(ctx context.Context, mt *mtest.T, coll *mongo.Collection, unique
 	assert.True(mt, foundIndex, "index %v not found", keys)
 }
 
-func countIndexes(ctx context.Context, mt *mtest.T, coll *mongo.Collection) int {
-	mt.Helper()
-	cur, err := coll.Indexes().List(ctx)
-	assert.Nil(mt, err, "Indexes List error: %v", err)
-
-	var count int
-	for cur.Next(ctx) {
-		count++
-	}
-	return count
-}
-
 func skipRoundTripTest(mt *mtest.T) {
 	if runtime.GOOS != "darwin" {
 		return