Return-Path: X-Original-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Delivered-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F1F8A188AC for ; Thu, 3 Dec 2015 14:49:53 +0000 (UTC) Received: (qmail 10296 invoked by uid 500); 3 Dec 2015 14:49:50 -0000 Delivered-To: apmail-tinkerpop-commits-archive@tinkerpop.apache.org Received: (qmail 10271 invoked by uid 500); 3 Dec 2015 14:49:50 -0000 Mailing-List: contact commits-help@tinkerpop.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.incubator.apache.org Delivered-To: mailing list commits@tinkerpop.incubator.apache.org Received: (qmail 10258 invoked by uid 99); 3 Dec 2015 14:49:50 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 14:49:50 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4AB0B1A0745 for ; Thu, 3 Dec 2015 14:49:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.226 X-Spam-Level: * X-Spam-Status: No, score=1.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id I8UVMLpwyyGf for ; Thu, 3 Dec 2015 14:49:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 48D4A439ED for ; Thu, 3 Dec 2015 14:49:49 +0000 (UTC) Received: (qmail 10204 invoked by uid 99); 3 Dec 2015 14:49:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2015 14:49:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A0F90E6809; Thu, 3 Dec 2015 14:49:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.incubator.apache.org Date: Thu, 03 Dec 2015 14:49:49 -0000 Message-Id: <779bab26eef14e4b96b3db08213ce80c@git.apache.org> In-Reply-To: <09e670bef8e1400dbfde2242c9d2557f@git.apache.org> References: <09e670bef8e1400dbfde2242c9d2557f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] incubator-tinkerpop git commit: Merge branch 'TINKERPOP3-1013' Merge branch 'TINKERPOP3-1013' Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6041de66 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6041de66 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6041de66 Branch: refs/heads/TINKERPOP3-1011 Commit: 6041de6630e4c253b817bd859845812517c89b90 Parents: 59eaa06 e6a1141 Author: Marko A. Rodriguez Authored: Wed Dec 2 15:59:13 2015 -0700 Committer: Marko A. Rodriguez Committed: Wed Dec 2 15:59:13 2015 -0700 ---------------------------------------------------------------------- .../gremlin/process/traversal/Traverser.java | 9 ++++ .../process/traversal/step/map/MatchStep.java | 56 +++++++++++++------- .../traversal/step/util/ComputerAwareStep.java | 2 +- .../traversal/traverser/O_Traverser.java | 37 +++++++++++++ .../traverser/util/EmptyTraverser.java | 6 +++ .../traversal/step/map/MatchStepTest.java | 15 ++++-- 6 files changed, 99 insertions(+), 26 deletions(-) ----------------------------------------------------------------------