Changing hasIncompleteVersionstamp to use iteration rather than stream processing #7543

jleach4 · jleach4 · commit afa1120874a4 · 2022-07-08T13:27:40.000-07: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));
 	}
 
 	/**
@@ -483,6 +483,15 @@ public List<Object> getItems() {
 		return new ArrayList<>(elements);
 	}
 
+	/**
+	 * Gets the unserialized contents of this {@code Tuple} without copying into a new list.
+	 *
+	 * @return the elements that make up this {@code Tuple}.
+	 */
+	List<Object> getRawItems() {
+		return elements;
+	}
+
 	/**
 	 * Gets a {@link Stream} of the unserialized contents of this {@code Tuple}.
 	 *
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,26 @@ else if(item instanceof Tuple)
 		return packedSize;
 	}
 
-	static boolean hasIncompleteVersionstamp(Stream<?> items) {
-		return items.anyMatch(item -> {
+	static boolean hasIncompleteVersionstamp(Collection<?> items) {
+		boolean hasIncompleteVersionstamp = false;
+		for (Object item: items) {
 			if(item == null) {
-				return false;
+				continue;
 			}
 			else if(item instanceof Versionstamp) {
-				return !((Versionstamp) item).isComplete();
+				hasIncompleteVersionstamp = !((Versionstamp) item).isComplete();
 			}
 			else if(item instanceof Tuple) {
-				return hasIncompleteVersionstamp(((Tuple) item).stream());
+				hasIncompleteVersionstamp = hasIncompleteVersionstamp(((Tuple) item).getRawItems());
 			}
 			else if(item instanceof Collection<?>) {
-				return hasIncompleteVersionstamp(((Collection<?>) item).stream());
+				hasIncompleteVersionstamp = hasIncompleteVersionstamp( (Collection<?>) item);
 			}
-			else {
-				return false;
+			if (hasIncompleteVersionstamp) {
+				return hasIncompleteVersionstamp;
 			}
-		});
+		};
+		return hasIncompleteVersionstamp;
 	}
 
 	public static void main(String[] args) {

Original file line number	Diff line number	Diff line change
`@@ -776,24 +776,26 @@ else if(item instanceof Tuple)`
`776`	`776`	`return packedSize;`
`777`	`777`	`}`
`778`	`778`
`779`		`- static boolean hasIncompleteVersionstamp(Stream<?> items) {`
`780`		`- return items.anyMatch(item -> {`
	`779`	`+ static boolean hasIncompleteVersionstamp(Collection<?> items) {`
	`780`	`+ boolean hasIncompleteVersionstamp = false;`
	`781`	`+ for (Object item: items) {`
`781`	`782`	`if(item == null) {`
`782`		`- return false;`
	`783`	`+ continue;`
`783`	`784`	`}`
`784`	`785`	`else if(item instanceof Versionstamp) {`
`785`		`- return !((Versionstamp) item).isComplete();`
	`786`	`+ hasIncompleteVersionstamp = !((Versionstamp) item).isComplete();`
`786`	`787`	`}`
`787`	`788`	`else if(item instanceof Tuple) {`
`788`		`- return hasIncompleteVersionstamp(((Tuple) item).stream());`
	`789`	`+ hasIncompleteVersionstamp = hasIncompleteVersionstamp(((Tuple) item).getRawItems());`
`789`	`790`	`}`
`790`	`791`	`else if(item instanceof Collection<?>) {`
`791`		`- return hasIncompleteVersionstamp(((Collection<?>) item).stream());`
	`792`	`+ hasIncompleteVersionstamp = hasIncompleteVersionstamp( (Collection<?>) item);`
`792`	`793`	`}`
`793`		`- else {`
`794`		`- return false;`
	`794`	`+ if (hasIncompleteVersionstamp) {`
	`795`	`+ return hasIncompleteVersionstamp;`
`795`	`796`	`}`
`796`		`- });`
	`797`	`+ };`
	`798`	`+ return hasIncompleteVersionstamp;`
`797`	`799`	`}`
`798`	`800`
`799`	`801`	`public static void main(String[] args) {`