jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1623836 - in /jena/trunk/jena-tdb/src: main/java/com/hp/hpl/jena/tdb/assembler/ main/java/com/hp/hpl/jena/tdb/index/ main/java/com/hp/hpl/jena/tdb/setup/ main/java/com/hp/hpl/jena/tdb/store/bulkloader2/ main/java/tdb/ main/java/tdb/tools/ ...
Date Tue, 09 Sep 2014 14:46:58 GMT
Author: andy
Date: Tue Sep  9 14:46:58 2014
New Revision: 1623836

URL: http://svn.apache.org/r1623836
Log:
Renaming; move index related classes to index package

Added:
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java
      - copied, changed from r1623741, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java
      - copied, changed from r1623832, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexBuilder.java
      - copied, changed from r1623741, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
      - copied, changed from r1623832, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildDB.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java
      - copied, changed from r1623741, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderDB.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java
      - copied, changed from r1623741, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderIndex.java
Removed:
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexFactory.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildDB.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderDB.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderIndex.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java
Modified:
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderBasic.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/store/bulkloader2/CmdIndexCopy.java
    jena/trunk/jena-tdb/src/main/java/tdb/tdbconfig.java
    jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
    jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java Tue
Sep  9 14:46:58 2014
@@ -35,9 +35,9 @@ import com.hp.hpl.jena.tdb.TDBException 
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
+import com.hp.hpl.jena.tdb.index.IndexFactory ;
 import com.hp.hpl.jena.tdb.index.IndexParams ;
 import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.setup.IndexFactory ;
 import com.hp.hpl.jena.tdb.setup.SystemParams ;
 import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
 import com.hp.hpl.jena.tdb.store.tupletable.TupleIndexRecord ;

Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java (from
r1623741, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java&r1=1623741&r2=1623836&rev=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java Tue Sep
 9 14:46:58 2014
@@ -16,12 +16,10 @@
  * limitations under the License.
  */
 
-package com.hp.hpl.jena.tdb.setup;
+package com.hp.hpl.jena.tdb.index;
 
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
-import com.hp.hpl.jena.tdb.index.Index ;
-import com.hp.hpl.jena.tdb.index.IndexParams ;
 
 public interface IndexBuilder {
     Index buildIndex(FileSet fileSet, RecordFactory recordfactory, IndexParams indexParams)
;

Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java (from
r1623832, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java&r1=1623832&r2=1623836&rev=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java Tue Sep
 9 14:46:58 2014
@@ -16,24 +16,27 @@
  * limitations under the License.
  */
 
-package com.hp.hpl.jena.tdb.setup;
+package com.hp.hpl.jena.tdb.index;
 
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
-import com.hp.hpl.jena.tdb.index.Index ;
-import com.hp.hpl.jena.tdb.index.IndexParams ;
-import com.hp.hpl.jena.tdb.index.RangeIndex ;
+import com.hp.hpl.jena.tdb.setup.BlockMgrBuilder ;
+import com.hp.hpl.jena.tdb.setup.BuilderStdIndex ;
+import com.hp.hpl.jena.tdb.setup.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.BuilderStdIndex.BlockMgrBuilderStd ;
+import com.hp.hpl.jena.tdb.setup.BuilderStdIndex.IndexBuilderStd ;
+import com.hp.hpl.jena.tdb.setup.BuilderStdIndex.RangeIndexBuilderStd ;
 
 public class IndexFactory {
     // XXX Merge with com.hp.hpl.jena.tdb.index.IndexFactory
     // c.f. setupTDB
     
     
-    private static BlockMgrBuilder   blockMgrBuilder   = new BuilderIndex.BlockMgrBuilderStd()
;
-    private static RangeIndexBuilder rangeIndexBuilder = new BuilderIndex.RangeIndexBuilderStd(blockMgrBuilder,
+    private static BlockMgrBuilder   blockMgrBuilder   = new BuilderStdIndex.BlockMgrBuilderStd()
;
+    private static RangeIndexBuilder rangeIndexBuilder = new BuilderStdIndex.RangeIndexBuilderStd(blockMgrBuilder,
                                                                                         
      blockMgrBuilder) ;
-    private static IndexBuilder      indexBuilder      = new BuilderIndex.IndexBuilderStd(blockMgrBuilder,
+    private static IndexBuilder      indexBuilder      = new BuilderStdIndex.IndexBuilderStd(blockMgrBuilder,
                                                                                         
 blockMgrBuilder) ;
     
     public static IndexBuilder createIndexBuilderMem() { 
@@ -51,7 +54,7 @@ public class IndexFactory {
     }
 
     public static RangeIndexBuilder createRangeIndexBuilderMem() {
-        return new BuilderIndex.RangeIndexBuilderStd(blockMgrBuilder, blockMgrBuilder) ;
+        return new BuilderStdIndex.RangeIndexBuilderStd(blockMgrBuilder, blockMgrBuilder)
;
     }
     
     

Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexBuilder.java
(from r1623741, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexBuilder.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexBuilder.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java&r1=1623741&r2=1623836&rev=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexBuilder.java Tue
Sep  9 14:46:58 2014
@@ -16,12 +16,10 @@
  * limitations under the License.
  */
 
-package com.hp.hpl.jena.tdb.setup;
+package com.hp.hpl.jena.tdb.index;
 
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
-import com.hp.hpl.jena.tdb.index.IndexParams ;
-import com.hp.hpl.jena.tdb.index.RangeIndex ;
 
 public interface RangeIndexBuilder {
     RangeIndex buildRangeIndex(FileSet fileSet, RecordFactory recordfactory, IndexParams
indexParams) ;

Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java (from r1623832,
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildDB.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildDB.java&r1=1623832&r2=1623836&rev=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java Tue Sep  9 14:46:58
2014
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory ;
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
+import com.hp.hpl.jena.tdb.index.IndexFactory ;
 import com.hp.hpl.jena.tdb.index.IndexParams ;
 import com.hp.hpl.jena.tdb.index.RangeIndex ;
 import com.hp.hpl.jena.tdb.store.DatasetPrefixesTDB ;
@@ -36,10 +37,10 @@ import com.hp.hpl.jena.tdb.sys.DatasetCo
 /** Building datastructures on top of the base file
  *  abstractions of indexes, block managers and object files.  
  */
-public class BuildDB
+public class Build
 {
     private static boolean VERBOSE = true ;
-    private static Logger log = LoggerFactory.getLogger(BuildDB.class) ;
+    private static Logger log = LoggerFactory.getLogger(Build.class) ;
     private static SystemParams params = SystemParams.getDftSystemParams() ;
     
     public static TupleIndex openTupleIndex(Location location, String indexName, String primary,
String indexOrder, int readCacheSize, int writeCacheSize, int dftKeyLength, int dftValueLength)

Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java (from
r1623741, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderDB.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderDB.java&r1=1623741&r2=1623836&rev=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java Tue Sep
 9 14:46:58 2014
@@ -24,7 +24,9 @@ import com.hp.hpl.jena.tdb.base.file.Fil
 import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
 import com.hp.hpl.jena.tdb.index.Index ;
+import com.hp.hpl.jena.tdb.index.IndexBuilder ;
 import com.hp.hpl.jena.tdb.index.RangeIndex ;
+import com.hp.hpl.jena.tdb.index.RangeIndexBuilder ;
 import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
 import com.hp.hpl.jena.tdb.store.nodetable.NodeTableCache ;
 import com.hp.hpl.jena.tdb.store.nodetable.NodeTableInline ;
@@ -34,7 +36,7 @@ import com.hp.hpl.jena.tdb.store.tupleta
 import com.hp.hpl.jena.tdb.sys.Names ;
 import com.hp.hpl.jena.tdb.sys.SystemTDB ;
 
-public class BuilderDB {
+public class BuilderStdDB {
 
     public static class TupleIndexBuilderStd implements TupleIndexBuilder
     {

Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java (from
r1623741, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderIndex.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderIndex.java&r1=1623741&r2=1623836&rev=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderIndex.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java Tue Sep
 9 14:46:58 2014
@@ -24,15 +24,13 @@ import com.hp.hpl.jena.tdb.base.file.Fil
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
-import com.hp.hpl.jena.tdb.index.Index ;
-import com.hp.hpl.jena.tdb.index.IndexParams ;
-import com.hp.hpl.jena.tdb.index.RangeIndex ;
+import com.hp.hpl.jena.tdb.index.* ;
 import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
 import com.hp.hpl.jena.tdb.index.bplustree.BPlusTreeParams ;
 import com.hp.hpl.jena.tdb.sys.Names ;
 
 /** Building indexes, blockMgr and object files */ 
-public class BuilderIndex {
+public class BuilderStdIndex {
     public static class IndexBuilderStd implements IndexBuilder
     {
         protected BlockMgrBuilder bMgrNodes ;

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderBasic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderBasic.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderBasic.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderBasic.java Tue
Sep  9 14:46:58 2014
@@ -29,6 +29,8 @@ import com.hp.hpl.jena.sparql.engine.opt
 import com.hp.hpl.jena.tdb.TDBException ;
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.index.IndexBuilder ;
+import com.hp.hpl.jena.tdb.index.RangeIndexBuilder ;
 import com.hp.hpl.jena.tdb.solver.OpExecutorTDB1 ;
 import com.hp.hpl.jena.tdb.store.* ;
 import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
@@ -53,9 +55,9 @@ public class DatasetBuilderBasic //imple
     
     private /*public*/ DatasetBuilderBasic(IndexBuilder indexBuilder, RangeIndexBuilder rangeIndexBuilder)
     {
-        ObjectFileBuilder objectFileBuilder = new BuilderIndex.ObjectFileBuilderStd()  ;
-        nodeTableBuilder    = new BuilderDB.NodeTableBuilderStd(indexBuilder, objectFileBuilder)
;
-        tupleIndexBuilder   = new BuilderDB.TupleIndexBuilderStd(rangeIndexBuilder) ;
+        ObjectFileBuilder objectFileBuilder = new BuilderStdIndex.ObjectFileBuilderStd()
 ;
+        nodeTableBuilder    = new BuilderStdDB.NodeTableBuilderStd(indexBuilder, objectFileBuilder)
;
+        tupleIndexBuilder   = new BuilderStdDB.TupleIndexBuilderStd(rangeIndexBuilder) ;
     }
 
     //@Override public

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=1623836&r1=1623835&r2=1623836&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 Tue
Sep  9 14:46:58 2014
@@ -43,7 +43,9 @@ import com.hp.hpl.jena.tdb.base.block.Bl
 import com.hp.hpl.jena.tdb.base.file.BufferChannel ;
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.index.IndexBuilder ;
 import com.hp.hpl.jena.tdb.index.IndexParams ;
+import com.hp.hpl.jena.tdb.index.RangeIndexBuilder ;
 import com.hp.hpl.jena.tdb.solver.OpExecutorTDB1 ;
 import com.hp.hpl.jena.tdb.store.* ;
 import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
@@ -97,13 +99,13 @@ public class DatasetBuilderStd implement
         recorder = new Recorder() ;
         BlockMgrBuilder blockMgrBuilderRec = new BlockMgrBuilderRecorder(blockMgrBuilder,
recorder) ;
 
-        IndexBuilder indexBuilder = new BuilderIndex.IndexBuilderStd(blockMgrBuilderRec,
blockMgrBuilderRec) ;
-        RangeIndexBuilder rangeIndexBuilder = new BuilderIndex.RangeIndexBuilderStd(blockMgrBuilderRec,
blockMgrBuilderRec) ;
+        IndexBuilder indexBuilder = new BuilderStdIndex.IndexBuilderStd(blockMgrBuilderRec,
blockMgrBuilderRec) ;
+        RangeIndexBuilder rangeIndexBuilder = new BuilderStdIndex.RangeIndexBuilderStd(blockMgrBuilderRec,
blockMgrBuilderRec) ;
 
         this.nodeTableBuilder = nodeTableBuilder ;
         nodeTableBuilder = new NodeTableBuilderRecorder(nodeTableBuilder, recorder) ;
 
-        TupleIndexBuilder tupleIndexBuilder = new BuilderDB.TupleIndexBuilderStd(rangeIndexBuilder)
;
+        TupleIndexBuilder tupleIndexBuilder = new BuilderStdDB.TupleIndexBuilderStd(rangeIndexBuilder)
;
         set(nodeTableBuilder, tupleIndexBuilder) ;
     }
 
@@ -156,10 +158,10 @@ public class DatasetBuilderStd implement
     }
 
     private void standardSetup() {
-        ObjectFileBuilder objectFileBuilder = new BuilderIndex.ObjectFileBuilderStd() ;
-        BlockMgrBuilder blockMgrBuilder = new BuilderIndex.BlockMgrBuilderStd() ;
-        IndexBuilder indexBuilderNT = new BuilderIndex.IndexBuilderStd(blockMgrBuilder, blockMgrBuilder)
;
-        NodeTableBuilder nodeTableBuilder = new BuilderDB.NodeTableBuilderStd(indexBuilderNT,
objectFileBuilder) ;
+        ObjectFileBuilder objectFileBuilder = new BuilderStdIndex.ObjectFileBuilderStd()
;
+        BlockMgrBuilder blockMgrBuilder = new BuilderStdIndex.BlockMgrBuilderStd() ;
+        IndexBuilder indexBuilderNT = new BuilderStdIndex.IndexBuilderStd(blockMgrBuilder,
blockMgrBuilder) ;
+        NodeTableBuilder nodeTableBuilder = new BuilderStdDB.NodeTableBuilderStd(indexBuilderNT,
objectFileBuilder) ;
 
         set(blockMgrBuilder, nodeTableBuilder) ;
     }

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java
(original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java
Tue Sep  9 14:46:58 2014
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory ;
 import tdb.cmdline.CmdTDB ;
 
 import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.setup.BuildDB ;
+import com.hp.hpl.jena.tdb.setup.Build ;
 import com.hp.hpl.jena.tdb.store.NodeId ;
 import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
 import com.hp.hpl.jena.tdb.sys.SystemTDB ;
@@ -82,8 +82,8 @@ public class CmdIndexCopy
         String indexOrder = indexName2 ;
         String label = indexName1+" => "+indexName2 ;
         
-        TupleIndex index1 = BuildDB.openTupleIndex(location1, indexName1, primary, indexName1,
10, 10, keyLength, valueLength) ;      
-        TupleIndex index2 = BuildDB.openTupleIndex(location2, indexName2, primary, indexOrder,
10, 10, keyLength, valueLength) ;
+        TupleIndex index1 = Build.openTupleIndex(location1, indexName1, primary, indexName1,
10, 10, keyLength, valueLength) ;      
+        TupleIndex index2 = Build.openTupleIndex(location2, indexName2, primary, indexOrder,
10, 10, keyLength, valueLength) ;
         tupleIndexCopy(index1, index2, label) ;
         index1.close() ;
         index2.close() ;

Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbconfig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbconfig.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tdbconfig.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tdbconfig.java Tue Sep  9 14:46:58 2014
@@ -37,7 +37,7 @@ import com.hp.hpl.jena.tdb.TDB ;
 import com.hp.hpl.jena.tdb.base.file.FileFactory ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
 import com.hp.hpl.jena.tdb.base.objectfile.StringFile ;
-import com.hp.hpl.jena.tdb.setup.BuildDB ;
+import com.hp.hpl.jena.tdb.setup.Build ;
 import com.hp.hpl.jena.tdb.solver.stats.Stats ;
 import com.hp.hpl.jena.tdb.solver.stats.StatsResults ;
 import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
@@ -106,7 +106,7 @@ public class tdbconfig extends CmdSub
         protected void exec()
         {
             Location location = getLocation() ;
-            DatasetPrefixStorage prefixes = BuildDB.makePrefixes(location, new DatasetControlNone())
;
+            DatasetPrefixStorage prefixes = Build.makePrefixes(location, new DatasetControlNone())
;
             for ( String gn : prefixes.graphNames() )
             {
                 System.out.println("Graph: "+gn) ;

Modified: jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java Tue Sep  9 14:46:58 2014
@@ -33,9 +33,9 @@ import com.hp.hpl.jena.sparql.util.Utils
 import com.hp.hpl.jena.tdb.base.file.Location ;
 import com.hp.hpl.jena.tdb.base.record.Record ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
+import com.hp.hpl.jena.tdb.index.IndexFactory ;
 import com.hp.hpl.jena.tdb.index.RangeIndex ;
 import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
-import com.hp.hpl.jena.tdb.setup.IndexFactory ;
 import com.hp.hpl.jena.tdb.store.NodeId ;
 import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
 import com.hp.hpl.jena.tdb.store.tupletable.TupleIndexRecord ;

Modified: jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java Tue Sep  9 14:46:58 2014
@@ -36,7 +36,7 @@ import com.hp.hpl.jena.sparql.util.FmtUt
 import com.hp.hpl.jena.sparql.util.Utils ;
 import com.hp.hpl.jena.tdb.StoreConnection ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.setup.BuildDB ;
+import com.hp.hpl.jena.tdb.setup.Build ;
 import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
 import com.hp.hpl.jena.tdb.store.NodeId ;
 import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
@@ -89,7 +89,7 @@ public class dumpnodetable extends CmdGe
 
                             int sizeNodeMissCacheSize)
     {
-        NodeTable nodeTable = BuildDB.makeNodeTable(new Location(location), 
+        NodeTable nodeTable = Build.makeNodeTable(new Location(location), 
                                                     indexNode2Id, node2NodeIdCacheSize,
                                                     indexId2Node, nodeId2NodeCacheSize,
                                                     sizeNodeMissCacheSize) ;

Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java
(original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java
Tue Sep  9 14:46:58 2014
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.tdb.StoreConnecti
 import com.hp.hpl.jena.tdb.TDB ;
 import com.hp.hpl.jena.tdb.TDBFactory ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.setup.BuildDB ;
+import com.hp.hpl.jena.tdb.setup.Build ;
 import com.hp.hpl.jena.tdb.store.DatasetPrefixesTDB ;
 import com.hp.hpl.jena.tdb.sys.DatasetControl ;
 import com.hp.hpl.jena.tdb.sys.DatasetControlMRSW ;
@@ -59,7 +59,7 @@ public class TestPrefixMappingTDB extend
     }
     
     static DatasetPrefixesTDB createTesting(Location location, DatasetControl policy) {
-        return BuildDB.makePrefixes(location, policy) ;
+        return Build.makePrefixes(location, policy) ;
     }
 
     @Override

Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java
(original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java
Tue Sep  9 14:46:58 2014
@@ -19,7 +19,7 @@
 package com.hp.hpl.jena.tdb.store.nodetable;
 
 import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.setup.BuildDB ;
+import com.hp.hpl.jena.tdb.setup.Build ;
 import com.hp.hpl.jena.tdb.sys.Names ;
 
 public class TestNodeTable extends AbstractTestNodeTable
@@ -27,6 +27,6 @@ public class TestNodeTable extends Abstr
     @Override
     protected NodeTable createEmptyNodeTable()
     {
-        return BuildDB.makeNodeTable(Location.mem(), Names.indexNode2Id, 10, Names.indexId2Node,
10, 10) ;
+        return Build.makeNodeTable(Location.mem(), Names.indexNode2Id, 10, Names.indexId2Node,
10, 10) ;
     }
 }

Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java
(original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java
Tue Sep  9 14:46:58 2014
@@ -19,7 +19,7 @@
 package com.hp.hpl.jena.tdb.store.nodetable;
 
 import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.setup.BuildDB ;
+import com.hp.hpl.jena.tdb.setup.Build ;
 
 
 public class TestNodeTableStored extends AbstractTestNodeTable
@@ -27,6 +27,6 @@ public class TestNodeTableStored extends
     @Override
     protected NodeTable createEmptyNodeTable()
     {
-        return BuildDB.makeNodeTable(Location.mem()) ;
+        return Build.makeNodeTable(Location.mem()) ;
     }
 }

Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java
(original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java
Tue Sep  9 14:46:58 2014
@@ -24,9 +24,9 @@ import org.apache.jena.atlas.lib.ColumnM
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
 import com.hp.hpl.jena.tdb.index.AbstractTestTupleIndex ;
+import com.hp.hpl.jena.tdb.index.IndexFactory ;
 import com.hp.hpl.jena.tdb.index.IndexParams ;
 import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.setup.IndexFactory ;
 import com.hp.hpl.jena.tdb.setup.SystemParams ;
 import com.hp.hpl.jena.tdb.sys.SystemTDB ;
 

Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java
(original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java
Tue Sep  9 14:46:58 2014
@@ -31,9 +31,9 @@ import org.junit.Test ;
 
 import com.hp.hpl.jena.tdb.base.file.FileSet ;
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
+import com.hp.hpl.jena.tdb.index.IndexFactory ;
 import com.hp.hpl.jena.tdb.index.IndexParams ;
 import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.setup.IndexFactory ;
 import com.hp.hpl.jena.tdb.setup.SystemParams ;
 import com.hp.hpl.jena.tdb.store.NodeId ;
 import com.hp.hpl.jena.tdb.sys.SystemTDB ;

Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java?rev=1623836&r1=1623835&r2=1623836&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
(original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
Tue Sep  9 14:46:58 2014
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.tdb.base.objectfi
 import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
 import com.hp.hpl.jena.tdb.index.Index ;
 import com.hp.hpl.jena.tdb.index.IndexMap ;
-import com.hp.hpl.jena.tdb.setup.BuildDB ;
+import com.hp.hpl.jena.tdb.setup.Build ;
 import com.hp.hpl.jena.tdb.store.NodeId ;
 import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
 import com.hp.hpl.jena.tdb.sys.SystemTDB ;
@@ -41,7 +41,7 @@ public abstract class AbstractTestNodeTa
     
     private NodeTableTrans create(Transaction txn, Node...nodes)
     {
-        NodeTable base = BuildDB.makeNodeTable(getLocation()) ;
+        NodeTable base = Build.makeNodeTable(getLocation()) ;
         for ( Node n : nodes )
             base.getAllocateNodeId(n) ;
         return create(txn, base) ;



Mime
View raw message