You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/09/05 17:11:05 UTC
svn commit: r1165317 - in /incubator/jena/Jena2/ARQ/trunk: ./ Archive/
src-test/com/hp/hpl/jena/sparql/ src/com/hp/hpl/jena/sparql/expr/
src/com/hp/hpl/jena/sparql/lang/
Author: andy
Date: Mon Sep 5 15:11:04 2011
New Revision: 1165317
URL: http://svn.apache.org/viewvc?rev=1165317&view=rev
Log:
Remove RDQL
Added:
incubator/jena/Jena2/ARQ/trunk/Archive/rdql.zip (with props)
Modified:
incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/ARQTestSuite.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/lang/ParserRDQL.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/lang/ParserRegistry.java
Added: incubator/jena/Jena2/ARQ/trunk/Archive/rdql.zip
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Archive/rdql.zip?rev=1165317&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/ARQ/trunk/Archive/rdql.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt?rev=1165317&r1=1165316&r2=1165317&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt Mon Sep 5 15:11:04 2011
@@ -3,6 +3,7 @@ ChangeLog for ARQ
==== ARQ 2.8.9
++ Remove RDQL from ARQ (code in Archive/ in SVN -- will not be updated)
+ ResultSetUtils.union(ResultSet ... sets)
+ Add optimization for DISTINCT/ORDER BY/LIMIT N (JENA-108)
+ Add optimization for DISTINCT/ORDER BY (JENA-90)
Modified: incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1165317&r1=1165316&r2=1165317&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/ARQTestSuite.java Mon Sep 5 15:11:04 2011
@@ -99,10 +99,6 @@ public class ARQTestSuite extends TestSu
// but this should be the untouched versions)
ts.addTest(TS_DAWG.suite()) ;
- // The RDQL engine ported to ARQ
- // Includes TS_ExprRDQL so TS_* runs twice. 166 tests
- ts.addTest(TS_RDQL.suite()) ;
-
// API
ts.addTest(new JUnit4TestAdapter(TS_API.class)) ;
@@ -110,7 +106,6 @@ public class ARQTestSuite extends TestSu
ts.addTest(TS_Update.suite()) ;
ts.addTest(TS_SSE.suite()) ;
-
ts.addTest(new JUnit4TestAdapter(TS_Graph.class)) ;
ts.addTest(new JUnit4TestAdapter(TS_Lang.class)) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/expr/ExprTransformer.java?rev=1165317&r1=1165316&r2=1165317&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/expr/ExprTransformer.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/expr/ExprTransformer.java Mon Sep 5 15:11:04 2011
@@ -13,7 +13,6 @@ import java.util.Stack ;
import com.hp.hpl.jena.sparql.algebra.Op ;
import com.hp.hpl.jena.sparql.algebra.Transformer ;
-import com.hp.hpl.jena.sparql.lang.rdql.ExprRDQL ;
import org.openjena.atlas.logging.Log ;
public class ExprTransformer
@@ -51,9 +50,6 @@ public class ExprTransformer
private Expr transformation(ApplyExprTransformVisitor applyVisitor, Expr expr)
{
- if ( expr instanceof ExprRDQL )
- // Can't transform RDQL expressions.
- return expr ;
ExprWalker.walk(applyVisitor, expr) ;
return applyVisitor.result() ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/lang/ParserRegistry.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/lang/ParserRegistry.java?rev=1165317&r1=1165316&r2=1165317&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/lang/ParserRegistry.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/lang/ParserRegistry.java Mon Sep 5 15:11:04 2011
@@ -49,11 +49,6 @@ public class ParserRegistry
public boolean accept(Syntax syntax ) { return Syntax.syntaxARQ.equals(syntax) ; }
public Parser create ( Syntax syntax ) { return new ParserARQ() ; } }) ;
- reg.add(Syntax.syntaxRDQL,
- new ParserFactory() {
- public boolean accept ( Syntax syntax ) { return Syntax.syntaxRDQL.equals(syntax) ; }
- public Parser create ( Syntax syntax ) { return new ParserRDQL() ; } }) ;
-
// Defend against concurrent start up (even if not synchronised).
// Protects against, not fixes, the problem.
registry = reg ;