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/21 22:09:18 UTC
svn commit: r1125793 - in /incubator/jena/Experimental/TxTDB/trunk:
src-dev/test/ src-dev/tx/ src/main/java/com/hp/hpl/jena/tdb/base/block/
src/main/java/com/hp/hpl/jena/tdb/base/file/
src/test/java/com/hp/hpl/jena/tdb/base/block/ src/test/java/com/hp/...
Author: andy
Date: Sat May 21 20:09:17 2011
New Revision: 1125793
URL: http://svn.apache.org/viewvc?rev=1125793&view=rev
Log: (empty)
Added:
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccess.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessBase.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessByteArray.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessByteArray.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java (contents, props changed)
- copied, changed from r1125428, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessDirect.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMapped.java (contents, props changed)
- copied, changed from r1125428, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMapped.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMem.java (contents, props changed)
- copied, changed from r1125428, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMem.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrTracked.java (contents, props changed)
- copied, changed from r1125747, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestBlockMgr.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessFixedSize.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessFixedSize.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessVarSize.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessVarSize.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestChannel.java (contents, props changed)
- copied, changed from r1125747, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestStorage.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessByteArray.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessByteArray.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessDirect.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessDirect.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMapped.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMapped.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMem.java (contents, props changed)
- copied, changed from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMem.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelFile.java (contents, props changed)
- copied, changed from r1125747, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageFile.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelMem.java (contents, props changed)
- copied, changed from r1125747, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageMem.java
Removed:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestBlockMgr.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccess.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessBase.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessByteArray.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessDirect.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMapped.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMem.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessFixedSize.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessVarSize.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestStorage.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessByteArray.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessDirect.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMapped.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMem.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageFile.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageMem.java
Modified:
incubator/jena/Experimental/TxTDB/trunk/src-dev/test/BPlusTreeRun.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/test/RunnerRangeIndex.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFileAccess.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/Channel.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TS_Block.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrDirect.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMapped.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TS_File.java
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/test/BPlusTreeRun.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/test/BPlusTreeRun.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/test/BPlusTreeRun.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/test/BPlusTreeRun.java Sat May 21 20:09:17 2011
@@ -9,7 +9,7 @@ package test;
import org.openjena.atlas.logging.Log ;
-import com.hp.hpl.jena.tdb.base.file.FileAccessMem ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccessMem ;
import com.hp.hpl.jena.tdb.index.RangeIndexMaker ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTreeMaker ;
@@ -48,14 +48,14 @@ public class BPlusTreeRun extends Runner
BPlusTreeParams.CheckingTree = true ;
BPlusTreeParams.CheckingNode = true ;
SystemTDB.NullOut = true ;
- FileAccessMem.SafeMode = true ;
+ BlockAccessMem.SafeMode = true ;
break ;
case perf:
showProgress = false ;
BPlusTreeParams.CheckingTree = false ;
BPlusTreeParams.CheckingNode = false ;
SystemTDB.NullOut = false ;
- FileAccessMem.SafeMode = false ;
+ BlockAccessMem.SafeMode = false ;
break ;
}
}
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/test/RunnerRangeIndex.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/test/RunnerRangeIndex.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/test/RunnerRangeIndex.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/test/RunnerRangeIndex.java Sat May 21 20:09:17 2011
@@ -10,7 +10,7 @@ import java.util.List ;
import org.apache.log4j.Level ;
import org.openjena.atlas.test.ExecGenerator ;
-import com.hp.hpl.jena.tdb.base.file.FileAccessMem ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccessMem ;
import com.hp.hpl.jena.tdb.index.IndexTestGenerator ;
import com.hp.hpl.jena.tdb.index.RangeIndexMaker ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTreeParams ;
@@ -79,14 +79,14 @@ public abstract class RunnerRangeIndex e
BPlusTreeParams.CheckingTree = true ;
BPlusTreeParams.CheckingNode = false ;
SystemTDB.NullOut = true ;
- FileAccessMem.SafeMode = true ;
+ BlockAccessMem.SafeMode = true ;
}
else if ( a.equalsIgnoreCase("bptree:checknode") )
{
BPlusTreeParams.CheckingTree = true ;
BPlusTreeParams.CheckingNode = true ;
SystemTDB.NullOut = true ;
- FileAccessMem.SafeMode = true ;
+ BlockAccessMem.SafeMode = true ;
}
else if ( a.equalsIgnoreCase("bptree:log") )
{
@@ -100,7 +100,7 @@ public abstract class RunnerRangeIndex e
org.apache.log4j.LogManager.getLogger("bptree.block").setLevel(Level.DEBUG) ;
}
else if ( a.equalsIgnoreCase("block:safe") )
- FileAccessMem.SafeMode = true ;
+ BlockAccessMem.SafeMode = true ;
else if ( a.equalsIgnoreCase("check") )
{
BPlusTreeParams.CheckingNode = false;
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java Sat May 21 20:09:17 2011
@@ -4,18 +4,11 @@ package tx;
public class DevTx
{
// Run tests with BlockMgrFactory.tracked on.
- // Version of FileAccess where you can give the read size.
- // FileAccess over Storage??
- // Reorganise - one package for all basic file access.
- // FileAccess ==> BlockAccess
- // Storage ==> FileStorage
// Test with overlapping iterators.
// Storage+Adler32
- // test for block managers and tracking.
-
// Ref counting get/release.
// Tidy up
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java Sat May 21 20:09:17 2011
@@ -10,10 +10,10 @@ package com.hp.hpl.jena.tdb.base.block;
import java.io.File;
import com.hp.hpl.jena.tdb.TDBException;
-import com.hp.hpl.jena.tdb.base.file.FileAccess ;
-import com.hp.hpl.jena.tdb.base.file.FileAccessDirect ;
-import com.hp.hpl.jena.tdb.base.file.FileAccessMapped ;
-import com.hp.hpl.jena.tdb.base.file.FileAccessMem ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccess ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccessDirect ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccessMapped ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccessMem ;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.sys.SystemTDB;
@@ -44,7 +44,7 @@ public class BlockMgrFactory
/** Create an in-memory block manager */
public static BlockMgr createMem(String indexName, int blockSize)
{
- FileAccess file = new FileAccessMem(blockSize) ;
+ BlockAccess file = new BlockAccessMem(blockSize) ;
BlockMgr blockMgr = new BlockMgrFileAccess(file, blockSize) ;
blockMgr = new BlockMgrFreeChain(blockMgr) ;
@@ -70,7 +70,7 @@ public class BlockMgrFactory
/** Create a NIO Block Manager */
public static BlockMgr createMMapFile(String filename, int blockSize)
{
- FileAccess file = new FileAccessMapped(filename, blockSize) ;
+ BlockAccess file = new BlockAccessMapped(filename, blockSize) ;
BlockMgr blockMgr = wrapFileAccess(file, blockSize) ;
return track(blockMgr) ;
}
@@ -78,7 +78,7 @@ public class BlockMgrFactory
/** Create a Block Manager using direct access (and a cache) */
public static BlockMgr createStdFile(String filename, int blockSize, int readBlockCacheSize, int writeBlockCacheSize)
{
- FileAccess file = new FileAccessDirect(filename, blockSize) ;
+ BlockAccess file = new BlockAccessDirect(filename, blockSize) ;
BlockMgr blockMgr = wrapFileAccess(file, blockSize) ;
String fn = filename ;
@@ -93,14 +93,14 @@ public class BlockMgrFactory
/** Create a Block Manager using direct access, no caching, no nothing. */
public static BlockMgr createStdFileNoCache(String filename, int blockSize)
{
- FileAccess fileAccess = new FileAccessDirect(filename, blockSize) ;
- BlockMgr blockMgr = new BlockMgrFileAccess(fileAccess, blockSize) ;
+ BlockAccess blockAccess = new BlockAccessDirect(filename, blockSize) ;
+ BlockMgr blockMgr = new BlockMgrFileAccess(blockAccess, blockSize) ;
return blockMgr ;
}
- private static BlockMgr wrapFileAccess(FileAccess fileAccess, int blockSize)
+ private static BlockMgr wrapFileAccess(BlockAccess blockAccess, int blockSize)
{
- BlockMgr blockMgr = new BlockMgrFileAccess(fileAccess, blockSize) ;
+ BlockMgr blockMgr = new BlockMgrFileAccess(blockAccess, blockSize) ;
// This is a temporary fix to the problem
blockMgr = new BlockMgrFreeChain(blockMgr) ;
return blockMgr ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFileAccess.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFileAccess.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFileAccess.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFileAccess.java Sat May 21 20:09:17 2011
@@ -10,7 +10,7 @@ import static java.lang.String.format ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
-import com.hp.hpl.jena.tdb.base.file.FileAccess ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccess ;
/** Block manager that maps from the FileAccess layer to a BlockMgr.
* Add free block management (but we should layer with BlockMgrFreeChain)
@@ -21,14 +21,14 @@ public class BlockMgrFileAccess extends
{
private static Logger log = LoggerFactory.getLogger(BlockMgrFileAccess.class) ;
- private final FileAccess file ;
+ private final BlockAccess file ;
private boolean closed = false ;
// Create via the BlockMgrFactory.
- /*package*/ BlockMgrFileAccess(FileAccess fileAccess, int blockSize)
+ /*package*/ BlockMgrFileAccess(BlockAccess blockAccess, int blockSize)
{
super(blockSize) ;
- file = fileAccess ;
+ file = blockAccess ;
}
@Override
Copied: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccess.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccess.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccess.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java Sat May 21 20:09:17 2011
@@ -14,7 +14,7 @@ import com.hp.hpl.jena.tdb.base.block.Bl
/** Interface to concrete storage.
* This is wrapped in a BlockMgrAccess to provide a higher level abstraction.
*/
-public interface FileAccess extends Sync, Closeable
+public interface BlockAccess extends Sync, Closeable
{
public Block allocate(int size) ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessBase.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessBase.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessBase.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java Sat May 21 20:09:17 2011
@@ -22,7 +22,7 @@ import com.hp.hpl.jena.tdb.base.block.Bl
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
/** Support for a disk file backed FileAccess */
-public abstract class FileAccessBase implements FileAccess
+public abstract class BlockAccessBase implements BlockAccess
{
final protected int blockSize ;
protected final String filename ;
@@ -33,7 +33,7 @@ public abstract class FileAccessBase imp
protected final AtomicLong seq ; // Id (future)
protected boolean isEmpty = false ;
- public FileAccessBase(String filename, int blockSize)
+ public BlockAccessBase(String filename, int blockSize)
{
//super(filename) ;
this.blockSize = blockSize ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessByteArray.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessByteArray.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessByteArray.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessByteArray.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessByteArray.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessByteArray.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessByteArray.java Sat May 21 20:09:17 2011
@@ -14,13 +14,13 @@ import static com.hp.hpl.jena.tdb.sys.Sy
/**
* FileAccess interface backed by a byte array.
*/
-public class FileAccessByteArray implements FileAccess
+public class BlockAccessByteArray implements BlockAccess
{
private ByteBuffer bytes ;
private long length ; // Bytes in use: 0 to length-1
private long alloc ; // Bytes allocated
- public FileAccessByteArray()
+ public BlockAccessByteArray()
{
bytes = ByteBuffer.allocate(1024) ;
length = 0 ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessByteArray.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java (from r1125428, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessDirect.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessDirect.java&r1=1125428&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessDirect.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java Sat May 21 20:09:17 2011
@@ -17,11 +17,11 @@ import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.tdb.base.block.Block ;
-public class FileAccessDirect extends FileAccessBase
+public class BlockAccessDirect extends BlockAccessBase
{
- private static Logger log = LoggerFactory.getLogger(FileAccessDirect.class) ;
+ private static Logger log = LoggerFactory.getLogger(BlockAccessDirect.class) ;
- public FileAccessDirect(String filename, int blockSize)
+ public BlockAccessDirect(String filename, int blockSize)
{
super(filename, blockSize) ;
}
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMapped.java (from r1125428, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMapped.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMapped.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMapped.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMapped.java&r1=1125428&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMapped.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMapped.java Sat May 21 20:09:17 2011
@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
/** FileAccess for a file, using memory mapped I/O */
final
-public class FileAccessMapped extends FileAccessBase
+public class BlockAccessMapped extends BlockAccessBase
{
/* Blocks are addressed by positive ints -
* Is that a limit?
@@ -32,7 +32,7 @@ public class FileAccessMapped extends Fi
* No limit at the moment - later performance tuning will see what the cost of 48 or 63 bit addresses would be.
*/
- private static Logger log = LoggerFactory.getLogger(FileAccessMapped.class) ;
+ private static Logger log = LoggerFactory.getLogger(BlockAccessMapped.class) ;
// Segmentation avoids over-mapping; allows file to grow (in chunks)
private final int GrowthFactor = 2 ;
@@ -46,7 +46,7 @@ public class FileAccessMapped extends Fi
private int segmentDirtyCount = 0 ;
private boolean[] segmentDirty = new boolean[initialNumSegements] ;
- public FileAccessMapped(String filename, int blockSize)
+ public BlockAccessMapped(String filename, int blockSize)
{
super(filename, blockSize) ;
blocksPerSegment = SegmentSize/blockSize ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMapped.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMem.java (from r1125428, incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMem.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMem.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMem.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMem.java&r1=1125428&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/FileAccessMem.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMem.java Sat May 21 20:09:17 2011
@@ -21,7 +21,7 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
* This is very inefficient but a better simulation of a disk.
*/
-public class FileAccessMem implements FileAccess
+public class BlockAccessMem implements BlockAccess
{
public static boolean SafeMode = true ;
static final boolean Checking = true ;
@@ -30,12 +30,12 @@ public class FileAccessMem implements Fi
private final boolean safeModeThisMgr ;
protected final int blockSize ;
- public FileAccessMem(int blockSize)
+ public BlockAccessMem(int blockSize)
{
this(blockSize, SafeMode) ;
}
- private FileAccessMem(int blockSize, boolean b)
+ private BlockAccessMem(int blockSize, boolean b)
{
this.blockSize = blockSize ;
safeModeThisMgr = b ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessMem.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/Channel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/Channel.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/Channel.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/Channel.java Sat May 21 20:09:17 2011
@@ -14,7 +14,7 @@ import org.openjena.atlas.lib.Sync ;
/** Interface to storage : a simplified version of FileChannel.
* This also enables use to implement memory-bcked versions.
- * @see FileAccess
+ * @see BlockAccess
*/
public interface Channel extends Sync, Closeable
{
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TS_Block.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TS_Block.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TS_Block.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TS_Block.java Sat May 21 20:09:17 2011
@@ -1,5 +1,6 @@
/*
* (c) Copyright 2008, 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
* All rights reserved.
* [See end of file]
*/
@@ -11,9 +12,10 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestBlockMgrMem.class,
- TestBlockMgrDirect.class,
- TestBlockMgrMapped.class
+ TestBlockMgrMem.class
+ , TestBlockMgrDirect.class
+ , TestBlockMgrMapped.class
+ , TestBlockMgrTracked.class
})
@@ -22,6 +24,7 @@ public class TS_Block
/*
* (c) Copyright 2008, 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrDirect.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrDirect.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrDirect.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrDirect.java Sat May 21 20:09:17 2011
@@ -12,8 +12,8 @@ import org.junit.BeforeClass;
import org.openjena.atlas.lib.FileOps ;
import com.hp.hpl.jena.tdb.ConfigTest;
-import com.hp.hpl.jena.tdb.base.file.FileAccess ;
-import com.hp.hpl.jena.tdb.base.file.FileAccessDirect ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccess ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccessDirect ;
public class TestBlockMgrDirect extends AbstractTestBlockMgr
{
@@ -27,7 +27,7 @@ public class TestBlockMgrDirect extends
{
// Make directly - no wrapper, no cache, no free block mgt.
FileOps.delete(filename) ;
- FileAccess file = new FileAccessDirect(filename, BlkSize) ;
+ BlockAccess file = new BlockAccessDirect(filename, BlkSize) ;
return new BlockMgrFileAccess(file, BlkSize) ;
}
}
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMapped.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMapped.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMapped.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMapped.java Sat May 21 20:09:17 2011
@@ -13,8 +13,8 @@ import org.openjena.atlas.lib.FileOps ;
import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.tdb.ConfigTest ;
-import com.hp.hpl.jena.tdb.base.file.FileAccess ;
-import com.hp.hpl.jena.tdb.base.file.FileAccessMapped ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccess ;
+import com.hp.hpl.jena.tdb.base.file.BlockAccessMapped ;
public class TestBlockMgrMapped extends AbstractTestBlockMgr
{
@@ -45,7 +45,7 @@ public class TestBlockMgrMapped extends
protected BlockMgr make()
{
clearBlockMgr() ;
- FileAccess file = new FileAccessMapped(filename, BlkSize) ;
+ BlockAccess file = new BlockAccessMapped(filename, BlkSize) ;
return new BlockMgrFileAccess(file, BlkSize) ;
}
}
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrTracked.java (from r1125747, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestBlockMgr.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrTracked.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrTracked.java&p1=incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestBlockMgr.java&r1=1125747&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestBlockMgr.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrTracked.java Sat May 21 20:09:17 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package tx;
+package com.hp.hpl.jena.tdb.base.block;
import java.nio.ByteBuffer ;
@@ -19,7 +19,7 @@ import com.hp.hpl.jena.tdb.base.block.Bl
import com.hp.hpl.jena.tdb.base.block.BlockMgrFactory ;
import com.hp.hpl.jena.tdb.base.block.BlockMgrTracker ;
-public class TestBlockMgr extends BaseTest
+public class TestBlockMgrTracked extends BaseTest
{
// Mainly testing the tracking
@@ -28,25 +28,9 @@ public class TestBlockMgr extends BaseTe
@AfterClass static public void afterClass() { BlockMgrTracker.verbose = b ;}
- @Test public void block_01()
+ @Test public void track_01()
{
BlockMgr mgr = BlockMgrFactory.createMem("BPTRecord", 4) ;
- Block block = mgr.allocate(4) ;
- ByteBuffer bb = block.getByteBuffer() ;
- bb.putInt(0,1234) ;
- mgr.write(block) ;
- mgr.release(block) ;
- // -----
- Block block2 = mgr.getRead(block.getId()) ;
- ByteBuffer bb2 = block2.getByteBuffer() ;
- assertArrayEquals(bb.array(), bb2.array()) ;
- mgr.release(block2) ;
- }
-
- @Test public void block_02()
- {
- // Same - with tracking.
- BlockMgr mgr = BlockMgrFactory.createMem("BPTRecord", 4) ;
mgr = BlockMgrFactory.tracker(mgr) ;
mgr.beginUpdate() ;
Block block = mgr.allocate(4) ;
@@ -81,7 +65,7 @@ public class TestBlockMgr extends BaseTe
mgr.endUpdate() ;
}
- @Test public void block_03()
+ @Test public void track_02()
{
BlockMgr mgr = setup() ;
write(mgr, 1234) ;
@@ -101,7 +85,7 @@ public class TestBlockMgr extends BaseTe
}
@Test(expected=BlockException.class)
- public void block_04()
+ public void track_03()
{
BlockMgr mgr = setup() ;
write(mgr, 1234) ;
@@ -113,7 +97,7 @@ public class TestBlockMgr extends BaseTe
}
@Test(expected=BlockException.class)
- public void block_05()
+ public void track_04()
{
BlockMgr mgr = setup() ;
write(mgr, 1234) ;
@@ -124,7 +108,7 @@ public class TestBlockMgr extends BaseTe
}
@Test(expected=BlockException.class)
- public void block_06()
+ public void track_05()
{
BlockMgr mgr = setup() ;
mgr.beginRead() ;
@@ -132,7 +116,7 @@ public class TestBlockMgr extends BaseTe
}
@Test(expected=BlockException.class)
- public void block_07()
+ public void track_06()
{
BlockMgr mgr = setup() ;
mgr.beginUpdate() ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrTracked.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessFixedSize.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessFixedSize.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessFixedSize.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessFixedSize.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessFixedSize.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessFixedSize.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessFixedSize.java Sat May 21 20:09:17 2011
@@ -13,19 +13,19 @@ import org.openjena.atlas.junit.BaseTest
import com.hp.hpl.jena.tdb.base.block.Block ;
-public abstract class AbstractTestFileAccessFixedSize extends BaseTest
+public abstract class AbstractTestBlockAccessFixedSize extends BaseTest
{
// Fixed block tests.
int blkSize ;
- protected AbstractTestFileAccessFixedSize(int blkSize)
+ protected AbstractTestBlockAccessFixedSize(int blkSize)
{
this.blkSize = blkSize ;
}
- protected abstract FileAccess make() ;
- protected static Block data(FileAccess file, int len)
+ protected abstract BlockAccess make() ;
+ protected static Block data(BlockAccess file, int len)
{
Block b = file.allocate(len) ;
for (int i = 0 ; i < len ; i++ )
@@ -48,20 +48,20 @@ public abstract class AbstractTestFileAc
@Test public void fileaccess_01()
{
- FileAccess file = make() ;
+ BlockAccess file = make() ;
assertTrue(file.isEmpty()) ;
}
@Test public void fileaccess_02()
{
- FileAccess file = make() ;
+ BlockAccess file = make() ;
Block b = data(file, blkSize) ;
file.write(b) ;
}
@Test public void fileaccess_03()
{
- FileAccess file = make() ;
+ BlockAccess file = make() ;
Block b1 = data(file, blkSize) ;
file.write(b1) ;
int x = b1.getId() ;
@@ -75,7 +75,7 @@ public abstract class AbstractTestFileAc
@Test public void fileaccess_04()
{
- FileAccess file = make() ;
+ BlockAccess file = make() ;
Block b1 = data(file, blkSize) ;
Block b2 = data(file, blkSize) ;
file.write(b1) ;
@@ -91,7 +91,7 @@ public abstract class AbstractTestFileAc
@Test(expected=FileException.class)
public void fileaccess_05()
{
- FileAccess file = make() ;
+ BlockAccess file = make() ;
Block b1 = data(file, 10) ;
Block b2 = data(file, 20) ;
file.write(b1) ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessFixedSize.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessVarSize.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessVarSize.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessVarSize.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessVarSize.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessVarSize.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestFileAccessVarSize.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessVarSize.java Sat May 21 20:09:17 2011
@@ -11,9 +11,9 @@ import org.junit.Test ;
import com.hp.hpl.jena.tdb.base.block.Block ;
-public abstract class AbstractTestFileAccessVarSize extends AbstractTestFileAccessFixedSize
+public abstract class AbstractTestBlockAccessVarSize extends AbstractTestBlockAccessFixedSize
{
- protected AbstractTestFileAccessVarSize()
+ protected AbstractTestBlockAccessVarSize()
{
super(25) ;
}
@@ -21,7 +21,7 @@ public abstract class AbstractTestFileAc
@Test
public void fileaccess_50()
{
- FileAccess file = make() ;
+ BlockAccess file = make() ;
Block b1 = data(file, 10) ;
Block b2 = data(file, 20) ;
file.write(b1) ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessVarSize.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestChannel.java (from r1125747, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestStorage.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestChannel.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestChannel.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestStorage.java&r1=1125747&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestStorage.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestChannel.java Sat May 21 20:09:17 2011
@@ -13,7 +13,7 @@ import com.hp.hpl.jena.tdb.base.file.Cha
import org.junit.Test ;
import org.openjena.atlas.junit.BaseTest ;
-public abstract class AbstractTestStorage extends BaseTest
+public abstract class AbstractTestChannel extends BaseTest
{
protected abstract Channel make() ;
static final int blkSize = 100 ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestChannel.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TS_File.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TS_File.java?rev=1125793&r1=1125792&r2=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TS_File.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TS_File.java Sat May 21 20:09:17 2011
@@ -13,13 +13,13 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
TestMetaFile.class
- , TestStorageMem.class
- , TestStorageFile.class
+ , TestChannelMem.class
+ , TestChannelFile.class
, TestStringFile.class
- , TestFileAccessMem.class
- , TestFileAccessByteArray.class
- , TestFileAccessDirect.class
- , TestFileAccessMapped.class
+ , TestBlockAccessMem.class
+ , TestBlockAccessByteArray.class
+ , TestBlockAccessDirect.class
+ , TestBlockAccessMapped.class
})
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessByteArray.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessByteArray.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessByteArray.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessByteArray.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessByteArray.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessByteArray.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessByteArray.java Sat May 21 20:09:17 2011
@@ -6,13 +6,13 @@
package com.hp.hpl.jena.tdb.base.file;
-public class TestFileAccessByteArray extends AbstractTestFileAccessVarSize
+public class TestBlockAccessByteArray extends AbstractTestBlockAccessVarSize
{
@Override
- protected FileAccess make()
+ protected BlockAccess make()
{
- return new FileAccessByteArray() ;
+ return new BlockAccessByteArray() ;
}
}
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessByteArray.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessDirect.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessDirect.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessDirect.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessDirect.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessDirect.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessDirect.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessDirect.java Sat May 21 20:09:17 2011
@@ -11,12 +11,12 @@ import org.openjena.atlas.lib.FileOps ;
import com.hp.hpl.jena.tdb.ConfigTest ;
-public class TestFileAccessDirect extends AbstractTestFileAccessFixedSize
+public class TestBlockAccessDirect extends AbstractTestBlockAccessFixedSize
{
static String filename = ConfigTest.getTestingDir()+"/test-file-access-direct" ;
static final int BlockSize = 50 ;
- public TestFileAccessDirect()
+ public TestBlockAccessDirect()
{
super(BlockSize) ;
}
@@ -24,10 +24,10 @@ public class TestFileAccessDirect extend
@AfterClass public static void cleanup() { FileOps.deleteSilent(filename) ; }
@Override
- protected FileAccess make()
+ protected BlockAccess make()
{
FileOps.deleteSilent(filename) ;
- return new FileAccessDirect(filename, BlockSize) ;
+ return new BlockAccessDirect(filename, BlockSize) ;
}
}
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessDirect.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMapped.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMapped.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMapped.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMapped.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMapped.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMapped.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMapped.java Sat May 21 20:09:17 2011
@@ -11,12 +11,12 @@ import org.openjena.atlas.lib.FileOps ;
import com.hp.hpl.jena.tdb.ConfigTest ;
-public class TestFileAccessMapped extends AbstractTestFileAccessFixedSize
+public class TestBlockAccessMapped extends AbstractTestBlockAccessFixedSize
{
static String filename = ConfigTest.getTestingDir()+"/test-file-access-mapped" ;
static final int BlockSize = 64 ;
- public TestFileAccessMapped()
+ public TestBlockAccessMapped()
{
super(BlockSize) ;
}
@@ -24,10 +24,10 @@ public class TestFileAccessMapped extend
@AfterClass public static void cleanup() { FileOps.deleteSilent(filename) ; }
@Override
- protected FileAccess make()
+ protected BlockAccess make()
{
FileOps.deleteSilent(filename) ;
- return new FileAccessMapped(filename, BlockSize) ;
+ return new BlockAccessMapped(filename, BlockSize) ;
}
}
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMapped.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMem.java (from r1125503, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMem.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMem.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMem.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMem.java&r1=1125503&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestFileAccessMem.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMem.java Sat May 21 20:09:17 2011
@@ -6,18 +6,18 @@
package com.hp.hpl.jena.tdb.base.file;
-public class TestFileAccessMem extends AbstractTestFileAccessFixedSize
+public class TestBlockAccessMem extends AbstractTestBlockAccessFixedSize
{
static final int BlockSize = 50 ;
- public TestFileAccessMem()
+ public TestBlockAccessMem()
{
super(BlockSize) ;
}
@Override
- protected FileAccess make()
+ protected BlockAccess make()
{
- return new FileAccessMem(BlockSize) ;
+ return new BlockAccessMem(BlockSize) ;
}
}
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMem.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelFile.java (from r1125747, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageFile.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelFile.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelFile.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageFile.java&r1=1125747&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageFile.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelFile.java Sat May 21 20:09:17 2011
@@ -13,7 +13,7 @@ import com.hp.hpl.jena.tdb.ConfigTest ;
import com.hp.hpl.jena.tdb.base.file.Channel ;
import com.hp.hpl.jena.tdb.base.file.ChannelFile ;
-public class TestStorageFile extends AbstractTestStorage
+public class TestChannelFile extends AbstractTestChannel
{
static String filename = ConfigTest.getTestingDir()+"/test-storage" ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelFile.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelMem.java (from r1125747, incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageMem.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelMem.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelMem.java&p1=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageMem.java&r1=1125747&r2=1125793&rev=1125793&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestStorageMem.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelMem.java Sat May 21 20:09:17 2011
@@ -10,7 +10,7 @@ import com.hp.hpl.jena.tdb.base.file.Cha
import com.hp.hpl.jena.tdb.base.file.ChannelMem ;
-public class TestStorageMem extends AbstractTestStorage
+public class TestChannelMem extends AbstractTestChannel
{
static int counter = 0 ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelMem.java
------------------------------------------------------------------------------
svn:mime-type = text/plain