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 2012/01/08 21:19:12 UTC
svn commit: r1228940 - in /incubator/jena: Experimental/JenaPerf/trunk/
Experimental/JenaPerf/trunk/.settings/ Scratch/AFS/Jena-Dev/trunk/
Scratch/AFS/Jena-Dev/trunk/.settings/ Scratch/AFS/Jena-Dev/trunk/src/dev/
Author: andy
Date: Sun Jan 8 20:19:12 2012
New Revision: 1228940
URL: http://svn.apache.org/viewvc?rev=1228940&view=rev
Log: (empty)
Added:
incubator/jena/Scratch/AFS/Jena-Dev/trunk/quads.nq
Removed:
incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.nq
incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.nt
incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.ttl
Modified:
incubator/jena/Experimental/JenaPerf/trunk/.classpath
incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs
incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath
incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs
incubator/jena/Scratch/AFS/Jena-Dev/trunk/U.ru
incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena102_TDBstats.java
incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java
Modified: incubator/jena/Experimental/JenaPerf/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/.classpath?rev=1228940&r1=1228939&r2=1228940&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/.classpath (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/.classpath Sun Jan 8 20:19:12 2012
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/scala"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/scala"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs?rev=1228940&r1=1228939&r2=1228940&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs Sun Jan 8 20:19:12 2012
@@ -1,10 +1,17 @@
-#Thu Jan 05 11:32:04 GMT 2012
+#Sun Jan 08 15:23:36 GMT 2012
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath?rev=1228940&r1=1228939&r2=1228940&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath Sun Jan 8 20:19:12 2012
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ARQ"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-test-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/TDB"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-test-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/ARQ"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/TDB"/>
+ <classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs?rev=1228940&r1=1228939&r2=1228940&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs Sun Jan 8 20:19:12 2012
@@ -1,12 +1,8 @@
-#Fri Sep 30 11:47:36 BST 2011
+#Sun Jan 08 15:24:18 GMT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/U.ru
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/U.ru?rev=1228940&r1=1228939&r2=1228940&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/U.ru (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/U.ru Sun Jan 8 20:19:12 2012
@@ -1,12 +1,3 @@
PREFIX : <http://example/>
-
-INSERT DATA { :x :p "START" } ;
-
-DELETE { ?x :p ?then }
-INSERT { ?x :p ?now }
-WHERE
-{
- ?x :p ?v
- BIND (now() AS ?now)
-}
\ No newline at end of file
+LOAD <file:../Jena-Dev/quads.nq>
Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/quads.nq
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/quads.nq?rev=1228940&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/quads.nq (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/quads.nq Sun Jan 8 20:19:12 2012
@@ -0,0 +1 @@
+<http://example/s> <http://example/p> <http://example/o> <http://example/g> .
\ No newline at end of file
Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena102_TDBstats.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena102_TDBstats.java?rev=1228940&r1=1228939&r2=1228940&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena102_TDBstats.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Jena102_TDBstats.java Sun Jan 8 20:19:12 2012
@@ -18,11 +18,15 @@
package dev;
-import java.io.FileInputStream ;
+import java.io.ByteArrayInputStream ;
import java.io.InputStream ;
import org.openjena.atlas.lib.FileOps ;
+import org.openjena.atlas.lib.StrUtils ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.sse.SSE ;
+import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.tdb.TDBLoader ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.sys.TDBMaker ;
@@ -31,16 +35,32 @@ public class Jena102_TDBstats
{
public static void main(String[] argv) throws Exception
{
+ Triple t1 = SSE.parseTriple("(<s> <p> <o>)") ;
+ Triple t2 = SSE.parseTriple("(<s> <p> <o>)") ;
+ String nt1 = "<s> <p1> <o1> .\n<s> <p1> <o9> ." ;
+ String nt2 = "<s> <p2> <o2> ." ;
+
// JENA-102 : tdbstats handling.
String DIR = "tmp/DB" ;
FileOps.ensureDir("tmp") ;
FileOps.ensureDir(DIR) ;
-// FileOps.clearDirectory(DIR) ;
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph(DIR) ;
- InputStream in = new FileInputStream("D.nt") ;
- // Check code path when there is existing data.
- TDBLoader.load(dsg, in, false) ;
+ FileOps.clearDirectory(DIR) ;
+ DatasetGraphTDB dsg = (DatasetGraphTDB)TDBFactory.createDatasetGraph(DIR) ;
+// DatasetGraphTDB dsg = (DatasetGraphTDB)TDBFactory.createDatasetGraph() ;
+ load(dsg, nt1) ;
+ System.out.println("Waiting...") ;
+ System.in.read() ;
+ TDBMaker.releaseDataset(dsg) ;
+ dsg = (DatasetGraphTDB)TDBFactory.createDatasetGraph(DIR) ;
+ load(dsg, nt2) ;
+ SSE.write(dsg) ;
System.exit(0) ;
}
+
+ static void load (DatasetGraphTDB dsg, String ntStr)
+ {
+ InputStream in = new ByteArrayInputStream(StrUtils.asUTF8bytes(ntStr)) ;
+ TDBLoader.load(dsg, in, true) ;
+ }
}
Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java?rev=1228940&r1=1228939&r2=1228940&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java Sun Jan 8 20:19:12 2012
@@ -24,27 +24,17 @@ import java.io.InputStream ;
import java.nio.ByteBuffer ;
import java.util.UUID ;
-import org.junit.Test ;
-import org.openjena.atlas.io.BlockUTF8 ;
import org.openjena.atlas.lib.Bytes ;
-import org.openjena.atlas.lib.FileOps ;
import org.openjena.atlas.lib.Lib ;
import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFReader ;
-import com.hp.hpl.jena.sparql.function.FunctionRegistry ;
-import com.hp.hpl.jena.sparql.function.library.wait ;
-import com.hp.hpl.jena.sparql.lang.SyntaxVarScope ;
import com.hp.hpl.jena.sparql.mgt.Explain.InfoLevel ;
import com.hp.hpl.jena.sparql.util.Timer ;
import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
-import com.hp.hpl.jena.tdb.StoreConnection ;
import com.hp.hpl.jena.tdb.TDBFactory ;
-import com.hp.hpl.jena.tdb.TDBLoader ;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
-import com.hp.hpl.jena.tdb.sys.TDBMaker ;
public class Run extends RunBase
{
@@ -54,6 +44,9 @@ public class Run extends RunBase
public static void main(String[] argv) throws Exception
{
+
+ arq.update.main("--file=U.ru", "--dump") ; exit(0) ;
+
ARQ.setExecutionLogging(InfoLevel.ALL) ;
tdb.tdbquery.main("--set=arq:logExec=ALL",
"--loc=DB",
@@ -109,14 +102,14 @@ public class Run extends RunBase
Timer t2 = new Timer() ;
t2.startTimer() ;
- for ( int i = 0 ; i < N ; i++ )
- {
- BlockUTF8.fromChars(x[i], bb[i]) ; // faster.
- bb[i].flip() ;
- }
-
- for ( int i = 0 ; i < N ; i++ ) // Slower
- BlockUTF8.toString(bb[i]) ;
+// for ( int i = 0 ; i < N ; i++ )
+// {
+// BlockUTF8.fromChars(x[i], bb[i]) ; // faster.
+// bb[i].flip() ;
+// }
+//
+// for ( int i = 0 ; i < N ; i++ ) // Slower
+// BlockUTF8.toString(bb[i]) ;
long time2 = t2.endTimer() ;
System.out.println(Timer.timeStr(time2)) ;
@@ -144,31 +137,6 @@ public class Run extends RunBase
}
- private static void jena143() throws Exception
- {
- String ns = "http://example/ns#" ;
- FunctionRegistry.get().put(ns + "wait", wait.class) ;
- String DIR = "tmp/DB" ;
- FileOps.ensureDir("tmp") ;
- FileOps.ensureDir(DIR) ;
-
- String qs = "PREFIX f: <"+ns+"> SELECT * { ?s ?p ?o }" ;
-
- DatasetGraphTxn dsGraph = StoreConnection.make(DIR).begin(ReadWrite.READ);
- Dataset ds = dsGraph.toDataset();
-
- QueryExecution qe = QueryExecutionFactory.create(qs, ds) ;
-
- Thread t1 = new Thread(new Killer(qe)) ;
- Thread t2 = new Thread(new QRunner(dsGraph, qe)) ;
-
- t2.start() ;
- t1.start() ;
-
- t1.join() ;
- t2.join() ;
- }
-
static class Killer implements Runnable
{
private QueryExecution qe ;
@@ -214,67 +182,5 @@ public class Run extends RunBase
System.out.println("count = "+count) ;
}
}
-
- private static void jena142_scope()
- {
- //JENA-142
- String[] x = {
- //"SELECT * WHERE { { ?s ?p ?o} UNION { BIND('default' AS ?s) } }" ,
- //"SELECT * WHERE { ?s ?p ?o { BIND('default' AS ?s) } }",
- //"SELECT * WHERE { ?s ?p ?o BIND('default' AS ?s) }",
- //"SELECT * { { ?s ?p ?o } UNION {?s ?p2 ?o2} BIND(5 AS ?o) }",
- "SELECT * { { ?s ?p ?o} UNION { BIND('default' AS ?s) } }"
- } ;
- for ( String queryStr : x )
- {
- System.out.println(queryStr) ;
- try {
- QueryFactory.create(queryStr) ;
- } catch (QueryException e)
- {
- System.out.println("** "+e.getMessage()) ;
- }
- System.out.println() ;
- }
- System.out.println("DONE") ;
- System.exit(0) ;
- }
-
- private static void jena102() throws Exception
- {
- String DIR = "tmp/DB" ;
- FileOps.ensureDir("tmp") ;
- FileOps.ensureDir(DIR) ;
-// FileOps.clearDirectory(DIR) ;
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph(DIR) ;
- InputStream in = new FileInputStream("D.nt") ;
- // Check code path when there is existing data.
- TDBLoader.load(dsg, in, false) ;
- System.exit(0) ;
- }
-
- @Test public void scope_22() { scope("SELECT * { ?s ?p ?o OPTIONAL{?s ?p2 ?o2} BIND(?o2+5 AS ?z) }") ; }
-
- @Test(expected=QueryException.class)
- public void scope_23() { scope("SELECT * { ?s ?p ?o OPTIONAL{?s ?p2 ?o2} BIND(5 AS ?o2) }") ; }
-
- @Test(expected=QueryException.class)
- public void scope_24() { scope("SELECT * { ?s ?p ?o OPTIONAL{?s ?p2 ?o2} BIND(?o+5 AS ?o2) }") ; }
-
- @Test(expected=QueryException.class)
- public void scope_25() { scope("SELECT * { ?s ?p ?o OPTIONAL{?s ?p2 ?o2} BIND(5 AS ?o) }") ; }
-
- // new tests
- @Test public void scope_26() { scope("SELECT * WHERE { { ?s ?p ?o} UNION { BIND('default' AS ?s) } }") ; }
-
- @Test public void scope_27() { scope("SELECT * WHERE { { ?s ?p ?o} BIND('default' AS ?s) }") ; }
-
- @Test public void scope_28() { scope("SELECT * WHERE { ?s ?p ?o { BIND('default' AS ?s) } }") ; }
-
- private static void scope(String queryStr)
- {
- Query query = QueryFactory.create(queryStr) ;
- SyntaxVarScope.check(query) ;
- }
}