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 75FC510C06 for ; Thu, 8 Aug 2013 10:13:57 +0000 (UTC) Received: (qmail 15790 invoked by uid 500); 8 Aug 2013 10:13:52 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 15557 invoked by uid 500); 8 Aug 2013 10:13:48 -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 15544 invoked by uid 99); 8 Aug 2013 10:13:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Aug 2013 10:13:46 +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; Thu, 08 Aug 2013 10:13:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 54DE923888E7; Thu, 8 Aug 2013 10:13:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1511666 - /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java Date: Thu, 08 Aug 2013 10:13:25 -0000 To: commits@jena.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130808101325.54DE923888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andy Date: Thu Aug 8 10:13:24 2013 New Revision: 1511666 URL: http://svn.apache.org/r1511666 Log: Update comment on simplification. Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java?rev=1511666&r1=1511665&r2=1511666&view=diff ============================================================================== --- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java (original) +++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java Thu Aug 8 10:13:24 2013 @@ -138,7 +138,8 @@ public class Optimize implements Rewrite if ( false ) { - // Simplify is always applied by the AlgebraGenerator + // Removal of "group of one" join (AKA SPARQL "simplification") + // is done during algebra generation in AlgebraGenerator op = apply("Simplify", new TransformSimplify(), op) ; op = apply("Delabel", new TransformRemoveLabels(), op) ; } @@ -149,11 +150,6 @@ public class Optimize implements Rewrite // This transformation must be done (e.g. by QueryEngineBase) if no other optimization is done. op = TransformScopeRename.transform(op) ; - // Remove "group of one" join - // Done in AlgebraGenerator - // e..g CONSTRUCT {} WHERE { SELECT ... } - //op = TransformTopLevelSelect.simplify(op) ; - // Prepare expressions. OpWalker.walk(op, new OpVisitorExprPrepare(context)) ;