PR issues

Author: MarkDuckworth

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/VectorTest.java

@@ -78,8 +78,6 @@ public void writeAndReadVectorEmbeddings() throws ExecutionException, Interrupte
     assertTrue(actual.get("vector2") instanceof VectorValue);
     assertTrue(actual.get("vector3") instanceof VectorValue);
 
-    VectorValue pojo = actual.get("vector0", VectorValue.class);
-
     assertArrayEquals(
         expected.get("vector0").toArray(),
         actual.get("vector0", VectorValue.class).toArray(),
@@ -96,6 +94,23 @@ public void writeAndReadVectorEmbeddings() throws ExecutionException, Interrupte
         expected.get("vector3").toArray(),
         actual.get("vector3", VectorValue.class).toArray(),
         DOUBLE_EPSILON);
+
+    assertArrayEquals(
+        expected.get("vector0").toArray(),
+        actual.getVectorValue("vector0").toArray(),
+        DOUBLE_EPSILON);
+    assertArrayEquals(
+        expected.get("vector1").toArray(),
+        actual.getVectorValue("vector1").toArray(),
+        DOUBLE_EPSILON);
+    assertArrayEquals(
+        expected.get("vector2").toArray(),
+        actual.getVectorValue("vector2").toArray(),
+        DOUBLE_EPSILON);
+    assertArrayEquals(
+        expected.get("vector3").toArray(),
+        actual.getVectorValue("vector3").toArray(),
+        DOUBLE_EPSILON);
   }
 
   @Test

firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentSnapshot.java

@@ -485,7 +485,8 @@ public DocumentReference getReference() {
   }
 
   /**
-   * Returns the value of the field as a VectorValue.
+   * Returns the value of the field as a {@link VectorValue} or
+   * `null` if the field does not exist in the document.
    *
    * @param field The path to the field.
    * @throws RuntimeException if the value is not a VectorValue.

firebase-firestore/src/main/java/com/google/firebase/firestore/FieldValue.java

@@ -186,7 +186,7 @@ public static FieldValue increment(double l) {
   /**
    * Creates a new {@link VectorValue} constructed with a copy of the given array of doubles.
    *
-   * @param values Create a {@link VectorValue} instance with a copy of this array of doubles.
+   * @param values Array of doubles to be copied to create a {@link VectorValue}.
    * @return A new {@link VectorValue} constructed with a copy of the given array of doubles.
    */
   @NonNull

firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataReader.java

@@ -46,13 +46,11 @@
 import com.google.protobuf.NullValue;
 import com.google.type.LatLng;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.stream.Collectors;
 
 /**
  * Helper for parsing raw user input (provided via the API) into internal model classes.
@@ -456,9 +454,7 @@ private Value parseVectorValue(VectorValue vector, ParseContext context) {
     MapValue.Builder mapBuilder = MapValue.newBuilder();
 
     mapBuilder.putFields(Values.TYPE_KEY, Values.VECTOR_VALUE_TYPE);
-    mapBuilder.putFields(
-        Values.VECTOR_MAP_VECTORS_KEY,
-        parseData(Arrays.stream(vector.toArray()).boxed().collect(Collectors.toList()), context));
+    mapBuilder.putFields(Values.VECTOR_MAP_VECTORS_KEY, parseData(vector.toList(), context));
 
     return Value.newBuilder().setMapValue(mapBuilder).build();
   }

firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataWriter.java

@@ -104,11 +104,15 @@ Map<String, Object> convertObject(Map<String, Value> mapValue) {
   }
 
   VectorValue convertVectorValue(Map<String, Value> mapValue) {
-    double[] values =
-        mapValue.get(Values.VECTOR_MAP_VECTORS_KEY).getArrayValue().getValuesList().stream()
-            .mapToDouble(val -> val.getDoubleValue())
-            .toArray();
-    return new VectorValue(values);
+    List<Value> values =
+        mapValue.get(Values.VECTOR_MAP_VECTORS_KEY).getArrayValue().getValuesList();
+
+    double[] doubles = new double[values.size()];
+    for (int i = 0; i < values.size(); i++) {
+      doubles[i] = values.get(i).getDoubleValue();
+    }
+
+    return new VectorValue(doubles);
   }
 
   private Object convertServerTimestamp(Value serverTimestampValue) {

firebase-firestore/src/main/java/com/google/firebase/firestore/VectorValue.java

@@ -16,19 +16,19 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * Represent a vector type in Firestore documents.
  * Create an instance with {@link FieldValue#vector(double[])}.
  */
-public class VectorValue implements Serializable {
+public class VectorValue {
   private final double[] values;
 
   VectorValue(@Nullable double[] values) {
-    if (values == null) this.values = new double[] {};
-    else this.values = values.clone();
+    this.values = (values == null) ? new double[] {} : values.clone();
   }
 
   /**
@@ -41,6 +41,21 @@ public double[] toArray() {
     return this.values.clone();
   }
 
+  /**
+   * Package private.
+   * Returns a representation of the vector as a List<Doubles>.
+   *
+   * @return A representation of the vector as an List<Doubles>
+   */
+  @NonNull
+  List<Double> toList() {
+    ArrayList<Double> result = new ArrayList<Double>(this.values.length);
+    for (int i = 0; i < this.values.length; i++) {
+      result.add(i, this.values[i]);
+    }
+    return result;
+  }
+
   /**
    * Returns true if this VectorValue is equal to the provided object.
    *

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

@@ -143,14 +143,13 @@ private void writeUnlabeledIndexString(
   }
 
   private void writeIndexVector(MapValue mapIndexValue, DirectionalIndexByteEncoder encoder) {
-    writeValueTypeLabel(encoder, INDEX_TYPE_VECTOR);
-
     Map<String, Value> map = mapIndexValue.getFieldsMap();
+    String key = Values.VECTOR_MAP_VECTORS_KEY;
+    writeValueTypeLabel(encoder, INDEX_TYPE_VECTOR);
 
     // Vectors sort first by length
-    String key = Values.VECTOR_MAP_VECTORS_KEY;
     int length = map.get(key).getArrayValue().getValuesCount();
-    this.writeValueTypeLabel(encoder, INDEX_TYPE_VECTOR);
+    writeValueTypeLabel(encoder, INDEX_TYPE_NUMBER);
     encoder.writeLong(length);
 
     // Vectors then sort by position value

firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.java

@@ -560,6 +560,7 @@ public static Value getLowerBound(Value value) {
       case ARRAY_VALUE:
         return MIN_ARRAY;
       case MAP_VALUE:
+        // VectorValue sorts after ArrayValue and before an empty MapValue
         if (isVectorValue(value)) {
           return MIN_VECTOR_VALUE;
         }
@@ -592,6 +593,7 @@ public static Value getUpperBound(Value value) {
       case ARRAY_VALUE:
         return MIN_VECTOR_VALUE;
       case MAP_VALUE:
+        // VectorValue sorts after ArrayValue and before an empty MapValue
         if (isVectorValue(value)) {
           return MIN_MAP;
         }

firebase-firestore/src/test/java/com/google/firebase/firestore/model/ValuesTest.java

@@ -201,6 +201,7 @@ public void testValueOrdering() {
         .addEqualityGroup(wrap(Arrays.asList("foo", "0")))
 
         // vector
+        // .addEqualityGroup(wrap(FieldValue.vector(new double[] {})))
         .addEqualityGroup(wrap(FieldValue.vector(new double[] {100})))
         .addEqualityGroup(wrap(FieldValue.vector(new double[] {1, 2, 3})))
         .addEqualityGroup(wrap(FieldValue.vector(new double[] {1, 3, 2})))