Make LowerBound nullable

Author: schmidt-sebastian

firebase-firestore/src/main/java/com/google/firebase/firestore/core/Target.java

@@ -123,11 +123,7 @@ public boolean hasLimit() {
    */
   public List<Value> getArrayValues(FieldIndex fieldIndex) {
     // Go through all filters to find a value for the current field segment
-    for (FieldIndex.Segment segment : fieldIndex) {
-      if (!segment.getKind().equals(FieldIndex.Segment.Kind.ARRAYS)) {
-        continue;
-      }
-
+    for (FieldIndex.Segment segment : fieldIndex.getArraySegments()) {
       for (Filter filter : filters) {
         if (filter.getField().equals(segment.getFieldPath())) {
           FieldFilter fieldFilter = (FieldFilter) filter;
@@ -156,11 +152,7 @@ public List<Value> getArrayValues(FieldIndex fieldIndex) {
     boolean inclusive = true;
 
     // Go through all filters to find a value for the current field segment
-    for (FieldIndex.Segment segment : fieldIndex) {
-      if (!segment.getKind().equals(FieldIndex.Segment.Kind.ORDERED)) {
-        continue;
-      }
-
+    for (FieldIndex.Segment segment : fieldIndex.getDirectionalSegments()) {
       Value segmentValue = null;
       boolean segmentInclusive = true;
 
@@ -248,11 +240,7 @@ public List<Value> getArrayValues(FieldIndex fieldIndex) {
     List<Value> values = new ArrayList<>();
     boolean inclusive = true;
 
-    for (FieldIndex.Segment segment : fieldIndex) {
-      if (!segment.getKind().equals(FieldIndex.Segment.Kind.ORDERED)) {
-        continue;
-      }
-
+    for (FieldIndex.Segment segment : fieldIndex.getDirectionalSegments()) {
       @Nullable Value segmentValue = null;
       boolean segmentInclusive = true;
 

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

@@ -223,9 +223,9 @@ public Set<DocumentKey> getDocumentsMatchingTarget(Target target) {
           upperBound);
     }
 
-    Object[] lowerBoundValues = encodeBound(fieldIndex, target, lowerBound);
+    Object[] lowerBoundValues = encodeDirectionalBound(fieldIndex, target, lowerBound);
     String lowerBoundOp = lowerBound != null ? (lowerBound.isInclusive() ? ">=" : ">") : null;
-    Object[] upperBoundValues = encodeBound(fieldIndex, target, upperBound);
+    Object[] upperBoundValues = encodeDirectionalBound(fieldIndex, target, upperBound);
     String upperBoundOp = upperBound != null ? (upperBound.isInclusive() ? "<=" : "<") : null;
 
     SQLitePersistence.Query query =
@@ -386,7 +386,7 @@ private Object encodeDocumentValues(List<Value> values) {
    * Encodes the given field values according to the specification in {@code target}. For IN and
    * ArrayContainsAny queries, a list of possible values is returned.
    */
-  private @Nullable Object[] encodeBound(
+  private @Nullable Object[] encodeDirectionalBound(
       FieldIndex fieldIndex, Target target, @Nullable Bound bound) {
     if (bound == null) {
       return null;
@@ -395,10 +395,7 @@ private Object encodeDocumentValues(List<Value> values) {
     encoders.add(new IndexByteEncoder());
 
     int i = 0;
-    for (FieldIndex.Segment segment : fieldIndex) { // get ordered segments, get array segments
-      if (!segment.getKind().equals(FieldIndex.Segment.Kind.ORDERED)) {
-        continue;
-      }
+    for (FieldIndex.Segment segment : fieldIndex.getDirectionalSegments()) {
       Value value = bound.getPosition().get(i);
       for (IndexByteEncoder encoder : encoders) {
         if (isMultiValueFilter(target, segment.getFieldPath())

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

@@ -110,6 +110,26 @@ public Iterator<Segment> iterator() {
     return segments.iterator();
   }
 
+  public Iterable<Segment> getDirectionalSegments() {
+    List<Segment> filteredSegments = new ArrayList<>();
+    for (Segment segment : segments) {
+      if (segment.getKind().equals(Segment.Kind.ORDERED)) {
+        filteredSegments.add(segment);
+      }
+    }
+    return filteredSegments;
+  }
+
+  public Iterable<Segment> getArraySegments() {
+    List<Segment> filteredSegments = new ArrayList<>();
+    for (Segment segment : segments) {
+      if (segment.getKind().equals(Segment.Kind.ARRAYS)) {
+        filteredSegments.add(segment);
+      }
+    }
+    return filteredSegments;
+  }
+
   /** Returns a new field index with additional index segment. */
   public FieldIndex withAddedField(FieldPath fieldPath, Segment.Kind kind) {
     List<Segment> newSegments = new ArrayList<>(segments);