Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0ACE7C380 for ; Mon, 3 Jun 2013 14:30:32 +0000 (UTC) Received: (qmail 62121 invoked by uid 500); 3 Jun 2013 14:03:52 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 62092 invoked by uid 500); 3 Jun 2013 14:03:51 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 62083 invoked by uid 99); 3 Jun 2013 14:03:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 14:03:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 14:03:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7137D238897A; Mon, 3 Jun 2013 14:03:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1488997 - in /jena/trunk/jena-arq/src: main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java test/java/com/hp/hpl/jena/sparql/algebra/TestOpAsQuery.java Date: Mon, 03 Jun 2013 14:03:30 -0000 To: commits@jena.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130603140330.7137D238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andy Date: Mon Jun 3 14:03:30 2013 New Revision: 1488997 URL: http://svn.apache.org/r1488997 Log: JENA-465 : Implement conversion of OpMinus back to query syntax. Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestOpAsQuery.java Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java?rev=1488997&r1=1488996&r2=1488997&view=diff ============================================================================== --- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java (original) +++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java Mon Jun 3 14:03:30 2013 @@ -325,8 +325,15 @@ public class OpAsQuery { throw new ARQNotImplemented("OpDiff") ; } @Override - public void visit(OpMinus opMinus) - { throw new ARQNotImplemented("OpMinus") ; } + public void visit(OpMinus opMinus) { + Element eLeft = asElement(opMinus.getLeft()) ; + Element eRight = asElementGroup(opMinus.getRight()) ; + ElementMinus elMinus = new ElementMinus(eRight) ; + ElementGroup g = currentGroup() ; + if ( ! emptyGroup(eLeft) ) + g.addElement(eLeft) ; + g.addElement(elMinus) ; + } @Override public void visit(OpUnion opUnion) Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestOpAsQuery.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestOpAsQuery.java?rev=1488997&r1=1488996&r2=1488997&view=diff ============================================================================== --- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestOpAsQuery.java (original) +++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestOpAsQuery.java Mon Jun 3 14:03:30 2013 @@ -272,6 +272,19 @@ public class TestOpAsQuery { Query r[] = checkQueryParseable(query, false); } + @Test + public void testMinus1() { + String query = "PREFIX : SELECT * { ?s :p ?o MINUS { ?s :q ?v .FILTER(?v<5) } }" ; + Query r[] = checkQueryParseable(query, true); + } + + @Test + public void testMinus2() { + // query gains a level of {} but the meaning is the same. + String query = "PREFIX : SELECT * { ?s :p ?o OPTIONAL { ?s :x ?2 } MINUS { ?s :q ?v .FILTER(?v<5) } }" ; + Query r[] = checkQueryParseable(query, false); + } + public Query[] checkQuery(String query) { Query orig = QueryFactory.create(query, Syntax.syntaxSPARQL_11); Op toReconstruct = Algebra.compile(orig);