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 2014/09/13 19:30:37 UTC
svn commit: r1624769 - 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/mgt/
main/java/com/hp/hpl/jena/tdb/setup/ main/java/com/hp/hpl/jena/tdb/store/
main/java/com...
Author: andy
Date: Sat Sep 13 17:30:36 2014
New Revision: 1624769
URL: http://svn.apache.org/r1624769
Log:
Rename "SystemParams" as the more accurate "StoreParams".
Added:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParams.java
- copied, changed from r1623855, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParams.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java
- copied, changed from r1623855, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParamsBuilder.java
Removed:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParams.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParamsBuilder.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/index/IndexFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBSystemInfo.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.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/DatasetBuilder.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/setup/NodeTableBuilder.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/StorageConfig.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableCache.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.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=1624769&r1=1624768&r2=1624769&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 Sat Sep 13 17:30:36 2014
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.tdb.base.record.R
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.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
import com.hp.hpl.jena.tdb.store.tupletable.TupleIndexRecord ;
import com.hp.hpl.jena.tdb.sys.Names ;
@@ -85,7 +85,7 @@ public class IndexAssembler extends Asse
}
// Problems with spotting the index technology.
FileSet fileset = null ; //FileSet.fromFilename(filename) ;
- IndexParams idxParams = SystemParams.getDftSystemParams() ;
+ IndexParams idxParams = StoreParams.getDftStoreParams() ;
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/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=1624769&r1=1624768&r2=1624769&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 Sat Sep 13 17:30:36 2014
@@ -22,7 +22,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.base.record.RecordFactory ;
import com.hp.hpl.jena.tdb.setup.BlockMgrBuilder ;
-import com.hp.hpl.jena.tdb.setup.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
public class IndexFactory {
private static BlockMgrBuilder blockMgrBuilder = new BuilderStdIndex.BlockMgrBuilderStd() ;
@@ -66,7 +66,7 @@ public class IndexFactory {
}
public static RangeIndex buildRangeIndex(FileSet fileset, RecordFactory recordFactory) {
- IndexParams indexParams = SystemParams.getDftSystemParams() ;
+ IndexParams indexParams = StoreParams.getDftStoreParams() ;
return buildRangeIndex(fileset, recordFactory, indexParams) ;
}
@@ -80,7 +80,7 @@ public class IndexFactory {
}
public static Index buildIndex(FileSet fileset, RecordFactory recordFactory) {
- IndexParams indexParams = SystemParams.getDftSystemParams() ;
+ IndexParams indexParams = StoreParams.getDftStoreParams() ;
return buildIndex(fileset, recordFactory, indexParams) ;
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBSystemInfo.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBSystemInfo.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBSystemInfo.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/mgt/TDBSystemInfo.java Sat Sep 13 17:30:36 2014
@@ -18,12 +18,12 @@
package com.hp.hpl.jena.tdb.mgt;
-import com.hp.hpl.jena.tdb.setup.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
public class TDBSystemInfo implements TDBSystemInfoMBean
{
- private static SystemParams params = SystemParams.getDftSystemParams() ;
+ private static StoreParams params = StoreParams.getDftStoreParams() ;
@Override
public int getSegmentSize() { return SystemTDB.SegmentSize; }
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Build.java Sat Sep 13 17:30:36 2014
@@ -41,14 +41,14 @@ public class Build
{
private static boolean VERBOSE = true ;
private static Logger log = LoggerFactory.getLogger(Build.class) ;
- private static SystemParams params = SystemParams.getDftSystemParams() ;
+ private static StoreParams params = StoreParams.getDftStoreParams() ;
public static TupleIndex openTupleIndex(Location location, String indexName, String primary, String indexOrder, int readCacheSize, int writeCacheSize, int dftKeyLength, int dftValueLength)
{
// XXX replace with:
// return DatasetBuilderStd.stdBuilder().makeTupleIndex(location, indexName, primary, indexOrder) ;
// All this to BuilderDB.
- SystemParamsBuilder spb = new SystemParamsBuilder() ;
+ StoreParamsBuilder spb = new StoreParamsBuilder() ;
spb.blockReadCacheSize(readCacheSize) ;
spb.blockWriteCacheSize(writeCacheSize) ;
RecordFactory recordFactory = new RecordFactory(dftKeyLength, dftValueLength) ;
@@ -67,7 +67,7 @@ public class Build
return makeNodeTable(location, params) ;
}
- public static NodeTable makeNodeTable(Location location, SystemParams params) {
+ public static NodeTable makeNodeTable(Location location, StoreParams params) {
DatasetBuilderStd dbBuild = DatasetBuilderStd.stdBuilder() ;
return dbBuild.makeNodeTable(location, params) ;
}
@@ -77,7 +77,7 @@ public class Build
String indexNode2Id, int node2NodeIdCacheSize,
String indexId2Node, int nodeId2NodeCacheSize,
int sizeNodeMissCacheSize) {
- SystemParamsBuilder spb = new SystemParamsBuilder() ;
+ StoreParamsBuilder spb = new StoreParamsBuilder() ;
spb.indexNode2Id(indexNode2Id).node2NodeIdCacheSize(node2NodeIdCacheSize) ;
spb.indexId2Node(indexId2Node).nodeId2NodeCacheSize(nodeId2NodeCacheSize) ;
DatasetBuilderStd dbBuild = DatasetBuilderStd.stdBuilder() ;
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=1624769&r1=1624768&r2=1624769&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 Sat Sep 13 17:30:36 2014
@@ -48,7 +48,7 @@ public class BuilderStdDB {
}
@Override
- public TupleIndex buildTupleIndex(FileSet fileSet, ColumnMap colMap, String name, SystemParams params) {
+ public TupleIndex buildTupleIndex(FileSet fileSet, ColumnMap colMap, String name, StoreParams params) {
RecordFactory recordFactory = new RecordFactory(SystemTDB.SizeOfNodeId * colMap.length(), 0) ;
RangeIndex rIdx = rangeIndexBuilder.buildRangeIndex(fileSet, recordFactory, params) ;
@@ -68,7 +68,7 @@ public class BuilderStdDB {
}
@Override
- public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, SystemParams params) {
+ public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, StoreParams params) {
RecordFactory recordFactory = new RecordFactory(SystemTDB.LenNodeHash, SystemTDB.SizeOfNodeId) ;
Index idx = indexBuilder.buildIndex(fsIndex, recordFactory, params) ;
ObjectFile objectFile = objectFileBuilder.buildObjectFile(fsObjectFile, Names.extNodeData) ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java Sat Sep 13 17:30:36 2014
@@ -29,5 +29,5 @@ public interface DatasetBuilder
* Build a new Java object for a dataset.
* Location may already contains files for the state, or may need initializing.
*/
- public DatasetGraphTDB build(Location location, SystemParams params) ;
+ public DatasetGraphTDB build(Location location, StoreParams params) ;
}
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=1624769&r1=1624768&r2=1624769&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 Sat Sep 13 17:30:36 2014
@@ -51,7 +51,7 @@ public class DatasetBuilderBasic //imple
private NodeTableBuilder nodeTableBuilder ;
private TupleIndexBuilder tupleIndexBuilder ;
- private SystemParams params ;
+ private StoreParams params ;
private /*public*/ DatasetBuilderBasic(IndexBuilder indexBuilder, RangeIndexBuilder rangeIndexBuilder)
{
@@ -61,13 +61,13 @@ public class DatasetBuilderBasic //imple
}
//@Override public
- private DatasetGraphTDB build(Location location, SystemParams config)
+ private DatasetGraphTDB build(Location location, StoreParams config)
{
DatasetControl policy = createConcurrencyPolicy() ;
params = config ;
if ( config == null )
- params = SystemParams.getDftSystemParams() ;
+ params = StoreParams.getDftStoreParams() ;
NodeTable nodeTable = makeNodeTable(location, params.getIndexNode2Id(), params.getIndexId2Node(),
-1, -1, -1) ; // No caches
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=1624769&r1=1624768&r2=1624769&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 Sat Sep 13 17:30:36 2014
@@ -68,7 +68,7 @@ public class DatasetBuilderStd implement
private Recorder recorder = null ;
public static DatasetGraphTDB create(Location location) {
- SystemParams params = paramsForLocation(location) ;
+ StoreParams params = paramsForLocation(location) ;
DatasetBuilderStd x = new DatasetBuilderStd() ;
x.standardSetup() ;
return x.build(location, params) ;
@@ -110,7 +110,7 @@ public class DatasetBuilderStd implement
set(nodeTableBuilder, tupleIndexBuilder) ;
}
- private static SystemParams paramsForLocation(Location location) {
+ private static StoreParams paramsForLocation(Location location) {
if ( location.exists(DB_CONFIG_FILE) ) {
log.debug("Existing configuration file found") ;
Properties properties = new Properties() ;
@@ -118,7 +118,7 @@ public class DatasetBuilderStd implement
PropertyUtils.loadFromFile(properties, DB_CONFIG_FILE) ;
} catch (IOException ex) { IO.exception(ex) ; throw new TDBException("Bad configuration file", ex) ; }
}
- return SystemParams.getDftSystemParams() ;
+ return StoreParams.getDftStoreParams() ;
}
// private void checkIfConfig(Location location) {
@@ -168,7 +168,7 @@ public class DatasetBuilderStd implement
}
@Override
- public DatasetGraphTDB build(Location location, SystemParams params) {
+ public DatasetGraphTDB build(Location location, StoreParams params) {
// Ensure that there is global synchronization
synchronized (DatasetBuilderStd.class) {
log.debug("Build database: "+location.getDirectoryPath()) ;
@@ -184,11 +184,11 @@ public class DatasetBuilderStd implement
// Called by DatasetBuilderTxn
// XXX Rework - provide a cloning constructor (copies maps).
// Or "reset"
- public DatasetGraphTDB _build(Location location, SystemParams params, boolean writeable, ReorderTransformation _transform) {
+ public DatasetGraphTDB _build(Location location, StoreParams params, boolean writeable, ReorderTransformation _transform) {
return buildWorker(location, writeable, _transform, params) ;
}
- private synchronized DatasetGraphTDB buildWorker(Location location, boolean writeable, ReorderTransformation _transform, SystemParams params) {
+ private synchronized DatasetGraphTDB buildWorker(Location location, boolean writeable, ReorderTransformation _transform, StoreParams params) {
recorder.start() ;
DatasetControl policy = createConcurrencyPolicy() ;
NodeTable nodeTable = makeNodeTable(location, params) ;
@@ -218,7 +218,7 @@ public class DatasetBuilderStd implement
return new DatasetControlMRSW() ;
}
- protected TripleTable makeTripleTable(Location location, NodeTable nodeTable, DatasetControl policy, SystemParams params) {
+ protected TripleTable makeTripleTable(Location location, NodeTable nodeTable, DatasetControl policy, StoreParams params) {
String primary = params.getPrimaryIndexTriples() ;
String[] indexes = params.getTripleIndexes() ;
@@ -237,7 +237,7 @@ public class DatasetBuilderStd implement
return tripleTable ;
}
- protected QuadTable makeQuadTable(Location location, NodeTable nodeTable, DatasetControl policy, SystemParams params) {
+ protected QuadTable makeQuadTable(Location location, NodeTable nodeTable, DatasetControl policy, StoreParams params) {
String primary = params.getPrimaryIndexQuads() ;
String[] indexes = params.getQuadIndexes() ;
@@ -256,7 +256,7 @@ public class DatasetBuilderStd implement
return quadTable ;
}
- protected DatasetPrefixesTDB makePrefixTable(Location location, DatasetControl policy, SystemParams params) {
+ protected DatasetPrefixesTDB makePrefixTable(Location location, DatasetControl policy, StoreParams params) {
String primary = params.getPrimaryIndexPrefix() ;
String[] indexes = params.getPrefixIndexes() ;
@@ -285,11 +285,11 @@ public class DatasetBuilderStd implement
return chooseOptimizer(location) ;
}
- private TupleIndex[] makeTupleIndexes(Location location, String primary, String[] indexNames, SystemParams params) {
+ private TupleIndex[] makeTupleIndexes(Location location, String primary, String[] indexNames, StoreParams params) {
return makeTupleIndexes(location, primary, indexNames, indexNames, params) ;
}
- private TupleIndex[] makeTupleIndexes(Location location, String primary, String[] indexNames, String[] filenames, SystemParams params) {
+ private TupleIndex[] makeTupleIndexes(Location location, String primary, String[] indexNames, String[] filenames, StoreParams params) {
if ( primary.length() != 3 && primary.length() != 4 )
error(log, "Bad primary key length: " + primary.length()) ;
@@ -300,14 +300,14 @@ public class DatasetBuilderStd implement
return indexes ;
}
- protected TupleIndex makeTupleIndex(Location location, String name, String primary, String indexOrder, SystemParams params) {
+ protected TupleIndex makeTupleIndex(Location location, String name, String primary, String indexOrder, StoreParams params) {
// Commonly, name == indexOrder.
FileSet fs = new FileSet(location, name) ;
ColumnMap colMap = new ColumnMap(primary, indexOrder) ;
return tupleIndexBuilder.buildTupleIndex(fs, colMap, indexOrder, params) ;
}
- public NodeTable makeNodeTable(Location location, SystemParams params) {
+ public NodeTable makeNodeTable(Location location, StoreParams params) {
FileSet fsNodeToId = new FileSet(location, params.getIndexNode2Id()) ;
FileSet fsId2Node = new FileSet(location, params.getIndexId2Node()) ;
NodeTable nt = nodeTableBuilder.buildNodeTable(fsNodeToId, fsId2Node, params) ;
@@ -315,15 +315,15 @@ public class DatasetBuilderStd implement
}
/** Make a node table overriding the node->id and id->node table names */
- private NodeTable makeNodeTable$(Location location, String indexNode2Id, String indexId2Node, SystemParams params) {
+ private NodeTable makeNodeTable$(Location location, String indexNode2Id, String indexId2Node, StoreParams params) {
FileSet fsNodeToId = new FileSet(location, indexNode2Id) ;
FileSet fsId2Node = new FileSet(location, indexId2Node) ;
NodeTable nt = nodeTableBuilder.buildNodeTable(fsNodeToId, fsId2Node, params) ;
return nt ;
}
- protected NodeTable makeNodeTableNoCache(Location location, String indexNode2Id, String indexId2Node, SystemParams params) {
- SystemParamsBuilder spb = new SystemParamsBuilder(params) ;
+ protected NodeTable makeNodeTableNoCache(Location location, String indexNode2Id, String indexId2Node, StoreParams params) {
+ StoreParamsBuilder spb = new StoreParamsBuilder(params) ;
spb.node2NodeIdCacheSize(-1) ;
spb.nodeId2NodeCacheSize(-1) ;
spb.nodeMissCacheSize(-1) ;
@@ -409,7 +409,7 @@ public class DatasetBuilderStd implement
}
@Override
- public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, SystemParams params) {
+ public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, StoreParams params) {
NodeTable nt = builder.buildNodeTable(fsIndex, fsObjectFile, params) ;
// It just knows, right?
FileRef ref = FileRef.create(fsObjectFile.filename(Names.extNodeData)) ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java Sat Sep 13 17:30:36 2014
@@ -22,5 +22,5 @@ import com.hp.hpl.jena.tdb.base.file.Fil
import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
public interface NodeTableBuilder {
- NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, SystemParams params) ;
+ NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, StoreParams params) ;
}
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParams.java (from r1623855, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParams.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParams.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParams.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParams.java&r1=1623855&r2=1624769&rev=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParams.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParams.java Sat Sep 13 17:30:36 2014
@@ -24,11 +24,11 @@ import com.hp.hpl.jena.tdb.base.block.Fi
import com.hp.hpl.jena.tdb.index.IndexParams ;
/** System parameters for a TDB database instance. */
-public class SystemParams implements IndexParams
+public class StoreParams implements IndexParams
{
// SystemParams are built with a SystemParamsBuilder
- private static SystemParams dftSystemParams = new SystemParamsBuilder().build() ;
+ private static StoreParams dftStoreParams = new StoreParamsBuilder().build() ;
/* These are items you can change JVM to JVM */
@@ -59,13 +59,13 @@ public class SystemParams implements Ind
private final String prefixNode2Id ;
private final String prefixId2Node ;
- public SystemParams(FileMode fileMode, int blockSize, int blockReadCacheSize, int blockWriteCacheSize,
- int node2NodeIdCacheSize, int nodeId2NodeCacheSize, int nodeMissCacheSize,
- String indexNode2Id, String indexId2Node,
- String primaryIndexTriples, String[] tripleIndexes,
- String primaryIndexQuads, String[] quadIndexes,
- String primaryIndexPrefix, String[] prefixIndexes, String indexPrefix,
- String prefixNode2Id, String prefixId2Node) {
+ public StoreParams(FileMode fileMode, int blockSize, int blockReadCacheSize, int blockWriteCacheSize,
+ int node2NodeIdCacheSize, int nodeId2NodeCacheSize, int nodeMissCacheSize,
+ String indexNode2Id, String indexId2Node,
+ String primaryIndexTriples, String[] tripleIndexes,
+ String primaryIndexQuads, String[] quadIndexes,
+ String primaryIndexPrefix, String[] prefixIndexes, String indexPrefix,
+ String prefixNode2Id, String prefixId2Node) {
this.fileMode = fileMode ;
this.blockSize = blockSize ;
this.blockReadCacheSize = blockReadCacheSize ;
@@ -88,8 +88,8 @@ public class SystemParams implements Ind
this.prefixId2Node = prefixId2Node ;
}
- public static SystemParams getDftSystemParams() {
- return dftSystemParams ;
+ public static StoreParams getDftStoreParams() {
+ return dftStoreParams ;
}
@Override
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java (from r1623855, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParamsBuilder.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParamsBuilder.java&r1=1623855&r2=1624769&rev=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/SystemParamsBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/StoreParamsBuilder.java Sat Sep 13 17:30:36 2014
@@ -22,7 +22,7 @@ import com.hp.hpl.jena.tdb.base.block.Fi
import com.hp.hpl.jena.tdb.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-public class SystemParamsBuilder {
+public class StoreParamsBuilder {
// Initial values are the system defaults.
/** Database and query configuration */
@@ -83,10 +83,10 @@ public class SystemParamsBuilder {
// public static String fPrefixId2Node = "prefixId2Node" ;
private String prefixId2Node = Names.prefixId2Node ;
- public static SystemParamsBuilder create() { return new SystemParamsBuilder() ; }
+ public static StoreParamsBuilder create() { return new StoreParamsBuilder() ; }
- public SystemParamsBuilder() {}
- public SystemParamsBuilder(SystemParams other) {
+ public StoreParamsBuilder() {}
+ public StoreParamsBuilder(StoreParams other) {
this.fileMode = other.getFileMode() ;
this.blockSize = other.getBlockSize() ;
this.blockReadCacheSize = other.getBlockReadCacheSize() ;
@@ -109,8 +109,8 @@ public class SystemParamsBuilder {
this.prefixId2Node = other.getIndexId2Node() ;
}
- public SystemParams build() {
- return new SystemParams(
+ public StoreParams build() {
+ return new StoreParams(
fileMode, blockSize, blockReadCacheSize, blockWriteCacheSize,
Node2NodeIdCacheSize, NodeId2NodeCacheSize, NodeMissCacheSize,
indexNode2Id, indexId2Node, primaryIndexTriples, tripleIndexes,
@@ -128,7 +128,7 @@ public class SystemParamsBuilder {
return fileMode ;
}
- public SystemParamsBuilder fileMode(FileMode fileMode) {
+ public StoreParamsBuilder fileMode(FileMode fileMode) {
this.fileMode = fileMode ;
return this ;
}
@@ -137,7 +137,7 @@ public class SystemParamsBuilder {
return blockSize ;
}
- public SystemParamsBuilder blockSize(int blockSize) {
+ public StoreParamsBuilder blockSize(int blockSize) {
this.blockSize = blockSize ;
return this ;
}
@@ -146,7 +146,7 @@ public class SystemParamsBuilder {
return blockReadCacheSize ;
}
- public SystemParamsBuilder blockReadCacheSize(int blockReadCacheSize) {
+ public StoreParamsBuilder blockReadCacheSize(int blockReadCacheSize) {
this.blockReadCacheSize = blockReadCacheSize ;
return this ;
}
@@ -155,7 +155,7 @@ public class SystemParamsBuilder {
return blockWriteCacheSize ;
}
- public SystemParamsBuilder blockWriteCacheSize(int blockWriteCacheSize) {
+ public StoreParamsBuilder blockWriteCacheSize(int blockWriteCacheSize) {
this.blockWriteCacheSize = blockWriteCacheSize ;
return this ;
}
@@ -164,7 +164,7 @@ public class SystemParamsBuilder {
return Node2NodeIdCacheSize ;
}
- public SystemParamsBuilder node2NodeIdCacheSize(int node2NodeIdCacheSize) {
+ public StoreParamsBuilder node2NodeIdCacheSize(int node2NodeIdCacheSize) {
Node2NodeIdCacheSize = node2NodeIdCacheSize ;
return this ;
}
@@ -173,7 +173,7 @@ public class SystemParamsBuilder {
return NodeId2NodeCacheSize ;
}
- public SystemParamsBuilder nodeId2NodeCacheSize(int nodeId2NodeCacheSize) {
+ public StoreParamsBuilder nodeId2NodeCacheSize(int nodeId2NodeCacheSize) {
NodeId2NodeCacheSize = nodeId2NodeCacheSize ;
return this ;
}
@@ -182,7 +182,7 @@ public class SystemParamsBuilder {
return NodeMissCacheSize ;
}
- public SystemParamsBuilder nodeMissCacheSize(int nodeMissCacheSize) {
+ public StoreParamsBuilder nodeMissCacheSize(int nodeMissCacheSize) {
NodeMissCacheSize = nodeMissCacheSize ;
return this ;
}
@@ -191,7 +191,7 @@ public class SystemParamsBuilder {
return indexNode2Id ;
}
- public SystemParamsBuilder indexNode2Id(String indexNode2Id) {
+ public StoreParamsBuilder indexNode2Id(String indexNode2Id) {
this.indexNode2Id = indexNode2Id ;
return this ;
}
@@ -200,7 +200,7 @@ public class SystemParamsBuilder {
return indexId2Node ;
}
- public SystemParamsBuilder indexId2Node(String indexId2Node) {
+ public StoreParamsBuilder indexId2Node(String indexId2Node) {
this.indexId2Node = indexId2Node ;
return this ;
}
@@ -209,7 +209,7 @@ public class SystemParamsBuilder {
return primaryIndexTriples ;
}
- public SystemParamsBuilder primaryIndexTriples(String primaryIndexTriples) {
+ public StoreParamsBuilder primaryIndexTriples(String primaryIndexTriples) {
this.primaryIndexTriples = primaryIndexTriples ;
return this ;
}
@@ -218,12 +218,12 @@ public class SystemParamsBuilder {
return tripleIndexes ;
}
- public SystemParamsBuilder tripleIndexes(String[] tripleIndexes) {
+ public StoreParamsBuilder tripleIndexes(String[] tripleIndexes) {
this.tripleIndexes = tripleIndexes ;
return this ;
}
- public SystemParamsBuilder tripleIndexes(int idx, String tripleIndex) {
+ public StoreParamsBuilder tripleIndexes(int idx, String tripleIndex) {
this.tripleIndexes[idx] = tripleIndex ;
return this ;
}
@@ -232,7 +232,7 @@ public class SystemParamsBuilder {
return primaryIndexQuads ;
}
- public SystemParamsBuilder primaryIndexQuads(String primaryIndexQuads) {
+ public StoreParamsBuilder primaryIndexQuads(String primaryIndexQuads) {
this.primaryIndexQuads = primaryIndexQuads ;
return this ;
}
@@ -241,12 +241,12 @@ public class SystemParamsBuilder {
return quadIndexes ;
}
- public SystemParamsBuilder quadIndexes(int idx, String quadIndex) {
+ public StoreParamsBuilder quadIndexes(int idx, String quadIndex) {
this.quadIndexes[idx] = quadIndex ;
return this ;
}
- public SystemParamsBuilder quadIndexes(String[] quadIndexes) {
+ public StoreParamsBuilder quadIndexes(String[] quadIndexes) {
this.quadIndexes = quadIndexes ;
return this ;
}
@@ -255,7 +255,7 @@ public class SystemParamsBuilder {
return primaryIndexPrefix ;
}
- public SystemParamsBuilder primaryIndexPrefix(String primaryIndexPrefix) {
+ public StoreParamsBuilder primaryIndexPrefix(String primaryIndexPrefix) {
this.primaryIndexPrefix = primaryIndexPrefix ;
return this ;
}
@@ -264,12 +264,12 @@ public class SystemParamsBuilder {
return prefixIndexes ;
}
- public SystemParamsBuilder prefixIndexes(String[] prefixIndexes) {
+ public StoreParamsBuilder prefixIndexes(String[] prefixIndexes) {
this.prefixIndexes = prefixIndexes ;
return this ;
}
- public SystemParamsBuilder prefixIndexes(int idx, String prefixIndex) {
+ public StoreParamsBuilder prefixIndexes(int idx, String prefixIndex) {
this.prefixIndexes[idx] = prefixIndex ;
return this ;
}
@@ -278,7 +278,7 @@ public class SystemParamsBuilder {
return indexPrefix ;
}
- public SystemParamsBuilder indexPrefix(String indexPrefix) {
+ public StoreParamsBuilder indexPrefix(String indexPrefix) {
this.indexPrefix = indexPrefix ;
return this ;
}
@@ -287,7 +287,7 @@ public class SystemParamsBuilder {
return prefixNode2Id ;
}
- public SystemParamsBuilder prefixNode2Id(String prefixNode2Id) {
+ public StoreParamsBuilder prefixNode2Id(String prefixNode2Id) {
this.prefixNode2Id = prefixNode2Id ;
return this ;
}
@@ -296,7 +296,7 @@ public class SystemParamsBuilder {
return prefixId2Node ;
}
- public SystemParamsBuilder prefixId2Node(String prefixId2Node) {
+ public StoreParamsBuilder prefixId2Node(String prefixId2Node) {
this.prefixId2Node = prefixId2Node ;
return this ;
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java Sat Sep 13 17:30:36 2014
@@ -24,5 +24,5 @@ import com.hp.hpl.jena.tdb.base.file.Fil
import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
public interface TupleIndexBuilder {
- TupleIndex buildTupleIndex(FileSet fileSet, ColumnMap colMap, String name, SystemParams params) ;
+ TupleIndex buildTupleIndex(FileSet fileSet, ColumnMap colMap, String name, StoreParams params) ;
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/StorageConfig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/StorageConfig.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/StorageConfig.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/StorageConfig.java Sat Sep 13 17:30:36 2014
@@ -23,20 +23,20 @@ import java.util.Map ;
import com.hp.hpl.jena.tdb.base.block.BlockMgr ;
import com.hp.hpl.jena.tdb.base.file.BufferChannel ;
import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.setup.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.sys.FileRef ;
public class StorageConfig
{
- public final SystemParams params ;
+ public final StoreParams params ;
public final Map<FileRef, BlockMgr> blockMgrs ;
public final Map<FileRef, BufferChannel> bufferChannels ;
public final Map<FileRef, NodeTable> nodeTables ;
public final Location location ;
public final boolean writeable ;
- public StorageConfig(Location location, SystemParams params, boolean writeable,
+ public StorageConfig(Location location, StoreParams params, boolean writeable,
Map<FileRef, BlockMgr> blockMgrs,
Map<FileRef, BufferChannel> bufferChannels,
Map<FileRef, NodeTable> nodeTables)
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableCache.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableCache.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableCache.java Sat Sep 13 17:30:36 2014
@@ -29,7 +29,7 @@ import org.apache.jena.atlas.logging.Log
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.tdb.TDBException ;
-import com.hp.hpl.jena.tdb.setup.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.store.NodeId ;
/** Cache wrapper around a NodeTable.
@@ -49,7 +49,7 @@ public class NodeTableCache implements N
private NodeTable baseTable ;
private Object lock = new Object() ;
- public static NodeTable create(NodeTable nodeTable, SystemParams params) {
+ public static NodeTable create(NodeTable nodeTable, StoreParams params) {
int nodeToIdCacheSize = params.getNode2NodeIdCacheSize() ;
int idToNodeCacheSize = params.getNodeId2NodeCacheSize() ;
if ( nodeToIdCacheSize <= 0 && idToNodeCacheSize <= 0 )
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java Sat Sep 13 17:30:36 2014
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.tdb.index.Index ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
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.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
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 ;
@@ -54,7 +54,7 @@ public class SetupTDB
throw new TDBException(msg) ;
}
- private static SystemParams params = SystemParams.getDftSystemParams() ;
+ private static StoreParams params = StoreParams.getDftStoreParams() ;
// // And here we make datasets ...
// public static DatasetGraphTDB buildDataset(Location location)
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java?rev=1624769&r1=1624768&r2=1624769&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java Sat Sep 13 17:30:36 2014
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.tdb.index.IndexPa
import com.hp.hpl.jena.tdb.setup.BlockMgrBuilder ;
import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
import com.hp.hpl.jena.tdb.setup.NodeTableBuilder ;
-import com.hp.hpl.jena.tdb.setup.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.nodetable.NodeTableInline ;
@@ -119,7 +119,7 @@ public class DatasetBuilderTxn
class NodeTableBuilderTx implements NodeTableBuilder
{
@Override
- public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, SystemParams params) {
+ public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, StoreParams params) {
FileRef ref = FileRef.create(fsObjectFile.filename(Names.extNodeData)) ;
NodeTable ntBase = nodeTables.get(ref) ;
if ( ntBase == null )
@@ -177,7 +177,7 @@ public class DatasetBuilderTxn
class NodeTableBuilderReadonly implements NodeTableBuilder
{
@Override
- public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, SystemParams params) {
+ public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, StoreParams params) {
FileRef ref = FileRef.create(fsObjectFile.filename(Names.extNodeData)) ;
NodeTable nt = nodeTables.get(ref) ;
nt = new NodeTableReadonly(nt) ;
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=1624769&r1=1624768&r2=1624769&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 Sat Sep 13 17:30:36 2014
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.tdb.index.Abstrac
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.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
public class TestTupleIndexRecord extends AbstractTestTupleIndex
@@ -37,7 +37,7 @@ public class TestTupleIndexRecord extend
@Override
protected TupleIndexRecord create(String description)
{
- IndexParams indexParams = SystemParams.getDftSystemParams() ;
+ IndexParams indexParams = StoreParams.getDftStoreParams() ;
RangeIndex rIdx = IndexFactory.buildRangeIndex(FileSet.mem(), factory, indexParams) ;
ColumnMap cmap = new ColumnMap("SPO", description) ;
TupleIndexRecord index = new TupleIndexRecord(3, cmap, description, factory, rIdx) ;
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=1624769&r1=1624768&r2=1624769&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 Sat Sep 13 17:30:36 2014
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.tdb.base.record.R
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.SystemParams ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.store.NodeId ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
@@ -50,7 +50,7 @@ public class TestTupleIndexRecordDirect
static TupleIndexRecord create(String description)
{
- IndexParams indexParams = SystemParams.getDftSystemParams() ;
+ IndexParams indexParams = StoreParams.getDftStoreParams() ;
RangeIndex rIdx = IndexFactory.buildRangeIndex(FileSet.mem(), factory, indexParams) ;
ColumnMap cmap = new ColumnMap("SPO", description) ;
TupleIndexRecord index = new TupleIndexRecord(3, cmap, description, factory, rIdx) ;