svn commit: r1513115 - in /jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb: TDB.java solver/QueryEngineTDB.java

[an...@apache.org]

Author: andy
Date: Mon Aug 12 11:46:02 2013
New Revision: 1513115

URL: http://svn.apache.org/r1513115
Log:
Expose TDB query engine creation to subclasses.

Modified:
    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/solver/QueryEngineTDB.java

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=1513115&r1=1513114&r2=1513115&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 Aug 12 11:46:02 2013
@@ -230,7 +230,9 @@ public class TDB
         StageGenerator stageGenerator = new StageGeneratorDirectTDB(orig) ;
         StageBuilder.setGenerator(ARQ.getContext(), stageGenerator) ;
 
-        // Wire in the new OpExecutor.  This is normal way to execute with a dataset.
+        // 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) ;
     }
     

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java?rev=1513115&r1=1513114&r2=1513115&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java Mon Aug 12 11:46:02 2013
@@ -145,9 +145,9 @@ public class QueryEngineTDB extends Quer
     public long getMillis() { return -1 ; }
     
     // ---- Factory
-    private static QueryEngineFactory factory = new QueryEngineFactoryTDB() ;
+    protected static QueryEngineFactory factory = new QueryEngineFactoryTDB() ;
         
-    private static class QueryEngineFactoryTDB implements QueryEngineFactory
+    protected static class QueryEngineFactoryTDB implements QueryEngineFactory
     {
         // If a DatasetGraphTransaction is passed in, we are outside a transaction.
         
@@ -158,7 +158,7 @@ public class QueryEngineTDB extends Quer
             return false ;
         }
         
-        private DatasetGraphTDB dsgToQuery(DatasetGraph dataset)
+        protected DatasetGraphTDB dsgToQuery(DatasetGraph dataset)
         {
             if (dataset instanceof DatasetGraphTDB) return (DatasetGraphTDB)dataset ;
             if (dataset instanceof DatasetGraphTransaction)