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 2018/05/12 16:15:10 UTC
[4/9] jena git commit: Removed old code
Removed old code
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/11686e75
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/11686e75
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/11686e75
Branch: refs/heads/master
Commit: 11686e75285fb2857bf226ea8d8a23b4b99cf7a4
Parents: 1bcf8f4
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 7 20:18:46 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 12 01:44:48 2018 +0100
----------------------------------------------------------------------
.../jena/sparql/engine/QueryEngineBase.java | 7 +-
.../sparql/core/AbstractTestDynamicDataset.java | 221 +------------------
.../apache/jena/tdb2/solver/QueryEngineTDB.java | 29 ---
.../apache/jena/tdb/solver/QueryEngineTDB.java | 28 ---
4 files changed, 9 insertions(+), 276 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/11686e75/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineBase.java
index 147a999..fdba0e0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineBase.java
@@ -150,9 +150,10 @@ public abstract class QueryEngineBase implements OpEval, Closeable
return DynamicDatasets.dynamicDataset(dsDesc, dataset, unionDftGraph) ;
}
- /** Retrun whether the dataset to execute against is the original one,
- * or a DatasetDescription modified one
- * (or a built one for provided dataset being null.
+ /**
+ * Return whether the dataset to execute against is the original one, or a
+ * DatasetDescription modified one (including one for provided then the dataset was
+ * null).
*/
protected boolean isDynamicDataset() {
return originalDataset != dataset;
http://git-wip-us.apache.org/repos/asf/jena/blob/11686e75/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java
index 4713055..fcf5fbe 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDynamicDataset.java
@@ -31,12 +31,8 @@ public abstract class AbstractTestDynamicDataset extends BaseTest
{
protected abstract Dataset createDataset() ;
protected abstract void releaseDataset(Dataset ds) ;
- Dataset dataset ;
+ protected Dataset dataset ;
- @After public void after() {
- releaseDataset(dataset) ;
- }
-
@Before public void before()
{
dataset = createDataset() ;
@@ -53,6 +49,10 @@ public abstract class AbstractTestDynamicDataset extends BaseTest
m.getGraph().add(t3) ;
}
+ @After public void after() {
+ releaseDataset(dataset) ;
+ }
+
private static void addGraph(Dataset dataset, int i)
{
// Not a very interesting model
@@ -119,218 +119,7 @@ public abstract class AbstractTestDynamicDataset extends BaseTest
"{ GRAPH ?g { }}",
2, dataset) ;
}
-//
-//
-// // If context.isTrue(TDB.symUnionDefaultGraph)
-//
-// protected abstract void startDynamicAndUnionTest() ; // TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ;
-// protected abstract void finishDynamicAndUnionTest() ; // TDB.getContext().unset(TDB.symUnionDefaultGraph) ;
-//
-// @Test public void dynamicAndUnion1() {
-// try {
-// startDynamicAndUnionTest() ;
-// testCount("SELECT * "+
-// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
-// "{ GRAPH ?g { ?s <uri:q> ?o }}",
-// 2, dataset) ;
-// } finally { finishDynamicAndUnionTest() ; }
-// }
-//
-// @Test public void dynamicAndUnion2() {
-// try { startDynamicAndUnionTest() ;
-// testCount("SELECT * "+
-// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
-// "{ ?s <uri:q> ?o }", // Same in each graph
-// 1, dataset) ;
-// } finally { finishDynamicAndUnionTest() ; }
-// }
-//
-// @Test public void dynamicAndUnion3() {
-// try { startDynamicAndUnionTest() ;
-// testCount("SELECT * "+
-// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
-// "{ ?s <uri:p> ?o }", // Different in each graph
-// 2, dataset) ;
-// } finally { finishDynamicAndUnionTest() ; }
-// }
-//
-// @Test public void dynamicAndUnion4() {
-// try { startDynamicAndUnionTest() ;
-// testCount("SELECT * "+
-// "FROM <graph:1> FROM <graph:2>"+
-// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
-// "{ ?s <uri:p> ?o }",
-// 2, dataset) ; // Only see <graph:1> and <graph:2> as default graph.
-// } finally { finishDynamicAndUnionTest() ; }
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion5() {
-// testCount("SELECT * "+
-// "FROM <graph:1>"+
-// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
-// "{ GRAPH <urn:x-arq:DefaultGraph> { ?s <uri:p> ?o } }", // Different in each graph
-// 1, dataset) ;
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion6() {
-// try {
-// startDynamicAndUnionTest() ;
-// testCount("SELECT * "+
-// "FROM <graph:1>"+
-// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
-// "{ GRAPH <urn:x-arq:DefaultGraph> { ?s <uri:p> ?o } }",
-// 1, dataset) ;
-// } finally { finishDynamicAndUnionTest() ; }
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion7() {
-// testCount("SELECT * "+
-// "FROM <graph:1>"+
-// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
-// "{ GRAPH <urn:x-arq:UnionGraph> { ?s <uri:p> ?o } }",
-// 2, dataset) ;
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion8() {
-// try {
-// startDynamicAndUnionTest() ;
-// testCount("SELECT * "+
-// "FROM <graph:1>"+
-// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
-// "{ GRAPH <urn:x-arq:UnionGraph> { ?s <uri:p> ?o } }",
-// 2, dataset) ;
-// } finally { finishDynamicAndUnionTest() ; }
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion10() {
-// testCount("SELECT * "+
-// "FROM <urn:x-arq:DefaultGraph>" +
-// "{ ?s ?p ?o }",
-// 3, dataset) ;
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion10a() {
-// testCount("SELECT * "+
-// "FROM <urn:x-arq:DefaultGraph>" +
-// "{ GRAPH ?g { ?s ?p ?o } }",
-// 0, dataset) ;
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion11() {
-// testCount("SELECT * "+
-// "FROM <urn:x-arq:UnionGraph>" +
-// "{ ?s ?p ?o }",
-// 6, dataset) ;
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion11a() {
-// testCount("SELECT * "+
-// "FROM <urn:x-arq:UnionGraph>" +
-// "{ GRAPH ?g { ?s ?p ?o } }",
-// 0, dataset) ;
-// }
-//
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion12() {
-// testCount("SELECT * "+
-// "FROM <urn:x-arq:DefaultGraph>" +
-// "FROM <urn:x-arq:UnionGraph>" +
-// "{ ?s ?p ?o }",
-// 7, dataset) ;
-// }
-//
-// //@Ignore("Test of dynamic datasets with named default or union graph")
-// @Test public void dynamicAndUnion12a() {
-// testCount("SELECT * "+
-// "FROM <urn:x-arq:DefaultGraph>" +
-// "FROM <urn:x-arq:UnionGraph>" +
-// "{ GRAPH ?g { ?s ?p ?o } }",
-// 0, dataset) ;
-// }
-// @Test public void dynamic99() {
-// // Check we did not mess with the global context in getting previous tests to pass.
-// testCount("SELECT * FROM NAMED <graph:3> { ?s ?p ?o }", 0, dataset) ;
-// }
-//
-// // Tests of patterns and paths across graphs.
-//
-// private static String dataStr = StrUtils.strjoinNL(
-// "(dataset" ,
-// " (graph" ,
-// " (triple <http://example/s> <http://example/p> 'dft')" ,
-// " (triple <http://example/s> <http://example/p> <http://example/x>)" ,
-// " (triple <http://example/x> <http://example/p> <http://example/o>)" ,
-// " )" ,
-// " (graph <http://example/g1>",
-// " (triple <http://example/s> <http://example/p> 'g1')",
-// " (triple <http://example/s> <http://example/p1> <http://example/x>)",
-// " (triple <http://example/x> <http://example/p2> <http://example/o>)",
-// " )",
-// " (graph <http://example/g2>",
-// " (triple <http://example/s> <http://example/p> 'g2')",
-// " (triple <http://example/x> <http://example/p1> <http://example/z>)",
-// " (triple <http://example/x> <http://example/p2> <http://example/o>)",
-// " (triple <http://example/x> <http://example/p2> <http://example/o2>)",
-// " )",
-// " (graph <http://example/g3>",
-// " (triple <http://example/s> <http://example/p> 'g3')",
-// " (triple <http://example/s> <http://example/p1> <http://example/y>)",
-// " ))") ;
-//
-// private static Dataset dataset2 = TDBFactory.createDataset() ;
-// static {
-// Item item = SSE.parse(dataStr) ;
-// DatasetGraph dsg = BuilderGraph.buildDataset(item) ;
-//
-// Iterator<Quad> iter = dsg.find() ;
-// for ( ; iter.hasNext(); )
-// dataset2.asDatasetGraph().add(iter.next()) ;
-// }
-// private static Node gn1 = SSE.parseNode("<http://example/g1>") ;
-// private static Node gn2 = SSE.parseNode("<http://example/g2>") ;
-// private static Node gn3 = SSE.parseNode("<http://example/g3>") ;
-// private static Node gn9 = SSE.parseNode("<http://example/g9>") ;
-//
-// private static final String prefix = "PREFIX : <http://example/> " ;
-//
-// // g1+g2 { ?s :p1 ?x . ?x :p2 ?o } ==> 1
-// // g1+g2 { ?s :p1* ?o } ==> 1
-//
-// @Test public void pattern_01()
-// {
-// testCount(prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1 ?x . ?x :p2 ?o }", 2, dataset2) ;
-// }
-//
-// @Test public void pattern_02()
-// {
-// String qs = prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1+ ?x }" ;
-//// Query query = QueryFactory.create(qs) ;
-//// Dataset ds = DatasetFactory.create(DynamicDatasets.dynamicDataset(query, dataset2.asDatasetGraph())) ;
-//// QueryExecution qExec = QueryExecutionFactory.create(query, ds) ;
-//// ResultSetFormatter.out(qExec.execSelect()) ;
-// testCount(qs, 3, dataset2) ;
-// }
-//
-// @Test public void pattern_03()
-// {
-// // Do it externally to the TDB query engine.
-// String qs = prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1+ ?x }" ;
-// Query query = QueryFactory.create(qs) ;
-// DatasetDescription dsDesc = DatasetDescription.create(query) ;
-// Dataset ds = DynamicDatasets.dynamicDataset(dsDesc, dataset2, false) ;
-// testCount(qs, 3, ds) ;
-// }
-
private static void testCount(String queryString, int expected, Dataset ds)
{
Query query = QueryFactory.create(queryString) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/11686e75/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/QueryEngineTDB.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/QueryEngineTDB.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/QueryEngineTDB.java
index 388c81f..ee6b244 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/QueryEngineTDB.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/QueryEngineTDB.java
@@ -76,7 +76,6 @@ public class QueryEngineTDB extends QueryEngineMain
boolean union = unionDftGraph || isUnionDefaultGraph(context);
return DynamicDatasets.dynamicDataset(dsDesc, dataset, union ) ;
}
-
// Choose the algebra-level optimizations to invoke.
@Override
@@ -175,32 +174,4 @@ public class QueryEngineTDB extends QueryEngineMain
return engine.getPlan() ;
}
}
-
-// // By rewrite, not using a general purpose dataset with the right graphs in.
-// private static Op dynamicDatasetOp(Op op, Context context)
-// {
-// Transform transform = null ;
-//
-// try {
-// @SuppressWarnings("unchecked")
-// Set<Node> defaultGraphs = (Set<Node>)(context.get(SystemTDB.symDatasetDefaultGraphs)) ;
-// @SuppressWarnings("unchecked")
-// Set<Node> namedGraphs = (Set<Node>)(context.get(SystemTDB.symDatasetNamedGraphs)) ;
-// if ( defaultGraphs != null || namedGraphs != null )
-// transform = new TransformDynamicDataset(defaultGraphs,
-// namedGraphs,
-// context.isTrue(TDB.symUnionDefaultGraph)) ;
-// } catch (ClassCastException ex)
-// {
-// Log.warn(QueryEngineTDB.class, "Bad dynamic dataset description (ClassCastException)", ex) ;
-// transform = null ;
-// return op ;
-// }
-//
-// // Apply dynamic dataset modifications.
-// if ( transform != null )
-// op = Transformer.transform(transform, op) ;
-// return op ;
-// }
-//
}
http://git-wip-us.apache.org/repos/asf/jena/blob/11686e75/jena-tdb/src/main/java/org/apache/jena/tdb/solver/QueryEngineTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/QueryEngineTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/QueryEngineTDB.java
index 85247fa..9a0b038 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/QueryEngineTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/QueryEngineTDB.java
@@ -172,32 +172,4 @@ public class QueryEngineTDB extends QueryEngineMain
return engine.getPlan() ;
}
}
-
-// // By rewrite, not using a general purpose dataset with the right graphs in.
-// private static Op dynamicDatasetOp(Op op, Context context)
-// {
-// Transform transform = null ;
-//
-// try {
-// @SuppressWarnings("unchecked")
-// Set<Node> defaultGraphs = (Set<Node>)(context.get(SystemTDB.symDatasetDefaultGraphs)) ;
-// @SuppressWarnings("unchecked")
-// Set<Node> namedGraphs = (Set<Node>)(context.get(SystemTDB.symDatasetNamedGraphs)) ;
-// if ( defaultGraphs != null || namedGraphs != null )
-// transform = new TransformDynamicDataset(defaultGraphs,
-// namedGraphs,
-// context.isTrue(TDB.symUnionDefaultGraph)) ;
-// } catch (ClassCastException ex)
-// {
-// Log.warn(QueryEngineTDB.class, "Bad dynamic dataset description (ClassCastException)", ex) ;
-// transform = null ;
-// return op ;
-// }
-//
-// // Apply dynamic dataset modifications.
-// if ( transform != null )
-// op = Transformer.transform(transform, op) ;
-// return op ;
-// }
-//
}