Merge branch 'TINKERPOP-2029' into TINKERPOP-2029-master
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2ce9a6de Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2ce9a6de Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2ce9a6de Branch: refs/heads/TINKERPOP-2029-master Commit: 2ce9a6def3426b2a2ff89e6b556ae8b2653f6098 Parents: 7a814e1 e518c9a Author: Daniel Kuppitz <[email protected]> Authored: Mon Sep 10 11:47:46 2018 -0700 Committer: Daniel Kuppitz <[email protected]> Committed: Mon Sep 10 11:47:46 2018 -0700 ---------------------------------------------------------------------- .../strategy/decoration/ConnectiveStrategy.java | 83 ++++++++------ .../decoration/ConnectiveStrategyTest.java | 55 ++++----- .../optimization/InlineFilterStrategyTest.java | 113 +++++++++++-------- gremlin-test/features/filter/And.feature | 13 ++- .../process/traversal/step/filter/AndTest.java | 18 ++- 5 files changed, 165 insertions(+), 117 deletions(-) ----------------------------------------------------------------------
