Fixes and more testing

Author: MarkDuckworth

firebase-firestore/src/main/java/com/google/firebase/firestore/index/FirestoreIndexValueWriter.java

@@ -142,7 +142,7 @@ private void writeUnlabeledIndexString(
     encoder.writeString(stringIndexValue);
   }
 
-  private void writeIndexMap(MapValue mapIndexValue, DirectionalIndexByteEncoder encoder) {
+  private void writeIndexVector(MapValue mapIndexValue, DirectionalIndexByteEncoder encoder) {
     writeValueTypeLabel(encoder, INDEX_TYPE_VECTOR);
 
     Map<String, Value> map = mapIndexValue.getFieldsMap();
@@ -158,7 +158,7 @@ private void writeIndexMap(MapValue mapIndexValue, DirectionalIndexByteEncoder e
     this.writeIndexValueAux(map.get(key), encoder);
   }
 
-  private void writeIndexVector(MapValue mapIndexValue, DirectionalIndexByteEncoder encoder) {
+  private void writeIndexMap(MapValue mapIndexValue, DirectionalIndexByteEncoder encoder) {
     writeValueTypeLabel(encoder, INDEX_TYPE_MAP);
     for (Map.Entry<String, Value> entry : mapIndexValue.getFieldsMap().entrySet()) {
       String key = entry.getKey();

firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteLocalStoreTest.java

@@ -293,6 +293,80 @@ public void testUsesIndexForLimitQueryWhenIndexIsUpdated() {
     assertQueryReturned("coll/a", "coll/c");
   }
 
+  @Test
+  public void testIndexesVectorValues() {
+    FieldIndex index =
+        fieldIndex(
+            "coll", 0, FieldIndex.INITIAL_STATE, "embedding", FieldIndex.Segment.Kind.ASCENDING);
+    configureFieldIndexes(singletonList(index));
+
+    writeMutation(setMutation("coll/arr1", map("embedding", Arrays.asList(0.1, 0.2, 0.3))));
+    writeMutation(setMutation("coll/map2", map("embedding", map())));
+    writeMutation(
+        setMutation("coll/doc3", map("embedding", FieldValue.vector(new double[] {4, 5, 6}))));
+    writeMutation(setMutation("coll/doc4", map("embedding", FieldValue.vector(new double[] {5}))));
+
+    Query query = query("coll").orderBy(orderBy("embedding", "asc"));
+    executeQuery(query);
+    assertQueryReturned("coll/arr1", "coll/doc4", "coll/doc3", "coll/map2");
+
+    query =
+        query("coll").filter(filter("embedding", "==", FieldValue.vector(new double[] {4, 5, 6})));
+    executeQuery(query);
+    assertQueryReturned("coll/doc3");
+
+    query =
+        query("coll").filter(filter("embedding", ">", FieldValue.vector(new double[] {4, 5, 6})));
+    executeQuery(query);
+    assertQueryReturned();
+
+    query = query("coll").filter(filter("embedding", ">=", FieldValue.vector(new double[] {4})));
+    executeQuery(query);
+    assertQueryReturned("coll/doc4", "coll/doc3");
+
+    backfillIndexes();
+
+    query = query("coll").orderBy(orderBy("embedding", "asc"));
+    executeQuery(query);
+    assertOverlaysRead(/* byKey= */ 4, /* byCollection= */ 0);
+    assertOverlayTypes(
+        keyMap(
+            "coll/arr1",
+            CountingQueryEngine.OverlayType.Set,
+            "coll/map2",
+            CountingQueryEngine.OverlayType.Set,
+            "coll/doc3",
+            CountingQueryEngine.OverlayType.Set,
+            "coll/doc4",
+            CountingQueryEngine.OverlayType.Set));
+    assertQueryReturned("coll/arr1", "coll/doc4", "coll/doc3", "coll/map2");
+
+    query =
+        query("coll").filter(filter("embedding", "==", FieldValue.vector(new double[] {4, 5, 6})));
+    executeQuery(query);
+    assertOverlaysRead(/* byKey= */ 1, /* byCollection= */ 0);
+    assertOverlayTypes(keyMap("coll/doc3", CountingQueryEngine.OverlayType.Set));
+    assertQueryReturned("coll/doc3");
+
+    query =
+        query("coll").filter(filter("embedding", ">", FieldValue.vector(new double[] {4, 5, 6})));
+    executeQuery(query);
+    assertOverlaysRead(/* byKey= */ 0, /* byCollection= */ 0);
+    assertOverlayTypes(keyMap());
+    assertQueryReturned();
+
+    query = query("coll").filter(filter("embedding", ">=", FieldValue.vector(new double[] {4})));
+    executeQuery(query);
+    assertOverlaysRead(/* byKey= */ 2, /* byCollection= */ 0);
+    assertOverlayTypes(
+        keyMap(
+            "coll/doc4",
+            CountingQueryEngine.OverlayType.Set,
+            "coll/doc3",
+            CountingQueryEngine.OverlayType.Set));
+    assertQueryReturned("coll/doc4", "coll/doc3");
+  }
+
   @Test
   public void testIndexesServerTimestamps() {
     FieldIndex index =