Author: andy
Date: Tue Sep 9 15:14:37 2014
New Revision: 1623844
URL: http://svn.apache.org/r1623844
Log:
Move more index-specific code into index package.
Added:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/BuilderStdIndex.java
- copied, changed from r1623836,
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java
Removed:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.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
Copied:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/BuilderStdIndex.java
(from r1623836,
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java)
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/BuilderStdIndex.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/BuilderStdIndex.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java&r1=1623836&r2=1623844&rev=1623844&view=diff
==============================================================================
---
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdIndex.java
(original)
+++
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/BuilderStdIndex.java
Tue Sep 9 15:14:37 2014
@@ -16,17 +16,15 @@
* 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.block.BlockMgr ;
import com.hp.hpl.jena.tdb.base.block.BlockMgrFactory ;
-import com.hp.hpl.jena.tdb.base.file.FileFactory ;
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.* ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTreeParams ;
+import com.hp.hpl.jena.tdb.setup.BlockMgrBuilder ;
import com.hp.hpl.jena.tdb.sys.Names ;
/** Building indexes, blockMgr and object files */
@@ -97,20 +95,6 @@ public class BuilderStdIndex {
}
}
- public static class ObjectFileBuilderStd implements ObjectFileBuilder
- {
- public ObjectFileBuilderStd() { }
-
- @Override
- public ObjectFile buildObjectFile(FileSet fileSet, String ext)
- {
- String filename = fileSet.filename(ext) ;
- if ( fileSet.isMem() )
- return FileFactory.createObjectFileMem(filename) ;
- return FileFactory.createObjectFileDisk(filename) ;
- }
- }
-
public static class BlockMgrBuilderStd implements BlockMgrBuilder
{
public BlockMgrBuilderStd() {}
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java?rev=1623844&r1=1623843&r2=1623844&view=diff
==============================================================================
---
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java
(original)
+++
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexFactory.java
Tue Sep 9 15:14:37 2014
@@ -22,17 +22,9 @@ import com.hp.hpl.jena.tdb.base.file.Fil
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
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
BuilderStdIndex.BlockMgrBuilderStd() ;
private static RangeIndexBuilder rangeIndexBuilder = new
BuilderStdIndex.RangeIndexBuilderStd(blockMgrBuilder,
blockMgrBuilder) ;
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java?rev=1623844&r1=1623843&r2=1623844&view=diff
==============================================================================
---
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java
(original)
+++
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuilderStdDB.java
Tue Sep 9 15:14:37 2014
@@ -20,6 +20,7 @@ package com.hp.hpl.jena.tdb.setup;
import org.apache.jena.atlas.lib.ColumnMap ;
+import com.hp.hpl.jena.tdb.base.file.FileFactory ;
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 ;
@@ -81,5 +82,19 @@ public class BuilderStdDB {
}
}
+ public static class ObjectFileBuilderStd implements ObjectFileBuilder
+ {
+ public ObjectFileBuilderStd() { }
+
+ @Override
+ public ObjectFile buildObjectFile(FileSet fileSet, String ext)
+ {
+ String filename = fileSet.filename(ext) ;
+ if ( fileSet.isMem() )
+ return FileFactory.createObjectFileMem(filename) ;
+ return FileFactory.createObjectFileDisk(filename) ;
+ }
+ }
+
}
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=1623844&r1=1623843&r2=1623844&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 15:14:37 2014
@@ -55,7 +55,7 @@ public class DatasetBuilderBasic //imple
private /*public*/ DatasetBuilderBasic(IndexBuilder indexBuilder,
RangeIndexBuilder rangeIndexBuilder)
{
- ObjectFileBuilder objectFileBuilder = new
BuilderStdIndex.ObjectFileBuilderStd() ;
+ ObjectFileBuilder objectFileBuilder = new
BuilderStdDB.ObjectFileBuilderStd() ;
nodeTableBuilder = new
BuilderStdDB.NodeTableBuilderStd(indexBuilder, objectFileBuilder) ;
tupleIndexBuilder = new
BuilderStdDB.TupleIndexBuilderStd(rangeIndexBuilder) ;
}
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=1623844&r1=1623843&r2=1623844&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 15:14:37 2014
@@ -43,6 +43,7 @@ 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.BuilderStdIndex ;
import com.hp.hpl.jena.tdb.index.IndexBuilder ;
import com.hp.hpl.jena.tdb.index.IndexParams ;
import com.hp.hpl.jena.tdb.index.RangeIndexBuilder ;
@@ -158,7 +159,7 @@ public class DatasetBuilderStd implement
}
private void standardSetup() {
- ObjectFileBuilder objectFileBuilder = new
BuilderStdIndex.ObjectFileBuilderStd() ;
+ ObjectFileBuilder objectFileBuilder = new
BuilderStdDB.ObjectFileBuilderStd() ;
BlockMgrBuilder blockMgrBuilder = new
BuilderStdIndex.BlockMgrBuilderStd() ;
IndexBuilder indexBuilderNT = new
BuilderStdIndex.IndexBuilderStd(blockMgrBuilder, blockMgrBuilder) ;
NodeTableBuilder nodeTableBuilder = new
BuilderStdDB.NodeTableBuilderStd(indexBuilderNT, objectFileBuilder) ;
