From commits-return-31569-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Tue Aug 14 00:21:53 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id EF17A1807AA for ; Tue, 14 Aug 2018 00:21:51 +0200 (CEST) Received: (qmail 58156 invoked by uid 500); 13 Aug 2018 22:21:51 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 58013 invoked by uid 99); 13 Aug 2018 22:21:51 -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; Mon, 13 Aug 2018 22:21:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C971E1182; Mon, 13 Aug 2018 22:21:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Mon, 13 Aug 2018 22:21:59 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/41] tinkerpop git commit: TINKERPOP-1878 Added a test for ordering and corrected some problems in logic TINKERPOP-1878 Added a test for ordering and corrected some problems in logic Ordering didn't work - at least not completely. The test, as it is written in this commit, that failed to sort properly. Changed the logic for ordering to track all of the keys specified to ORDER with their appropriate ASC/DESC operators and added all of them to the traversal. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3b337501 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3b337501 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3b337501 Branch: refs/heads/master Commit: 3b3375018e8fe6a1982144a9a158c5741b689681 Parents: a8e25a8 Author: Stephen Mallette Authored: Fri Jan 26 15:41:10 2018 -0500 Committer: Stephen Mallette Committed: Mon Aug 13 14:39:22 2018 -0400 ---------------------------------------------------------------------- .../sparql/SparqlToGremlinTranspiler.java | 55 ++++++-------------- .../dsl/sparql/SparqlTraversalSourceTest.java | 31 +++++++++-- 2 files changed, 44 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3b337501/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java ---------------------------------------------------------------------- diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java index 9db7d82..ea3f828 100644 --- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java +++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java @@ -21,9 +21,10 @@ package org.apache.tinkerpop.gremlin.sparql; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; -import org.apache.jena.graph.Triple; import org.apache.jena.query.Query; import org.apache.jena.query.QueryFactory; import org.apache.jena.query.SortCondition; @@ -58,8 +59,6 @@ public class SparqlToGremlinTranspiler { private List traversalList = new ArrayList<>(); - private String sortingVariable = ""; - private SparqlToGremlinTranspiler(final GraphTraversal traversal) { this.traversal = traversal; } @@ -96,31 +95,18 @@ public class SparqlToGremlinTranspiler { final int numberOfTraversal = traversalList.size(); final Traversal arrayOfAllTraversals[] = new Traversal[numberOfTraversal]; - if (query.hasOrderBy() && !query.hasGroupBy()) { - final List sortingConditions = query.getOrderBy(); - - for (SortCondition sortCondition : sortingConditions) { - final Expr expr = sortCondition.getExpression(); - sortingVariable = expr.getVarName(); - } - } - for (Traversal tempTrav : traversalList) { arrayOfAllTraversals[traversalIndex++] = tempTrav; } - Order orderDirection = Order.incr; + final Map orderingIndex = new HashMap<>(); if (query.hasOrderBy()) { - int directionOfSort = 0; final List sortingConditions = query.getOrderBy(); for (SortCondition sortCondition : sortingConditions) { final Expr expr = sortCondition.getExpression(); - directionOfSort = sortCondition.getDirection(); - sortingVariable = expr.getVarName(); + orderingIndex.put(expr.getVarName(), sortCondition.getDirection() == 1 ? Order.incr : Order.decr); } - - if (directionOfSort == -1) orderDirection = Order.decr; } if (traversalList.size() > 0) @@ -128,6 +114,8 @@ public class SparqlToGremlinTranspiler { final List vars = query.getResultVars(); if (!query.isQueryResultStar() && !query.hasGroupBy()) { + // the result sizes have special handling to get the right signatures of select() called. perhaps this + // could be refactored to work more nicely switch (vars.size()) { case 0: throw new IllegalStateException(); @@ -135,20 +123,16 @@ public class SparqlToGremlinTranspiler { if (query.isDistinct()) traversal = traversal.dedup(vars.get(0)); - if (query.hasOrderBy()) - traversal = traversal.order().by(sortingVariable, orderDirection); - else - traversal = traversal.select(vars.get(0)); + orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v)); + traversal = traversal.select(vars.get(0)); break; case 2: if (query.isDistinct()) traversal = traversal.dedup(vars.get(0), vars.get(1)); - if (query.hasOrderBy()) - traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1))); - else - traversal = traversal.select(vars.get(0), vars.get(1)); + orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v)); + traversal = traversal.select(vars.get(0), vars.get(1)); break; default: @@ -157,11 +141,11 @@ public class SparqlToGremlinTranspiler { if (query.isDistinct()) traversal = traversal.dedup(all); + orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v)); + + // just some shenanigans to get the right signature of select() called final String[] others = Arrays.copyOfRange(all, 2, vars.size()); - if (query.hasOrderBy()) - traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1))); - else - traversal = traversal.select(vars.get(0), vars.get(1), others); + traversal = traversal.select(vars.get(0), vars.get(1), others); break; } @@ -202,7 +186,7 @@ public class SparqlToGremlinTranspiler { } if (query.hasOrderBy() && query.hasGroupBy()) - traversal = traversal.order().by(sortingVariable, orderDirection); + orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v)); if (query.hasLimit()) { long limit = query.getLimit(), offset = 0; @@ -233,14 +217,7 @@ public class SparqlToGremlinTranspiler { */ @Override public void visit(final OpBGP opBGP) { - final List triples = opBGP.getPattern().getList(); - final Traversal[] matchTraversals = new Traversal[triples.size()]; - int i = 0; - for (final Triple triple : triples) { - - matchTraversals[i++] = TraversalBuilder.transform(triple); - traversalList.add(matchTraversals[i - 1]); - } + opBGP.getPattern().getList().forEach(triple -> traversalList.add(TraversalBuilder.transform(triple))); } /** http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3b337501/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java ---------------------------------------------------------------------- diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java index 9bb6025..2743255 100644 --- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java +++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java @@ -27,16 +27,18 @@ import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; +import static org.hamcrest.collection.IsIterableContainingInOrder.contains; /** * @author Stephen Mallette (http://stephen.genoprime.com) */ public class SparqlTraversalSourceTest { + private static final Graph graph = TinkerFactory.createModern(); + private static final SparqlTraversalSource g = graph.traversal(SparqlTraversalSource.class); + @Test - public void shouldDoStuff() { - final Graph graph = TinkerFactory.createModern(); - final SparqlTraversalSource g = graph.traversal(SparqlTraversalSource.class); + public void shouldFindAllPersonsNamesAndAges() { final List x = g.sparql("SELECT ?name ?age WHERE { ?person v:name ?name . ?person v:age ?age }").toList(); assertThat(x, containsInAnyOrder( new HashMap(){{ @@ -57,4 +59,27 @@ public class SparqlTraversalSourceTest { }} )); } + + @Test + public void shouldFindAllPersonsNamesAndAgesOrdered() { + final List x = g.sparql("SELECT ?name ?age WHERE { ?person v:name ?name . ?person v:age ?age } ORDER BY ASC(?age)").toList(); + assertThat(x, contains( + new HashMap(){{ + put("name", "vadas"); + put("age", 27); + }}, + new HashMap(){{ + put("name", "marko"); + put("age", 29); + }}, + new HashMap(){{ + put("name", "josh"); + put("age", 32); + }}, + new HashMap(){{ + put("name", "peter"); + put("age", 35); + }} + )); + } }