Changing hasIncompleteVersionstamp to use iteration rather than stream processing

scottfines · scottfines · commit 350804d9018d · 2022-07-08T08:56:36.000-05:00
diff --git a/bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java b/bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java
@@ -86,7 +86,7 @@ private Tuple(Tuple original, Object newItem, boolean itemHasIncompleteVersionst
 
 	private Tuple(List<Object> elements) {
 		this.elements = elements;
-		incompleteVersionstamp = TupleUtil.hasIncompleteVersionstamp(elements.stream());
+		incompleteVersionstamp = TupleUtil.hasIncompleteVersionstamp(elements);
 	}
 
 	/**
@@ -265,7 +265,7 @@ public Tuple add(Versionstamp v) {
 	 * @return a newly created {@code Tuple}
 	 */
 	public Tuple add(List<?> l) {
-		return new Tuple(this, l, TupleUtil.hasIncompleteVersionstamp(l.stream()));
+		return new Tuple(this, l, TupleUtil.hasIncompleteVersionstamp(l));
 	}
 
 	/**
diff --git a/bindings/java/src/main/com/apple/foundationdb/tuple/TupleUtil.java b/bindings/java/src/main/com/apple/foundationdb/tuple/TupleUtil.java
@@ -776,24 +776,23 @@ else if(item instanceof Tuple)
 		return packedSize;
 	}
 
-	static boolean hasIncompleteVersionstamp(Stream<?> items) {
-		return items.anyMatch(item -> {
-			if(item == null) {
-				return false;
+	static boolean hasIncompleteVersionstamp(Collection<?> items){
+		boolean isComplete = true;
+		for(Object itm: items){
+			if(itm instanceof Versionstamp){
+				isComplete = ((Versionstamp)itm).isComplete();
+			}else if(itm instanceof Tuple){
+				isComplete = hasIncompleteVersionstamp(((Tuple)itm).getItems());
+			}else if(itm instanceof Collection<?>){
+				isComplete = hasIncompleteVersionstamp((Collection<?>)itm);
 			}
-			else if(item instanceof Versionstamp) {
-				return !((Versionstamp) item).isComplete();
-			}
-			else if(item instanceof Tuple) {
-				return hasIncompleteVersionstamp(((Tuple) item).stream());
-			}
-			else if(item instanceof Collection<?>) {
-				return hasIncompleteVersionstamp(((Collection<?>) item).stream());
-			}
-			else {
-				return false;
+
+
+			if(!isComplete){
+				break;
 			}
-		});
+		}
+		return !isComplete;
 	}
 
 	public static void main(String[] args) {

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ private Tuple(Tuple original, Object newItem, boolean itemHasIncompleteVersionst`
`86`	`86`
`87`	`87`	`private Tuple(List<Object> elements) {`
`88`	`88`	`this.elements = elements;`
`89`		`- incompleteVersionstamp = TupleUtil.hasIncompleteVersionstamp(elements.stream());`
	`89`	`+ incompleteVersionstamp = TupleUtil.hasIncompleteVersionstamp(elements);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`/**`
`@@ -265,7 +265,7 @@ public Tuple add(Versionstamp v) {`
`265`	`265`	`* @return a newly created {@code Tuple}`
`266`	`266`	`*/`
`267`	`267`	`public Tuple add(List<?> l) {`
`268`		`- return new Tuple(this, l, TupleUtil.hasIncompleteVersionstamp(l.stream()));`
	`268`	`+ return new Tuple(this, l, TupleUtil.hasIncompleteVersionstamp(l));`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`/**`