GitHub user dkuppitz opened a pull request:

    https://github.com/apache/tinkerpop/pull/931

    TINKERPOP-2029 ConcurrentModificationException for InlineFilterStrategy

    https://issues.apache.org/jira/browse/TINKERPOP-2029
    
    To fix the original issue, I basically rewrote `ConnectiveStrategy`. The 
infix notation of `and()` and `or()` now supports an arbitrary number of 
traversals and `ConnectiveStrategy` produces a traversal with correct `AND` and 
`OR` semantics.
    
    The reason for targeting `master/` is that there were no strict semantics 
before and thus this needs to be considered a breaking change.
    
    ```
    # BEHAVIOR
    
    Input: a.or.b.and.c.or.d.and.e.or.f.and.g.and.h.or.i
    
    ## BEFORE
    Output: or(a, or(and(b, c), or(and(d, e), or(and(and(f, g), h), i))))
    
    ## NOW
    Output: or(a, and(b, c), and(d, e), and(f, g, h), i)
    ```
    
    `docker/build.sh -t -i -n` passed.
    
    VOTE +1

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/apache/tinkerpop TINKERPOP-2029-master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/tinkerpop/pull/931.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #931
    
----
commit 46ee42686a875baf123176040b2f341218e02e1a
Author: Stephen Mallette <spmva@...>
Date:   2018-09-05T17:08:01Z

    TINKERPOP-2029 Added tests demonstrating strategy failures
    
    Identified potentially two problems, one with ConnectedStrategy and by 
virtue of its application InlineFilterStrategy.

commit e518c9af9a4aca56449af2b743f24d35a8a43b50
Author: Daniel Kuppitz <daniel_kuppitz@...>
Date:   2018-09-10T18:41:34Z

    Rewrote `ConnectiveStrategy`. It's a breaking change as it now behaves 
slightly differently, but now it
    
    * produces correct AND and OR semantics.
    * has fewer recursive calls (at most 1).
    * is faster in its own execution and produces fewer steps in the final 
traversal which should make the processed traversal faster as well.

commit 2ce9a6def3426b2a2ff89e6b556ae8b2653f6098
Author: Daniel Kuppitz <daniel_kuppitz@...>
Date:   2018-09-10T18:47:46Z

    Merge branch 'TINKERPOP-2029' into TINKERPOP-2029-master

commit 9330fcbc477e6a64649b6c6aa22f697756d31140
Author: Daniel Kuppitz <daniel_kuppitz@...>
Date:   2018-09-10T18:49:52Z

    Removed note about infix restriction for `and()` and `or()` as they are no 
longer existent.

commit 40b21bbd1361712c7b3cef140773ea87da30dbd0
Author: Daniel Kuppitz <daniel_kuppitz@...>
Date:   2018-09-10T19:21:17Z

    updated docs

----


---

Reply via email to