Author: andy
Date: Sun Sep 22 09:47:09 2013
New Revision: 1525335
URL: http://svn.apache.org/r1525335
Log:
Open up the possibility of other index designs.
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNodeMgr.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/sys/FileRef.java
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNodeMgr.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNodeMgr.java?rev=1525335&r1=1525334&r2=1525335&view=diff
==============================================================================
---
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNodeMgr.java
(original)
+++
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNodeMgr.java
Sun Sep 22 09:47:09 2013
@@ -52,7 +52,7 @@ public final class BPTreeNodeMgr extends
BPTreePage recordsPage = bpTree.getRecordsMgr().create() ;
if ( recordsPage.getId() != BPlusTreeParams.RootId )
// [TxTDB:PATCH-UP]
- throw new TDBException("Root blocks must be at position zero") ;
+ throw new TDBException("Root blocks must be at position zero (got
"+recordsPage.getId()+")") ;
// Empty data block.
// [TxTDB:PATCH-UP]
recordsPage.write();
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=1525335&r1=1525334&r2=1525335&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
Sun Sep 22 09:47:09 2013
@@ -165,9 +165,10 @@ public class DatasetBuilderStd implement
{
String primary = params.primaryIndexTriples ;
String[] indexes = params.tripleIndexes ;
-
- if ( indexes.length != 3 )
- error(log, "Wrong number of triple table indexes:
"+StrUtils.strjoin(",", indexes)) ;
+
+ // Allow experimentation of other index layouts.
+// if ( indexes.length != 3 )
+// error(log, "Wrong number of triple table indexes:
"+StrUtils.strjoin(",", indexes)) ;
log.debug("Triple table: "+primary+" :: "+StrUtils.strjoin(",",
indexes)) ;
TupleIndex tripleIndexes[] = makeTupleIndexes(location, primary,
indexes) ;
@@ -183,8 +184,9 @@ public class DatasetBuilderStd implement
String primary = params.primaryIndexQuads ;
String[] indexes = params.quadIndexes ;
- if ( indexes.length != 6 )
- error(log, "Wrong number of quad table indexes:
"+StrUtils.strjoin(",", indexes)) ;
+ // Allow experimentation of other index layouts.
+// if ( indexes.length != 6 )
+// error(log, "Wrong number of quad table indexes:
"+StrUtils.strjoin(",", indexes)) ;
log.debug("Quad table: "+primary+" :: "+StrUtils.strjoin(",",
indexes)) ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java?rev=1525335&r1=1525334&r2=1525335&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java
(original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java Sun
Sep 22 09:47:09 2013
@@ -76,39 +76,38 @@ public class FileRef
static {
//printTable() ;
add(journalIdx , journalName) ;
- // The code above produces this:
- // To make it clear and stable, we keep this form.
- add(0+idxOffset , "SPO.idn") ;
- add(1+idxOffset , "SPO.dat") ;
- add(2+idxOffset , "POS.idn") ;
- add(3+idxOffset , "POS.dat") ;
- add(4+idxOffset , "OSP.idn") ;
- add(5+idxOffset , "OSP.dat") ;
- add(6+idxOffset , "GSPO.idn") ;
- add(7+idxOffset , "GSPO.dat") ;
- add(8+idxOffset , "GPOS.idn") ;
- add(9+idxOffset , "GPOS.dat") ;
- add(10+idxOffset , "GOSP.idn") ;
- add(11+idxOffset , "GOSP.dat") ;
- add(12+idxOffset , "POSG.idn") ;
- add(13+idxOffset , "POSG.dat") ;
- add(14+idxOffset , "OSPG.idn") ;
- add(15+idxOffset , "OSPG.dat") ;
- add(16+idxOffset , "SPOG.idn") ;
- add(17+idxOffset , "SPOG.dat") ;
- add(18+idxOffset , "prefixes.idn") ;
- add(19+idxOffset , "prefixes.dat") ;
- add(20+idxOffset , "prefix2id.idn") ;
- add(21+idxOffset , "prefix2id.dat") ;
- add(22+idxOffset , "nodes.dat") ;
- add(23+idxOffset , "node2id.idn") ;
- add(24+idxOffset , "node2id.dat") ;
- add(25+idxOffset , "prefixIdx.idn") ;
- add(26+idxOffset , "prefixIdx.dat") ;
+
+ file("SPO.idn") ;
+ file("SPO.dat") ;
+ file("POS.idn") ;
+ file("POS.dat") ;
+ file("OSP.idn") ;
+ file("OSP.dat") ;
+ file("GSPO.idn") ;
+ file("GSPO.dat") ;
+ file("GPOS.idn") ;
+ file("GPOS.dat") ;
+ file("GOSP.idn") ;
+ file("GOSP.dat") ;
+ file("POSG.idn") ;
+ file("POSG.dat") ;
+ file("OSPG.idn") ;
+ file("OSPG.dat") ;
+ file("SPOG.idn") ;
+ file("SPOG.dat") ;
+ file("prefixes.idn") ;
+ file("prefixes.dat") ;
+ file("prefix2id.idn") ;
+ file("prefix2id.dat") ;
+ file("nodes.dat") ;
+ file("node2id.idn") ;
+ file("node2id.dat") ;
+ file("prefixIdx.idn") ;
+ file("prefixIdx.dat") ;
- add(50+idxOffset , "TEST") ;
- add(51+idxOffset , "TEST1") ;
- add(52+idxOffset , "TEST2") ;
+ add(1000+idxOffset, "TEST") ;
+ add(1001+idxOffset, "TEST1") ;
+ add(1002+idxOffset, "TEST2") ;
}
public static final FileRef Journal = get(journalIdx) ;
@@ -128,8 +127,7 @@ public class FileRef
public static void file(String name)
{
int idx = name2id.size() + idxOffset ;
- name2id.put(name, idx) ;
- id2name.put(idx, new FileRef(name, idx)) ;
+ add(idx, name) ;
}
// --------
