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/06/01 13:39:44 UTC
svn commit: r1345076 - in /jena/trunk/jena-sdb: ./
src-test/com/hp/hpl/jena/sdb/test/
src-test/com/hp/hpl/jena/sdb/test/modify/ src-test/sdb/
src/com/hp/hpl/jena/sdb/graph/ src/com/hp/hpl/jena/sdb/store/ testing/Update/
Author: andy
Date: Fri Jun 1 11:39:43 2012
New Revision: 1345076
URL: http://svn.apache.org/viewvc?rev=1345076&view=rev
Log:
bring up-to-date.
Added:
jena/trunk/jena-sdb/testing/Update/bad-1.ru
jena/trunk/jena-sdb/testing/Update/bad-2.ru
jena/trunk/jena-sdb/testing/Update/bad-3.ru
Modified:
jena/trunk/jena-sdb/.classpath
jena/trunk/jena-sdb/pom.xml
jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBUpdateTestSuite.java
jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java
jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java
jena/trunk/jena-sdb/src-test/sdb/sdbtest.java
jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/graph/GraphQueryHandlerSDB.java
jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java
Modified: jena/trunk/jena-sdb/.classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/.classpath?rev=1345076&r1=1345075&r2=1345076&view=diff
==============================================================================
--- jena/trunk/jena-sdb/.classpath (original)
+++ jena/trunk/jena-sdb/.classpath Fri Jun 1 11:39:43 2012
@@ -7,11 +7,11 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JRuby"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JDBC"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.0/jena-arq-2.9.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.0/jena-arq-2.9.0-test-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0/jena-iri-0.9.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-test-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.1-SNAPSHOT/jena-arq-2.9.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.1-SNAPSHOT/jena-arq-2.9.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.1-SNAPSHOT/jena-arq-2.9.1-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.1-SNAPSHOT/jena-arq-2.9.1-SNAPSHOT-test-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1-SNAPSHOT/jena-iri-0.9.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.1-SNAPSHOT/jena-iri-0.9.1-sources-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-SNAPSHOT/jena-core-2.7.1-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-SNAPSHOT/jena-core-2.7.1-SNAPSHOT-test-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-SNAPSHOT/jena-core-2.7.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-SNAPSHOT/jena-core-2.7.1-SNAPSHOT-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"/>
Modified: jena/trunk/jena-sdb/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/pom.xml?rev=1345076&r1=1345075&r2=1345076&view=diff
==============================================================================
--- jena/trunk/jena-sdb/pom.xml (original)
+++ jena/trunk/jena-sdb/pom.xml Fri Jun 1 11:39:43 2012
@@ -54,8 +54,8 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
- <ver.jena>2.7.0-incubating</ver.jena>
- <ver.arq>2.9.0-incubating</ver.arq>
+ <ver.jena>2.7.1-SNAPSHOT</ver.jena>
+ <ver.arq>2.9.1-SNAPSHOT</ver.arq>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
</properties>
Modified: jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBUpdateTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBUpdateTestSuite.java?rev=1345076&r1=1345075&r2=1345076&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBUpdateTestSuite.java (original)
+++ jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBUpdateTestSuite.java Fri Jun 1 11:39:43 2012
@@ -35,7 +35,7 @@ public class SDBUpdateTestSuite extends
{
super("SDB Update") ;
- addTestSuite(TestSPARQLUpdate.class) ;
- addTestSuite(TestSPARQLUpdateMgt.class) ;
+ addTest(TestSPARQLUpdate.suite()) ;
+ addTest(TestSPARQLUpdateMgt.suite()) ;
}
}
Modified: jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java?rev=1345076&r1=1345075&r2=1345076&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java (original)
+++ jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java Fri Jun 1 11:39:43 2012
@@ -18,6 +18,7 @@
package com.hp.hpl.jena.sdb.test.modify;
+import junit.framework.JUnit4TestAdapter ;
import junit.framework.TestSuite;
import com.hp.hpl.jena.sdb.SDBFactory;
@@ -28,9 +29,9 @@ import com.hp.hpl.jena.update.GraphStore
public class TestSPARQLUpdate extends TestUpdateGraph
{
- public static junit.framework.Test suite() {
+ public static junit.framework.TestSuite suite() {
TestSuite ts = new TestSuite();
- ts.addTestSuite(TestSPARQLUpdate.class);
+ ts.addTest(new JUnit4TestAdapter(TestSPARQLUpdate.class));
return ts;
}
Modified: jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java?rev=1345076&r1=1345075&r2=1345076&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java (original)
+++ jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java Fri Jun 1 11:39:43 2012
@@ -18,6 +18,7 @@
package com.hp.hpl.jena.sdb.test.modify;
+import junit.framework.JUnit4TestAdapter ;
import junit.framework.TestSuite ;
import com.hp.hpl.jena.sdb.SDBFactory ;
@@ -29,9 +30,9 @@ import com.hp.hpl.jena.update.GraphStore
public class TestSPARQLUpdateMgt extends TestUpdateGraphMgt
{
- public static junit.framework.Test suite() {
+ public static TestSuite suite() {
TestSuite ts = new TestSuite();
- ts.addTestSuite(TestSPARQLUpdateMgt.class);
+ ts.addTest(new JUnit4TestAdapter(TestSPARQLUpdateMgt.class));
return ts;
}
Modified: jena/trunk/jena-sdb/src-test/sdb/sdbtest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src-test/sdb/sdbtest.java?rev=1345076&r1=1345075&r2=1345076&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src-test/sdb/sdbtest.java (original)
+++ jena/trunk/jena-sdb/src-test/sdb/sdbtest.java Fri Jun 1 11:39:43 2012
@@ -115,24 +115,24 @@ public class sdbtest extends CmdArgsDB
static void execOneManifestEarl(String testManifest)
{
// Include information later.
- EarlReport report = new EarlReport("SDB", SDB.VERSION, "http://jena.sf.net/SDB") ;
+ EarlReport report = new EarlReport("http://jena.apache.org/#sdb", "SDB", SDB.VERSION, "http://jena.apahe.org/") ;
ScriptTestSuiteFactory.results = report ;
Model model = report.getModel() ;
// Update the EARL report.
Resource jena = model.createResource()
- .addProperty(FOAF.homepage, model.createResource("http://jena.sf.net/")) ;
+ .addProperty(FOAF.homepage, model.createResource("http://jena.apahe.org/")) ;
// SDB is part of Jena.
Resource arq = report.getSystem()
.addProperty(DCTerms.isPartOf, jena) ;
// Andy wrote the test software (updates the thing being tested as well as they are the same).
- Resource who = report.getModel().createResource(FOAF.Person)
- .addProperty(FOAF.name, "Andy Seaborne")
- .addProperty(FOAF.homepage,
- model.createResource("http://www.hpl.hp.com/people/afs")) ;
+ Resource who = model.createResource(FOAF.Person)
+ .addProperty(FOAF.name, "Andy Seaborne")
+ .addProperty(FOAF.homepage,
+ model.createResource("http://people.apache.org/~andy")) ;
Resource reporter = report.getReporter() ;
reporter.addProperty(DC.creator, who) ;
Modified: jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/graph/GraphQueryHandlerSDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/graph/GraphQueryHandlerSDB.java?rev=1345076&r1=1345075&r2=1345076&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/graph/GraphQueryHandlerSDB.java (original)
+++ jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/graph/GraphQueryHandlerSDB.java Fri Jun 1 11:39:43 2012
@@ -28,11 +28,7 @@ import org.openjena.atlas.iterator.Trans
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.query.BindingQueryPlan ;
-import com.hp.hpl.jena.graph.query.Domain ;
-import com.hp.hpl.jena.graph.query.Query ;
-import com.hp.hpl.jena.graph.query.SimpleQueryHandler ;
-import com.hp.hpl.jena.graph.query.TreeQueryPlan ;
+import com.hp.hpl.jena.graph.query.* ;
import com.hp.hpl.jena.sdb.engine.QueryEngineSDB ;
import com.hp.hpl.jena.sdb.shared.SDBNotImplemented ;
import com.hp.hpl.jena.sdb.store.DatasetStoreGraph ;
@@ -70,7 +66,7 @@ public class GraphQueryHandlerSDB extend
}
@Override
- public BindingQueryPlan prepareBindings( Query q, Node [] variables )
+ public BindingQueryPlan prepareBindings( GraphQuery q, Node [] variables )
{
this.variables = variables ;
this.indexes = new HashMap<Node, Integer>() ;
Modified: jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java?rev=1345076&r1=1345075&r2=1345076&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java (original)
+++ jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java Fri Jun 1 11:39:43 2012
@@ -36,6 +36,7 @@ import com.hp.hpl.jena.sparql.core.Datas
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.update.GraphStore ;
+import com.hp.hpl.jena.update.UpdateRequest ;
public class DatasetStoreGraph extends DatasetGraphCaching
implements DatasetGraph, Closeable, GraphStore
@@ -66,15 +67,24 @@ public class DatasetStoreGraph extends D
}
//---- Update
- @Override
+ @Override @Deprecated
public void startRequest()
{}
- @Override
+ @Override @Deprecated
public void finishRequest()
{}
@Override
+ public void startRequest(UpdateRequest request)
+ {}
+
+ @Override
+ public void finishRequest(UpdateRequest request)
+ {}
+
+
+ @Override
public Dataset toDataset()
{ return DatasetFactory.create(this) ; }
Added: jena/trunk/jena-sdb/testing/Update/bad-1.ru
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/testing/Update/bad-1.ru?rev=1345076&view=auto
==============================================================================
--- jena/trunk/jena-sdb/testing/Update/bad-1.ru (added)
+++ jena/trunk/jena-sdb/testing/Update/bad-1.ru Fri Jun 1 11:39:43 2012
@@ -0,0 +1,5 @@
+BASE <http://example/>
+
+INSERT DATA { "s" <p> <o>
+ GRAPH <g> { "S" <P> <O> . <X> <Y> <Z> }
+ } ;
Added: jena/trunk/jena-sdb/testing/Update/bad-2.ru
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/testing/Update/bad-2.ru?rev=1345076&view=auto
==============================================================================
--- jena/trunk/jena-sdb/testing/Update/bad-2.ru (added)
+++ jena/trunk/jena-sdb/testing/Update/bad-2.ru Fri Jun 1 11:39:43 2012
@@ -0,0 +1,8 @@
+BASE <http://example/>
+
+INSERT { ?o <p> <s> .
+ <s> <p> ?o
+}
+WHERE
+{ BIND("object" AS ?o) }
+
Added: jena/trunk/jena-sdb/testing/Update/bad-3.ru
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/testing/Update/bad-3.ru?rev=1345076&view=auto
==============================================================================
--- jena/trunk/jena-sdb/testing/Update/bad-3.ru (added)
+++ jena/trunk/jena-sdb/testing/Update/bad-3.ru Fri Jun 1 11:39:43 2012
@@ -0,0 +1,4 @@
+BASE <http://example/>
+
+INSERT { GRAPH ?g { <s> <p> <o> . <s> <p> "obj" } } WHERE { BIND("g" AS ?g) }
+