resolve comments

Author: Brian Chen

firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalSerializer.java

@@ -322,7 +322,8 @@ public FieldIndex decodeFieldIndex(
                   ? FieldIndex.Segment.Kind.CONTAINS
                   : FieldIndex.Segment.Kind.ORDERED);
     }
-    fieldIndex = fieldIndex.withUpdateTime(new Timestamp(updateSeconds, updateNanos));
+    fieldIndex =
+        fieldIndex.withVersion(new SnapshotVersion(new Timestamp(updateSeconds, updateNanos)));
     return fieldIndex;
   }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteIndexManager.java

@@ -110,8 +110,8 @@ public void addFieldIndex(FieldIndex index) {
         index.getCollectionGroup(),
         encodeFieldIndex(index),
         true,
-        index.getUpdateTime().getSeconds(),
-        index.getUpdateTime().getNanoseconds());
+        index.getVersion().getTimestamp().getSeconds(),
+        index.getVersion().getTimestamp().getNanoseconds());
   }
 
   @Override

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

@@ -16,7 +16,6 @@
 
 import androidx.annotation.NonNull;
 import com.google.auto.value.AutoValue;
-import com.google.firebase.Timestamp;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -60,24 +59,24 @@ public String toString() {
   private final String collectionGroup;
   private final int indexId;
   private final List<Segment> segments;
-  private final Timestamp updateTime;
+  private final SnapshotVersion version;
 
   public FieldIndex(String collectionGroup, int indexId) {
     this.collectionGroup = collectionGroup;
     this.segments = new ArrayList<>();
     this.indexId = indexId;
-    this.updateTime = new Timestamp(0L, 0);
+    this.version = SnapshotVersion.NONE;
   }
 
   public FieldIndex(String collectionId) {
     this(collectionId, -1);
   }
 
-  FieldIndex(String collectionGroup, int indexId, List<Segment> segments, Timestamp updateTime) {
+  FieldIndex(String collectionGroup, int indexId, List<Segment> segments, SnapshotVersion version) {
     this.collectionGroup = collectionGroup;
     this.segments = segments;
     this.indexId = indexId;
-    this.updateTime = updateTime;
+    this.version = version;
   }
 
   /** The collection ID this index applies to. */
@@ -101,8 +100,8 @@ public int segmentCount() {
     return segments.size();
   }
 
-  public Timestamp getUpdateTime() {
-    return updateTime;
+  public SnapshotVersion getVersion() {
+    return version;
   }
 
   @NonNull
@@ -115,12 +114,12 @@ public Iterator<Segment> iterator() {
   public FieldIndex withAddedField(FieldPath fieldPath, Segment.Kind kind) {
     List<Segment> newSegments = new ArrayList<>(segments);
     newSegments.add(new AutoValue_FieldIndex_Segment(fieldPath, kind));
-    return new FieldIndex(collectionGroup, indexId, newSegments, updateTime);
+    return new FieldIndex(collectionGroup, indexId, newSegments, version);
   }
 
-  /** Returns a new field index with the updated updateTime. */
-  public FieldIndex withUpdateTime(Timestamp updateTime) {
-    return new FieldIndex(collectionGroup, indexId, segments, updateTime);
+  /** Returns a new field index with the updated version. */
+  public FieldIndex withVersion(SnapshotVersion version) {
+    return new FieldIndex(collectionGroup, indexId, segments, version);
   }
 
   @Override
@@ -131,19 +130,22 @@ public boolean equals(Object o) {
     FieldIndex fieldIndex = (FieldIndex) o;
 
     if (!segments.equals(fieldIndex.segments)) return false;
+    if (!version.equals(fieldIndex.version)) return false;
     return collectionGroup.equals(fieldIndex.collectionGroup);
   }
 
   @Override
   public int hashCode() {
     int result = collectionGroup.hashCode();
     result = 31 * result + segments.hashCode();
+    result = 31 * result + version.hashCode();
     return result;
   }
 
   @Override
   public String toString() {
     return String.format(
-        "FieldIndex{collectionGroup='%s', segments=%s}", collectionGroup, segments);
+        "FieldIndex{collectionGroup='%s', segments=%s, version=%s}",
+        collectionGroup, segments, version);
   }
 }

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

@@ -32,6 +32,7 @@
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex;
 import com.google.firebase.firestore.model.MutableDocument;
+import com.google.firebase.firestore.model.SnapshotVersion;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -272,12 +273,12 @@ public void testUpdateTime() {
     indexManager.addFieldIndex(
         new FieldIndex("coll1")
             .withAddedField(field("value"), FieldIndex.Segment.Kind.ORDERED)
-            .withUpdateTime(new Timestamp(10, 20)));
+            .withVersion(new SnapshotVersion(new Timestamp(10, 20))));
 
     List<FieldIndex> indexes = ((SQLiteIndexManager) indexManager).getFieldIndexes();
     assertEquals(indexes.size(), 1);
     FieldIndex index = indexes.get(0);
-    assertEquals(index.getUpdateTime(), new Timestamp(10, 20));
+    assertEquals(index.getVersion(), new SnapshotVersion(new Timestamp(10, 20)));
   }
 
   private void addDoc(String key, Map<String, Object> data) {