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 2013/10/14 17:06:41 UTC
svn commit: r1531935 - in /jena/trunk/jena-tdb/src:
main/java/com/hp/hpl/jena/tdb/ main/java/com/hp/hpl/jena/tdb/setup/
main/java/com/hp/hpl/jena/tdb/solver/
main/java/com/hp/hpl/jena/tdb/transaction/ test/java/com/hp/hpl/jena/tdb/
test/java/com/hp/hpl...
Author: andy
Date: Mon Oct 14 15:06:40 2013
New Revision: 1531935
URL: http://svn.apache.org/r1531935
Log:
Remove need to set OpExecutorFactory for TDB globally.
Added:
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_TransactionTDB.java
- copied, changed from r1531810, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java
Removed:
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/OpExecutorTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java?rev=1531935&r1=1531934&r2=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java Mon Oct 14 15:06:40 2013
@@ -212,8 +212,8 @@ public class StoreConnection
public static synchronized StoreConnection make(Location location)
{
StoreConnection sConn = cache.get(location) ;
- if (sConn != null) return sConn ;
-
+ if (sConn != null)
+ return sConn ;
DatasetGraphTDB dsg = DatasetBuilderStd.build(location) ;
sConn = _makeAndCache(dsg) ;
return sConn ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1531935&r1=1531934&r2=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java Mon Oct 14 15:06:40 2013
@@ -35,7 +35,6 @@ import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.assembler.AssemblerUtils ;
-import com.hp.hpl.jena.sparql.engine.main.QC ;
import com.hp.hpl.jena.sparql.engine.main.StageBuilder ;
import com.hp.hpl.jena.sparql.engine.main.StageGenerator ;
import com.hp.hpl.jena.sparql.lib.Metadata ;
@@ -47,7 +46,6 @@ import com.hp.hpl.jena.sparql.util.Symbo
import com.hp.hpl.jena.tdb.assembler.AssemblerTDB ;
import com.hp.hpl.jena.tdb.modify.UpdateEngineTDB ;
import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
-import com.hp.hpl.jena.tdb.solver.OpExecutorTDB ;
import com.hp.hpl.jena.tdb.solver.QueryEngineTDB ;
import com.hp.hpl.jena.tdb.solver.StageGeneratorDirectTDB ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
@@ -153,8 +151,6 @@ public class TDB
return ;
}
- // ARQ 2.7.1 and later - replace with SystemARQ.sync()
-
// May be a general purpose dataset with TDB objects in it.
sync(dataset.getDefaultGraph()) ;
Iterator<Node> iter = dataset.listGraphNodes() ;
@@ -203,16 +199,6 @@ public class TDB
wireIntoExecution() ;
- // This does not work with the conncurrency policy
- // Instead, assume all open files (direct and memory mapped) are sync'ed by the OS.
-// // Attempt to sync everything on exit.
-// // This can not be guaranteed.
-// Runnable runnable = new Runnable() {
-// public void run()
-// { try { TDBMaker.syncDatasetCache() ; } catch (Exception ex) {} }
-// } ;
-// Runtime.getRuntime().addShutdownHook(new Thread(runnable)) ;
-
if ( log.isDebugEnabled() )
log.debug("\n"+ARQ.getContext()) ;
}
@@ -232,8 +218,8 @@ public class TDB
// Wire in the new OpExecutor.
// This is normal way to execute with a general dataset or a
- // model that is TDB-backed.
- QC.setFactory(ARQ.getContext(), OpExecutorTDB.OpExecFactoryTDB) ;
+ // model that is TDB-backed. (Is it?)
+ //QC.setFactory(ARQ.getContext(), OpExecutorTDB.OpExecFactoryTDB) ;
}
// ---- Static constants read by modVersion
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java?rev=1531935&r1=1531934&r2=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java Mon Oct 14 15:06:40 2013
@@ -26,6 +26,7 @@ import org.apache.jena.atlas.lib.StrUtil
import org.slf4j.Logger ;
import com.hp.hpl.jena.query.ARQ ;
+import com.hp.hpl.jena.sparql.engine.main.QC ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderLib ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
import com.hp.hpl.jena.sparql.sse.SSEParseException ;
@@ -37,6 +38,7 @@ import com.hp.hpl.jena.tdb.base.file.Fil
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.index.TupleIndex ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.solver.OpExecutorTDB ;
import com.hp.hpl.jena.tdb.store.* ;
import com.hp.hpl.jena.tdb.sys.* ;
@@ -148,6 +150,7 @@ public class DatasetBuilderStd implement
StorageConfig storageConfig = new StorageConfig(location, params, readonly, blockMgrs, bufferChannels, nodeTables) ;
DatasetGraphTDB dsg = new DatasetGraphTDB(tripleTable, quadTable, prefixes, transform, storageConfig) ;
+ QC.setFactory(dsg.getContext(), OpExecutorTDB.OpExecFactoryTDB) ;
return dsg ;
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/OpExecutorTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/OpExecutorTDB.java?rev=1531935&r1=1531934&r2=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/OpExecutorTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/OpExecutorTDB.java Mon Oct 14 15:06:40 2013
@@ -94,7 +94,6 @@ public class OpExecutorTDB extends OpExe
{
return super.execute(opReduced, input) ;
}
-
@Override
protected QueryIterator execute(OpFilter opFilter, QueryIterator input)
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java?rev=1531935&r1=1531934&r2=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java Mon Oct 14 15:06:40 2013
@@ -31,6 +31,7 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.QueryCancelledException ;
import com.hp.hpl.jena.sparql.core.BasicPattern ;
+import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
import com.hp.hpl.jena.sparql.engine.QueryIterator ;
@@ -91,6 +92,11 @@ public class SolverLib
QueryIterator input, Filter<Tuple<NodeId>> filter,
ExecutionContext execCxt)
{
+ if ( Quad.isUnionGraph(graphNode) )
+ graphNode = Node.ANY ;
+ if ( Quad.isDefaultGraph(graphNode) )
+ graphNode = null ;
+
List<Triple> triples = pattern.getList() ;
boolean anyGraph = (graphNode==null ? false : (Node.ANY.equals(graphNode))) ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java?rev=1531935&r1=1531934&r2=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTxn.java Mon Oct 14 15:06:40 2013
@@ -49,6 +49,10 @@ public class DatasetGraphTxn extends Dat
transaction.abort() ;
}
+ // Context copied in DatasetBuilderTxn.build.
+// @Override
+// public Context getContext() { ... }
+
@Override
public String toString()
{ return "Txn:"+super.toString() ; }
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java?rev=1531935&r1=1531934&r2=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java Mon Oct 14 15:06:40 2013
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.tdb.solver.TS_Sol
import com.hp.hpl.jena.tdb.store.TS_Store ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
import com.hp.hpl.jena.tdb.sys.TS_Sys ;
-import com.hp.hpl.jena.tdb.transaction.TS_Transaction ;
+import com.hp.hpl.jena.tdb.transaction.TS_TransactionTDB ;
// Naming conventions.
// TS_* - Test sets: collections of testing files (Often Test*)
@@ -58,7 +58,7 @@ import com.hp.hpl.jena.tdb.transaction.T
, TS_Factory.class
, TS_TDBAssembler.class
, TS_Jena.class
- , TS_Transaction.class
+ , TS_TransactionTDB.class
, TS_ObjectFile.class
} )
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java?rev=1531935&r1=1531934&r2=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java Mon Oct 14 15:06:40 2013
@@ -36,7 +36,6 @@ public class AbstractTestGraphsTDB exten
@BeforeClass public static void setupClass()
{
-
reorder = SystemTDB.defaultOptimizer ;
SystemTDB.defaultOptimizer = ReorderLib.identity() ;
}
Copied: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_TransactionTDB.java (from r1531810, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_TransactionTDB.java?p2=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_TransactionTDB.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java&r1=1531810&r2=1531935&rev=1531935&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_TransactionTDB.java Mon Oct 14 15:06:40 2013
@@ -40,7 +40,7 @@ import org.junit.runners.Suite ;
, TestTransactionTDB.class
, TestTransactionUnionGraph.class
})
-public class TS_Transaction
+public class TS_TransactionTDB
{
static Level level ;
@BeforeClass static public void beforeClass()