Ensure GridFS index checking supports indexes created in the shell

JAVA-3599

Author: rozza

driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheckImpl.java

@@ -27,6 +27,7 @@
 import org.bson.Document;
 
 import java.util.ArrayList;
+import java.util.Map;
 
 import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.assertions.Assertions.notNull;
@@ -84,8 +85,14 @@ public void onResult(final ArrayList<Document> indexes, final Throwable t) {
                     callback.onResult(null, t);
                 } else {
                     boolean hasIndex = false;
-                    for (Document indexDoc : indexes) {
-                        if (indexDoc.get("key", Document.class).equals(index)) {
+                    for (Document result : indexes) {
+                        Document indexDoc = result.get("key", new Document());
+                        for (final Map.Entry<String, Object> entry : indexDoc.entrySet()) {
+                            if (entry.getValue() instanceof Number) {
+                                entry.setValue(((Number) entry.getValue()).intValue());
+                            }
+                        }
+                        if (indexDoc.equals(index)) {
                             hasIndex = true;
                             break;
                         }

driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSBucketSmokeTestSpecification.groovy

@@ -492,6 +492,29 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         direct << [true, false]
     }
 
+    def 'should not create if index is numerically the same'() {
+        when:
+        run(filesCollection.&createIndex, new Document('filename', indexValue1).append('uploadDate', indexValue2))
+        run(chunksCollection.&createIndex, new Document('files_id', indexValue1).append('n', indexValue2))
+        def contentBytes = 'Hello GridFS' as byte[]
+
+        then:
+        run(filesCollection.listIndexes().&into, []).size() == 2
+        run(chunksCollection.listIndexes().&into, []).size() == 2
+
+        when:
+        def outputStream = gridFSBucket.openUploadStream('myFile')
+        run(outputStream.&write, ByteBuffer.wrap(contentBytes))
+        run(outputStream.&close)
+
+        then:
+        run(filesCollection.listIndexes().&into, []).size() == 2
+        run(chunksCollection.listIndexes().&into, []).size() == 2
+
+        where:
+        [indexValue1, indexValue2] << [[1, 1.0, 1L], [1, 1.0, 1L]].combinations()
+    }
+
     def 'should use the user provided codec registries for encoding / decoding data'() {
         given:
         def codecRegistry = fromRegistries(fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)), MongoClients.getDefaultCodecRegistry())

driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucketImpl.java

@@ -45,6 +45,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Map;
 
 import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.assertions.Assertions.notNull;
@@ -534,8 +535,14 @@ private <T> boolean hasIndex(@Nullable final ClientSession clientSession, final
         }
 
         ArrayList<Document> indexes = listIndexesIterable.into(new ArrayList<Document>());
-        for (Document indexDoc : indexes) {
-            if (indexDoc.get("key", Document.class).equals(index)) {
+        for (Document result : indexes) {
+            Document indexDoc = result.get("key", new Document());
+            for (final Map.Entry<String, Object> entry : indexDoc.entrySet()) {
+                if (entry.getValue() instanceof Number) {
+                    entry.setValue(((Number) entry.getValue()).intValue());
+                }
+            }
+            if (indexDoc.equals(index)) {
                 hasIndex = true;
                 break;
             }

driver-sync/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy

@@ -466,6 +466,33 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         direct << [true, false]
     }
 
+    def 'should not create if index is numerically the same'() {
+        when:
+        filesCollection.createIndex(new Document('filename', indexValue1).append('uploadDate', indexValue2))
+        chunksCollection.createIndex(new Document('files_id', indexValue1).append('n', indexValue2))
+        def contentBytes = 'Hello GridFS' as byte[]
+
+        then:
+        filesCollection.listIndexes().into([]).size() == 2
+        chunksCollection.listIndexes().into([]).size() == 2
+
+        when:
+        if (direct) {
+            gridFSBucket.uploadFromStream('myFile', new ByteArrayInputStream(contentBytes));
+        } else {
+            def outputStream = gridFSBucket.openUploadStream('myFile')
+            outputStream.write(contentBytes)
+            outputStream.close()
+        }
+
+        then:
+        filesCollection.listIndexes().into([]).size() == 2
+        chunksCollection.listIndexes().into([]).size() == 2
+
+        where:
+        [direct, indexValue1, indexValue2] << [[true, false], [1, 1.0, 1L], [1, 1.0, 1L]].combinations()
+    }
+
     def 'should mark and reset'() {
         given:
         def content = 1 .. 1000 as byte[]