[groovy] branch GROOVY-8258 updated (008a8cb -> 475c349)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[groovy] branch GROOVY-8258 updated (008a8cb -> 475c349)

Daniel.Sun
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch GROOVY-8258
in repository https://gitbox.apache.org/repos/asf/groovy.git.


 discard 008a8cb  GROOVY-8258: Reuse the stream as possible as we could
     new 475c349  GROOVY-8258: Reuse the stream as possible as we could

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (008a8cb)
            \
             N -- N -- N   refs/heads/GROOVY-8258 (475c349)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/groovy/linq/provider/collection/QueryableCollection.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Apache Groovy committer & PMC member

Blog: http://blog.sunlan.me
Twitter: @daniel_sun
Reply | Threaded
Open this post in threaded view
|

[groovy] 01/01: GROOVY-8258: Reuse the stream as possible as we could

Daniel.Sun
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY-8258
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 475c349d9bceddd0850c54050633970f2bda091a
Author: Daniel Sun <[hidden email]>
AuthorDate: Sun Oct 18 17:33:48 2020 +0800

    GROOVY-8258: Reuse the stream as possible as we could
---
 .../linq/provider/collection/QueryableCollection.java      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
index 476c0d3..61997ce 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
@@ -45,6 +45,7 @@ import static org.apache.groovy.linq.provider.collection.Queryable.from;
 @Internal
 class QueryableCollection<T> implements Queryable<T>, Iterable<T> {
     private final Iterable<T> sourceIterable;
+    private Stream<T> sourceStream;
 
     QueryableCollection(Iterable<T> sourceIterable) {
         if (sourceIterable instanceof QueryableCollection) {
@@ -199,7 +200,18 @@ class QueryableCollection<T> implements Queryable<T>, Iterable<T> {
 
     @Override
     public Stream<T> stream() {
-        return toStream(sourceIterable);  // we have to create new stream every time because Java stream can not be reused
+        if (null != sourceStream) {
+            try {
+                sourceStream.peek(e -> {}); // check if the stream is usable
+                return sourceStream;
+            } catch (IllegalStateException ignore) {
+            }
+        }
+
+        // we have to create new stream because Java stream can not be reused
+        sourceStream = toStream(sourceIterable);
+
+        return sourceStream;
     }
 
     @Override

Apache Groovy committer & PMC member

Blog: http://blog.sunlan.me
Twitter: @daniel_sun