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 2011/05/22 21:35:05 UTC
svn commit: r1126201 - in /incubator/jena/Experimental/TxTDB/trunk:
src-dev/tx/TxMain.java
src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java
Author: andy
Date: Sun May 22 19:35:05 2011
New Revision: 1126201
URL: http://svn.apache.org/viewvc?rev=1126201&view=rev
Log: (empty)
Modified:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java?rev=1126201&r1=1126200&r2=1126201&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java Sun May 22 19:35:05 2011
@@ -29,7 +29,6 @@ import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.util.QueryExecUtils ;
-import com.hp.hpl.jena.tdb.base.block.Block ;
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.block.BlockMgrLogger ;
@@ -69,30 +68,46 @@ public class TxMain
public static void main(String... args)
{
- tree_ins_2_01() ; exit(0) ;
+ test() ; exit(0) ;
+ //tree_ins_2_01() ; exit(0) ;
//test.BPlusTreeRun.main("test", "--bptree:track", "3", "125", "100000") ; exit(0) ;
//test.BPlusTreeRun.main("perf", "3", "125", "100") ; exit(0) ;
//test.BPlusTreeRun.main("test", "--bptree:check", "3", "125", "100000") ; exit(0) ;
- BlockMgr blkMgr = BlockMgrFactory.createMem("test", 100) ;
- blkMgr = BlockMgrTracker.track("foo", blkMgr) ;
- blkMgr.beginUpdate() ;
- Block block = blkMgr.allocate(-1) ;
- blkMgr.release(block) ;
- blkMgr.release(block) ; // Need to check where an active block is - promote is one read -> write?
- Block block2 = blkMgr.allocate(-1) ;
- blkMgr.endUpdate() ;
-
exit(0) ;
-
bpTreeTracking() ; exit(0) ;
transactional() ; exit(0) ;
}
+
+ public static void test()
+ {
+ //int[] keys = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+ int[] keys = {9,8,7,6,5,4,3,2,1,0};
+ RangeIndex rIndex = makeRangeIndex(2) ;
+ IndexTestLib.add(rIndex, keys) ;
+
+ for ( Record r : rIndex )
+ {
+ System.out.println(r) ;
+ System.out.flush() ;
+ }
+
+ //List<Integer> x = toIntList(rIndex.iterator());
+
+
+ // int[] keys = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+ // RangeIndex rIndex = make(2, keys) ;
+ // Iterator<Record> iter1 = rIndex.iterator() ;
+ // Iterator<Record> iter2 = rIndex.iterator() ;
+ // iter1.next() ;
+ // iter2.next() ;
+ }
+
@Test public static void tree_ins_2_01()
{
int[] keys = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
@@ -123,16 +138,6 @@ public class TxMain
return rIndex ;
}
- public static void test()
- {
- int[] keys = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
- RangeIndex rIndex = make(2, keys) ;
- Iterator<Record> iter1 = rIndex.iterator() ;
- Iterator<Record> iter2 = rIndex.iterator() ;
- iter1.next() ;
- iter2.next() ;
- }
-
public static void bpTreeTracking(String... args)
{
final Logger log = LoggerFactory.getLogger("BPlusTree") ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java?rev=1126201&r1=1126200&r2=1126201&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java Sun May 22 19:35:05 2011
@@ -61,6 +61,7 @@ public class BlockMgrTracker /*extends B
}
private int inRead = 0 ;
+ private int inIterator = 0 ;
private boolean inUpdate = false ;
private final Logger log ;
@@ -360,7 +361,7 @@ public class BlockMgrTracker /*extends B
private void checkReadOrIter(Action action)
{
- if ( ! inUpdate && inRead == 0 && activeIterBlocks.size() == 0 )
+ if ( ! inUpdate && inRead == 0 && activeIterators.size() == 0 )
error(action, "Called outside update, read or an iterator") ;
}