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 2014/07/03 15:37:42 UTC
svn commit: r1607644 - in /jena/trunk/jena-sdb/src:
main/java/com/hp/hpl/jena/sdb/ main/java/com/hp/hpl/jena/sdb/engine/
main/java/com/hp/hpl/jena/sdb/graph/ main/java/com/hp/hpl/jena/sdb/modify/
main/java/com/hp/hpl/jena/sdb/store/ test/java/com/hp/hp...
Author: andy
Date: Thu Jul 3 13:37:41 2014
New Revision: 1607644
URL: http://svn.apache.org/r1607644
Log:
Consistent naming for DatasetGraphSDB
Added:
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetGraphSDB.java
- copied, changed from r1607643, jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java
Removed:
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java
Modified:
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDBFactory.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java
jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStore.java
jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/misc/TestAssembler.java
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDBFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDBFactory.java?rev=1607644&r1=1607643&r2=1607644&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDBFactory.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/SDBFactory.java Thu Jul 3 13:37:41 2014
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.sdb.sql.SDBConnec
import com.hp.hpl.jena.sdb.sql.SDBConnectionDesc;
import com.hp.hpl.jena.sdb.sql.SDBConnectionFactory;
import com.hp.hpl.jena.sdb.store.DatasetStore;
-import com.hp.hpl.jena.sdb.store.DatasetStoreGraph;
+import com.hp.hpl.jena.sdb.store.DatasetGraphSDB;
import com.hp.hpl.jena.sdb.store.StoreFactory;
import com.hp.hpl.jena.update.GraphStore;
@@ -191,7 +191,7 @@ public class SDBFactory
*/
public static GraphStore connectGraphStore(Store store)
{
- return new DatasetStoreGraph(store, SDB.getContext().copy()) ;
+ return new DatasetGraphSDB(store, SDB.getContext().copy()) ;
}
/**
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java?rev=1607644&r1=1607643&r2=1607644&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java Thu Jul 3 13:37:41 2014
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.sdb.Store;
import com.hp.hpl.jena.sdb.compiler.SDBCompile;
import com.hp.hpl.jena.sdb.compiler.OpSQL;
import com.hp.hpl.jena.sdb.core.SDBRequest;
-import com.hp.hpl.jena.sdb.store.DatasetStoreGraph;
+import com.hp.hpl.jena.sdb.store.DatasetGraphSDB;
import com.hp.hpl.jena.sparql.ARQConstants ;
import com.hp.hpl.jena.sparql.algebra.Algebra;
import com.hp.hpl.jena.sparql.algebra.Op;
@@ -61,16 +61,16 @@ public class QueryEngineSDB extends Quer
public QueryEngineSDB(Store store, Query q)
{
- this(new DatasetStoreGraph(store, SDB.getContext().copy()), q, BindingRoot.create(), SDB.getContext().copy()) ;
+ this(new DatasetGraphSDB(store, SDB.getContext().copy()), q, BindingRoot.create(), SDB.getContext().copy()) ;
}
- public QueryEngineSDB(DatasetStoreGraph dsg, Query query, Binding initialBinding, Context context)
+ public QueryEngineSDB(DatasetGraphSDB dsg, Query query, Binding initialBinding, Context context)
{
super(query, dsg, initialBinding, context) ;
init(dsg, query, initialBinding, context) ;
}
- public QueryEngineSDB(DatasetStoreGraph dsg, Op op, Binding initialBinding, Context context)
+ public QueryEngineSDB(DatasetGraphSDB dsg, Op op, Binding initialBinding, Context context)
{
super(op, dsg, initialBinding, context) ;
init(dsg, null, initialBinding, context) ;
@@ -82,7 +82,7 @@ public class QueryEngineSDB extends Quer
// return op ;
// }
- private void init(DatasetStoreGraph dsg, Query query, Binding initialBinding, Context context)
+ private void init(DatasetGraphSDB dsg, Query query, Binding initialBinding, Context context)
{
if ( context == null )
context = ARQ.getContext().copy() ;
@@ -169,7 +169,7 @@ public class QueryEngineSDB extends Quer
@Override
public boolean accept(Query query, DatasetGraph dataset, Context context)
{
- if ( dataset instanceof DatasetStoreGraph )
+ if ( dataset instanceof DatasetGraphSDB )
return true ;
return false ;
}
@@ -177,14 +177,14 @@ public class QueryEngineSDB extends Quer
@Override
public Plan create(Query query, DatasetGraph dataset, Binding inputBinding, Context context)
{
- QueryEngineSDB qe = new QueryEngineSDB((DatasetStoreGraph)dataset , query, inputBinding, context) ;
+ QueryEngineSDB qe = new QueryEngineSDB((DatasetGraphSDB)dataset , query, inputBinding, context) ;
return qe.getPlan() ;
}
@Override
public boolean accept(Op op, DatasetGraph dataset, Context context)
{
- if ( dataset instanceof DatasetStoreGraph )
+ if ( dataset instanceof DatasetGraphSDB )
return true ;
return false ;
}
@@ -194,7 +194,7 @@ public class QueryEngineSDB extends Quer
{
if ( inputBinding == null )
inputBinding = BindingRoot.create();
- QueryEngineSDB qe = new QueryEngineSDB((DatasetStoreGraph)dataset, op, inputBinding, context) ;
+ QueryEngineSDB qe = new QueryEngineSDB((DatasetGraphSDB)dataset, op, inputBinding, context) ;
return qe.getPlan() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java?rev=1607644&r1=1607643&r2=1607644&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java Thu Jul 3 13:37:41 2014
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.sdb.Store ;
import com.hp.hpl.jena.sdb.core.SDBRequest ;
import com.hp.hpl.jena.sdb.engine.QueryEngineSDB ;
import com.hp.hpl.jena.sdb.sql.SDBConnection ;
-import com.hp.hpl.jena.sdb.store.DatasetStoreGraph ;
+import com.hp.hpl.jena.sdb.store.DatasetGraphSDB ;
import com.hp.hpl.jena.sdb.store.StoreLoader ;
import com.hp.hpl.jena.sdb.store.StoreLoaderPlus ;
import com.hp.hpl.jena.shared.PrefixMapping ;
@@ -60,7 +60,7 @@ public class GraphSDB extends GraphBase
protected int inBulkUpdate = 0 ;
protected Node graphNode = Quad.defaultGraphNodeGenerated ;
- protected DatasetStoreGraph datasetStore = null ;
+ protected DatasetGraphSDB datasetStore = null ;
public GraphSDB(Store store, String uri)
{
@@ -82,7 +82,7 @@ public class GraphSDB extends GraphBase
this.graphNode = graphNode ;
// Avoid looping here : DatasetStoreGraph can make GraphSDB's
- datasetStore = new DatasetStoreGraph(store, this, SDB.getContext().copy()) ;
+ datasetStore = new DatasetGraphSDB(store, this, SDB.getContext().copy()) ;
//readPrefixMapping() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java?rev=1607644&r1=1607643&r2=1607644&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/modify/UpdateEngineSDB.java Thu Jul 3 13:37:41 2014
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.sdb.modify;
-import com.hp.hpl.jena.sdb.store.DatasetStoreGraph ;
+import com.hp.hpl.jena.sdb.store.DatasetGraphSDB ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.modify.UpdateEngine ;
import com.hp.hpl.jena.sparql.modify.UpdateEngineFactory ;
@@ -31,7 +31,7 @@ public class UpdateEngineSDB extends Upd
{
// More of a placeholder currently.
- public UpdateEngineSDB(DatasetStoreGraph graphStore, Binding inputBinding, Context context)
+ public UpdateEngineSDB(DatasetGraphSDB graphStore, Binding inputBinding, Context context)
{ super(graphStore, inputBinding, context) ; }
@@ -42,13 +42,13 @@ public class UpdateEngineSDB extends Upd
@Override
public boolean accept(GraphStore graphStore, Context context)
{
- return (graphStore instanceof DatasetStoreGraph) ;
+ return (graphStore instanceof DatasetGraphSDB) ;
}
@Override
public UpdateEngine create(GraphStore graphStore, Binding inputBinding, Context context)
{
- return new UpdateEngineSDB((DatasetStoreGraph)graphStore, inputBinding, context);
+ return new UpdateEngineSDB((DatasetGraphSDB)graphStore, inputBinding, context);
}
} ;
}
Copied: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetGraphSDB.java (from r1607643, jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetGraphSDB.java?p2=jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetGraphSDB.java&p1=jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java&r1=1607643&r2=1607644&rev=1607644&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetGraphSDB.java Thu Jul 3 13:37:41 2014
@@ -37,19 +37,19 @@ import com.hp.hpl.jena.sparql.core.Quad
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.update.GraphStore ;
-public class DatasetStoreGraph extends DatasetGraphCaching
+public class DatasetGraphSDB extends DatasetGraphCaching
implements DatasetGraph, Closeable, GraphStore
{
private final Store store ;
private Lock lock = new LockMRSW() ;
private final Context context ;
- public DatasetStoreGraph(Store store, Context context)
+ public DatasetGraphSDB(Store store, Context context)
{
this(store, null, context) ;
}
- public DatasetStoreGraph(Store store, GraphSDB graph, Context context)
+ public DatasetGraphSDB(Store store, GraphSDB graph, Context context)
{
this.store = store ;
// Force the "default" graph
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStore.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStore.java?rev=1607644&r1=1607643&r2=1607644&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStore.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/store/DatasetStore.java Thu Jul 3 13:37:41 2014
@@ -39,8 +39,8 @@ public class DatasetStore
return createDatasetStoreGraph(store) ;
}
- public static DatasetStoreGraph createDatasetStoreGraph(Store store)
+ public static DatasetGraphSDB createDatasetStoreGraph(Store store)
{
- return new DatasetStoreGraph(store, SDB.getContext().copy()) ;
+ return new DatasetGraphSDB(store, SDB.getContext().copy()) ;
}
}
Modified: jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/misc/TestAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/misc/TestAssembler.java?rev=1607644&r1=1607643&r2=1607644&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/misc/TestAssembler.java (original)
+++ jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/misc/TestAssembler.java Thu Jul 3 13:37:41 2014
@@ -36,7 +36,7 @@ import com.hp.hpl.jena.rdf.model.Resourc
import com.hp.hpl.jena.sdb.SDBFactory ;
import com.hp.hpl.jena.sdb.Store ;
import com.hp.hpl.jena.sdb.StoreDesc ;
-import com.hp.hpl.jena.sdb.store.DatasetStoreGraph ;
+import com.hp.hpl.jena.sdb.store.DatasetGraphSDB ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.util.FileManager ;
@@ -51,7 +51,7 @@ public class TestAssembler
assertNotNull(ds) ;
// Check it will be dispatched to SDB
DatasetGraph dsg = ds.asDatasetGraph() ;
- assertTrue( dsg instanceof DatasetStoreGraph ) ;
+ assertTrue( dsg instanceof DatasetGraphSDB ) ;
}
@Test public void connection_1()
@@ -88,7 +88,7 @@ public class TestAssembler
{
// Create a store and format
Dataset ds = DatasetFactory.assemble(assem) ;
- Store store = ((DatasetStoreGraph)ds.asDatasetGraph()).getStore() ;
+ Store store = ((DatasetGraphSDB)ds.asDatasetGraph()).getStore() ;
store.getTableFormatter().create() ;
return store ;
}