Author: andy
Date: Tue Sep 9 14:27:26 2014
New Revision: 1623832
URL: http://svn.apache.org/r1623832
Log:
Remove more unused; rename BuildIndex as IndexFactory
Added:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java
- copied, changed from r1623741,
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildIndex.java
Removed:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexType.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildIndex.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/BuildDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.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
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=1623832&r1=1623831&r2=1623832&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:27:26 2014
@@ -37,7 +37,7 @@ import com.hp.hpl.jena.tdb.base.file.Loc
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 ;
-import com.hp.hpl.jena.tdb.setup.BuildIndex ;
+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 ;
@@ -86,7 +86,7 @@ public class IndexAssembler extends Asse
// Problems with spotting the index technology.
FileSet fileset = null ; //FileSet.fromFilename(filename) ;
IndexParams idxParams = SystemParams.getDftSystemParams() ;
- RangeIndex rIndex = BuildIndex.buildRangeIndex(fileset, rf, idxParams)
;
+ RangeIndex rIndex = IndexFactory.buildRangeIndex(fileset, rf,
idxParams) ;
return new TupleIndexRecord(desc.length(), new ColumnMap(primary,
desc), desc, rf, rIndex) ;
}
}
Modified:
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/BuildDB.java?rev=1623832&r1=1623831&r2=1623832&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/BuildDB.java
Tue Sep 9 14:27:26 2014
@@ -53,7 +53,7 @@ public class BuildDB
RecordFactory recordFactory = new RecordFactory(dftKeyLength,
dftValueLength) ;
IndexParams idxParams = spb.build() ;
FileSet fs = new FileSet(location, indexName) ;
- RangeIndex rIndex = BuildIndex.buildRangeIndex(fs, recordFactory,
idxParams) ;
+ RangeIndex rIndex = IndexFactory.buildRangeIndex(fs, recordFactory,
idxParams) ;
TupleIndex tupleIndex = new TupleIndexRecord(primary.length(), new
ColumnMap(primary, indexOrder), indexOrder, rIndex.getRecordFactory(), rIndex) ;
return tupleIndex ;
}
Copied:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java
(from r1623741,
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildIndex.java)
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildIndex.java&r1=1623741&r2=1623832&rev=1623832&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/BuildIndex.java
(original)
+++
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/IndexFactory.java
Tue Sep 9 14:27:26 2014
@@ -25,7 +25,7 @@ import com.hp.hpl.jena.tdb.index.Index ;
import com.hp.hpl.jena.tdb.index.IndexParams ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
-public class BuildIndex {
+public class IndexFactory {
// XXX Merge with com.hp.hpl.jena.tdb.index.IndexFactory
// c.f. setupTDB
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java?rev=1623832&r1=1623831&r2=1623832&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
(original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
Tue Sep 9 14:27:26 2014
@@ -37,7 +37,6 @@ import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.base.block.FileMode ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
-import com.hp.hpl.jena.tdb.index.IndexType ;
import com.hp.hpl.jena.tdb.store.NodeId ;
public class SystemTDB
@@ -405,35 +404,4 @@ public class SystemTDB
}
throw new TDBException("Unrecognized file mode (not one of 'default',
'direct' or 'mapped': "+x) ;
}
-
- // ---- Index type
-
- public static final String indexTypeBTree = "BTree" ;
- public static final String indexTypeBPlusTree = "BPlusTree" ;
- public static final String indexTypeExtHash = "ExtHash" ;
-
- public static final String defaultIndexType = indexTypeBPlusTree ;
-
- // Delay until needed so application can set symIndexType
- private static IndexType indexType = null ;
-
- public static IndexType getIndexType()
- {
- if ( indexType != null )
- return indexType ;
-
- boolean defaultSetting = false ;
- String x = TDB.getContext().getAsString(SystemTDB.symIndexType) ;
- if ( x == null )
- {
- defaultSetting = true ;
- x = SystemTDB.defaultIndexType ;
- }
- IndexType iType = IndexType.get(x) ;
- if ( !defaultSetting )
- LoggerFactory.getLogger(IndexType.class).info("Index type:
"+iType) ;
-
- indexType = iType ;
- return iType ;
- }
}
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=1623832&r1=1623831&r2=1623832&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:27:26 2014
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.tdb.base.record.R
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
-import com.hp.hpl.jena.tdb.setup.BuildIndex ;
+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 ;
@@ -114,7 +114,7 @@ public class dumpbpt extends CmdGeneral
RecordFactory rf = new RecordFactory(keyLength, valueLength) ;
- RangeIndex rIndex = BuildIndex.buildRangeIndex(loc, indexName, rf)
;
+ RangeIndex rIndex = IndexFactory.buildRangeIndex(loc, indexName,
rf) ;
BPlusTree bpt = (BPlusTree)rIndex ;
if ( false )
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=1623832&r1=1623831&r2=1623832&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:27:26 2014
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.tdb.base.record.R
import com.hp.hpl.jena.tdb.index.AbstractTestTupleIndex ;
import com.hp.hpl.jena.tdb.index.IndexParams ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.setup.BuildIndex ;
+import com.hp.hpl.jena.tdb.setup.IndexFactory ;
import com.hp.hpl.jena.tdb.setup.SystemParams ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
@@ -38,7 +38,7 @@ public class TestTupleIndexRecord extend
protected TupleIndexRecord create(String description)
{
IndexParams indexParams = SystemParams.getDftSystemParams() ;
- RangeIndex rIdx = BuildIndex.buildRangeIndex(FileSet.mem(), factory,
indexParams) ;
+ RangeIndex rIdx = IndexFactory.buildRangeIndex(FileSet.mem(), factory,
indexParams) ;
ColumnMap cmap = new ColumnMap("SPO", description) ;
TupleIndexRecord index = new TupleIndexRecord(3, cmap, description,
factory, rIdx) ;
return index ;
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=1623832&r1=1623831&r2=1623832&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:27:26 2014
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.tdb.base.file.Fil
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 ;
-import com.hp.hpl.jena.tdb.setup.BuildIndex ;
+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 ;
@@ -51,7 +51,7 @@ public class TestTupleIndexRecordDirect
static TupleIndexRecord create(String description)
{
IndexParams indexParams = SystemParams.getDftSystemParams() ;
- RangeIndex rIdx = BuildIndex.buildRangeIndex(FileSet.mem(), factory,
indexParams) ;
+ RangeIndex rIdx = IndexFactory.buildRangeIndex(FileSet.mem(), factory,
indexParams) ;
ColumnMap cmap = new ColumnMap("SPO", description) ;
TupleIndexRecord index = new TupleIndexRecord(3, cmap, description,
factory, rIdx) ;
return index ;
