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/26 11:42:59 UTC
svn commit: r1175751 - in /incubator/jena/Jena2/ARQ/trunk: ./ src-dev/dev/
src-dev/reports/archive/ src-examples/arq/examples/larq/
src-examples/arq/examples/test/ src-test/com/hp/hpl/jena/sparql/
src-test/com/hp/hpl/jena/sparql/junit/ src-test/com/hp/...
Author: andy
Date: Mon Sep 26 09:42:59 2011
New Revision: 1175751
URL: http://svn.apache.org/viewvc?rev=1175751&view=rev
Log:
JENA-62 Remove LARQ from ARQ
Removed:
incubator/jena/Jena2/ARQ/trunk/src-dev/reports/archive/ReportLARQConcurrent.java
incubator/jena/Jena2/ARQ/trunk/src-examples/arq/examples/larq/
incubator/jena/Jena2/ARQ/trunk/src-examples/arq/examples/test/
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/TestLARQUtils.java
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/larq/
incubator/jena/Jena2/ARQ/trunk/src/arq/cmdline/ModLARQindex.java
incubator/jena/Jena2/ARQ/trunk/src/arq/larq.java
incubator/jena/Jena2/ARQ/trunk/src/arq/larqbuilder.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/larq/
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/pfunction/library/textMatch.java
Modified:
incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
incubator/jena/Jena2/ARQ/trunk/src-dev/dev/AllTestsARQ.java
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/ARQTestSuite.java
Modified: incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt?rev=1175751&r1=1175750&r2=1175751&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt Mon Sep 26 09:42:59 2011
@@ -3,6 +3,7 @@ ChangeLog for ARQ
==== ARQ 2.8.9
++ Remove ALQR from ARQ. LARQ is now a separate Jena module.
+ Fix reuse of query objects (aggregation used shared state) (JENA-121)
+ Spill to disk update (enable with ARQ.spillOnDiskUpdateThreshold) (JENA-45)
+ External sort (enable with ARQ.spillOnDiskSortingThreshold) (JENA-44)
Modified: incubator/jena/Jena2/ARQ/trunk/src-dev/dev/AllTestsARQ.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-dev/dev/AllTestsARQ.java?rev=1175751&r1=1175750&r2=1175751&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-dev/dev/AllTestsARQ.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-dev/dev/AllTestsARQ.java Mon Sep 26 09:42:59 2011
@@ -18,16 +18,15 @@
package dev;
-import junit.framework.TestSuite ;
-import arq.examples.test.TestLARQExamples ;
-
-import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.sparql.ARQTestSuite ;
-import com.hp.hpl.jena.sparql.engine.main.QueryEngineMain ;
-import com.hp.hpl.jena.sparql.engine.ref.QueryEngineRef ;
-import com.hp.hpl.jena.sparql.expr.E_Function ;
-import com.hp.hpl.jena.sparql.expr.NodeValue ;
-import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
+import junit.framework.TestSuite ;
+
+import com.hp.hpl.jena.query.ARQ ;
+import com.hp.hpl.jena.sparql.ARQTestSuite ;
+import com.hp.hpl.jena.sparql.engine.main.QueryEngineMain ;
+import com.hp.hpl.jena.sparql.engine.ref.QueryEngineRef ;
+import com.hp.hpl.jena.sparql.expr.E_Function ;
+import com.hp.hpl.jena.sparql.expr.NodeValue ;
+import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
/** All tests - the main test suite and also the examples tests */
public class AllTestsARQ extends TestSuite
@@ -60,7 +59,6 @@ public class AllTestsARQ extends TestSui
// Scripted tests for ARQ examples.
ts.addTest(ScriptTestSuiteFactory.make(ARQTestSuite.testDirARQ+"/Examples/manifest.ttl")) ;
- ts.addTest(TestLARQExamples.suite()) ;
return ts ;
}
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=1175751&r1=1175750&r2=1175751&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 26 09:42:59 2011
@@ -19,33 +19,32 @@
package com.hp.hpl.jena.sparql;
-import junit.framework.JUnit4TestAdapter ;
-import junit.framework.TestSuite ;
-import org.openjena.atlas.TC_Atlas ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.TC_Riot ;
-
-import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.sparql.algebra.TC_Algebra ;
-import com.hp.hpl.jena.sparql.api.TS_API ;
-import com.hp.hpl.jena.sparql.engine.binding.TestBindingStreams ;
-import com.hp.hpl.jena.sparql.engine.TS_Engine;
-import com.hp.hpl.jena.sparql.engine.main.QueryEngineMain ;
-import com.hp.hpl.jena.sparql.engine.ref.QueryEngineRef ;
-import com.hp.hpl.jena.sparql.expr.E_Function ;
-import com.hp.hpl.jena.sparql.expr.NodeValue ;
-import com.hp.hpl.jena.sparql.expr.TS_Expr ;
-import com.hp.hpl.jena.sparql.graph.TS_Graph ;
-import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
-import com.hp.hpl.jena.sparql.lang.TS_Lang ;
-import com.hp.hpl.jena.sparql.larq.TS_LARQ ;
-import com.hp.hpl.jena.sparql.modify.TS_Update ;
-import com.hp.hpl.jena.sparql.resultset.TS_ResultSet ;
-import com.hp.hpl.jena.sparql.solver.TS_Solver ;
-import com.hp.hpl.jena.sparql.syntax.TS_SSE ;
-import com.hp.hpl.jena.sparql.syntax.TS_Serialization ;
-import com.hp.hpl.jena.sparql.syntax.TS_Syntax ;
-import com.hp.hpl.jena.sparql.util.TS_Util ;
+import junit.framework.JUnit4TestAdapter ;
+import junit.framework.TestSuite ;
+import org.openjena.atlas.TC_Atlas ;
+import org.openjena.riot.ErrorHandlerFactory ;
+import org.openjena.riot.TC_Riot ;
+
+import com.hp.hpl.jena.query.ARQ ;
+import com.hp.hpl.jena.sparql.algebra.TC_Algebra ;
+import com.hp.hpl.jena.sparql.api.TS_API ;
+import com.hp.hpl.jena.sparql.engine.TS_Engine ;
+import com.hp.hpl.jena.sparql.engine.binding.TestBindingStreams ;
+import com.hp.hpl.jena.sparql.engine.main.QueryEngineMain ;
+import com.hp.hpl.jena.sparql.engine.ref.QueryEngineRef ;
+import com.hp.hpl.jena.sparql.expr.E_Function ;
+import com.hp.hpl.jena.sparql.expr.NodeValue ;
+import com.hp.hpl.jena.sparql.expr.TS_Expr ;
+import com.hp.hpl.jena.sparql.graph.TS_Graph ;
+import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
+import com.hp.hpl.jena.sparql.lang.TS_Lang ;
+import com.hp.hpl.jena.sparql.modify.TS_Update ;
+import com.hp.hpl.jena.sparql.resultset.TS_ResultSet ;
+import com.hp.hpl.jena.sparql.solver.TS_Solver ;
+import com.hp.hpl.jena.sparql.syntax.TS_SSE ;
+import com.hp.hpl.jena.sparql.syntax.TS_Serialization ;
+import com.hp.hpl.jena.sparql.syntax.TS_Syntax ;
+import com.hp.hpl.jena.sparql.util.TS_Util ;
/**
* All the ARQ tests
@@ -102,9 +101,6 @@ public class ARQTestSuite extends TestSu
// Scripted tests for SPARQL
ts.addTest(ScriptTestSuiteFactory.make(testDirARQ+"/manifest-arq.ttl")) ;
- // ARQ + Lucene
- ts.addTest(TS_LARQ.suite()) ;
-
// Scripted tests for ARQ features outside SPARQL syntax
// Currently at end of manifest-arq.ttl
// ts.addTest(QueryTestSuiteFactory.make(testDirARQ+"/manifest-ext.ttl")) ;