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/05 21:44:37 UTC
svn commit: r1622772 [1/2] - 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/index/factories/
main/java/com/hp/hpl/jena/tdb/lib/ main/java/com/hp/hpl/jena/tdb/node...
Author: andy
Date: Fri Sep 5 19:44:35 2014
New Revision: 1622772
URL: http://svn.apache.org/r1622772
Log:
Refactor to separate general index code from specific use for a store
Added:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexFactory.java
- copied, changed from r1622769, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexRangeFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/B.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/
- copied from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableFactory.java
- copied, changed from r1622717, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableWrapper.java
- copied, changed from r1622698, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableWrapper.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTable.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableConcrete.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableConcrete.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableView.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableView.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableWrapper.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableWrapper.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndex.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndex.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexBase.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexRecord.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexRecord.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexWrapper.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexWrapper.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleTable.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndex.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexRecord.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexWrapper.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleTable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestIndex.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestRangeIndex.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestRangeIndex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/
- copied from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TS_TupleTable.java (with props)
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecord.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecordDirect.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleTable.java
- copied, changed from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleTable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleIndexRecord.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleIndexRecordDirect.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleTable.java
Removed:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexRangeFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndex.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexRecord.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexWrapper.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTupleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTupleTableConcrete.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTupleTableView.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTupleTableWrapper.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestRangeIndex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecord.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecordDirect.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleTable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/
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/assembler/NodeTableAssembler.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/factories/IndexFactoryBPlusTree.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/DumpOps.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.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/solver/BindingTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIteratorIdToNode.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/StatsCollectorNodeId.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.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/TableBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexes.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesInterleaved.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesParallel.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoaderNodeTupleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/IndexFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTable.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/store/nodetable/NodeTableInline.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLogger.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableNative.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableReadonly.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableSink.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/Nodec.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecSSE.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DebugTDB.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/sys/TDBInternal.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java
jena/trunk/jena-tdb/src/main/java/tdb/tdbnode.java
jena/trunk/jena-tdb/src/main/java/tdb/tdbstats.java
jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
jena/trunk/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestTupleIndex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TS_Index.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndexMem.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestStats.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TS_NodeTable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestCodec.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.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=1622772&r1=1622771&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -27,21 +27,18 @@ import java.util.Locale ;
import org.apache.jena.atlas.lib.ColumnMap ;
-
import com.hp.hpl.jena.rdf.model.Resource;
-
import com.hp.hpl.jena.assembler.Assembler;
import com.hp.hpl.jena.assembler.Mode;
import com.hp.hpl.jena.assembler.assemblers.AssemblerBase;
-
import com.hp.hpl.jena.tdb.TDBException;
import com.hp.hpl.jena.tdb.base.file.FileSet;
import com.hp.hpl.jena.tdb.base.file.Location;
import com.hp.hpl.jena.tdb.base.record.RecordFactory;
import com.hp.hpl.jena.tdb.index.IndexBuilder;
import com.hp.hpl.jena.tdb.index.RangeIndex;
-import com.hp.hpl.jena.tdb.index.TupleIndex;
-import com.hp.hpl.jena.tdb.index.TupleIndexRecord;
+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;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/NodeTableAssembler.java Fri Sep 5 19:44:35 2014
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.assembler.Mode;
import com.hp.hpl.jena.assembler.assemblers.AssemblerBase;
import com.hp.hpl.jena.assembler.exceptions.AssemblerException;
import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
public class NodeTableAssembler extends AssemblerBase //implements Assembler
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexBuilder.java Fri Sep 5 19:44:35 2014
@@ -100,9 +100,9 @@ public class IndexBuilder
// ---- The class .... a pairing of an index builder and a range index builder.
IndexFactory factoryIndex = null ;
- IndexRangeFactory builderRangeIndex = null ;
+ RangeIndexFactory builderRangeIndex = null ;
- public IndexBuilder(IndexFactory indexBuilder, IndexRangeFactory rangeIndexBuilder)
+ public IndexBuilder(IndexFactory indexBuilder, RangeIndexFactory rangeIndexBuilder)
{
factoryIndex = indexBuilder ;
builderRangeIndex = rangeIndexBuilder ;
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexFactory.java (from r1622769, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexRangeFactory.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexFactory.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexFactory.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexRangeFactory.java&r1=1622769&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexRangeFactory.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/RangeIndexFactory.java Fri Sep 5 19:44:35 2014
@@ -22,7 +22,7 @@ import com.hp.hpl.jena.tdb.base.file.Fil
import com.hp.hpl.jena.tdb.base.record.RecordFactory;
-public interface IndexRangeFactory
+public interface RangeIndexFactory
{
public RangeIndex createRangeIndex(FileSet fileset, RecordFactory recordFactory) ;
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/factories/IndexFactoryBPlusTree.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/factories/IndexFactoryBPlusTree.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/factories/IndexFactoryBPlusTree.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/factories/IndexFactoryBPlusTree.java Fri Sep 5 19:44:35 2014
@@ -28,14 +28,14 @@ import com.hp.hpl.jena.tdb.base.file.Fil
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
import com.hp.hpl.jena.tdb.index.Index ;
import com.hp.hpl.jena.tdb.index.IndexFactory ;
-import com.hp.hpl.jena.tdb.index.IndexRangeFactory ;
+import com.hp.hpl.jena.tdb.index.RangeIndexFactory ;
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.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-public class IndexFactoryBPlusTree implements IndexFactory, IndexRangeFactory
+public class IndexFactoryBPlusTree implements IndexFactory, RangeIndexFactory
{
private static Logger log = LoggerFactory.getLogger(IndexFactoryBPlusTree.class) ;
private final int blockSize ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/DumpOps.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/DumpOps.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/DumpOps.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/DumpOps.java Fri Sep 5 19:44:35 2014
@@ -35,14 +35,14 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.tdb.base.block.Block ;
import com.hp.hpl.jena.tdb.base.block.BlockMgr ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.index.TupleTable ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.DatasetPrefixesTDB ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleTable ;
public class DumpOps
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeLib.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeLib.java Fri Sep 5 19:44:35 2014
@@ -40,12 +40,12 @@ import com.hp.hpl.jena.tdb.TDBException
import com.hp.hpl.jena.tdb.base.block.Block ;
import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
import com.hp.hpl.jena.tdb.base.record.Record ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.Nodec ;
-import com.hp.hpl.jena.tdb.nodetable.NodecSSE ;
import com.hp.hpl.jena.tdb.store.Hash ;
import com.hp.hpl.jena.tdb.store.NodeId ;
import com.hp.hpl.jena.tdb.store.NodeType ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.Nodec ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodecSSE ;
public class NodeLib
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java Fri Sep 5 19:44:35 2014
@@ -31,16 +31,15 @@ import org.apache.jena.atlas.lib.Tuple ;
+
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.Triple;
-
import com.hp.hpl.jena.sparql.core.Quad;
-
import com.hp.hpl.jena.tdb.TDBException;
import com.hp.hpl.jena.tdb.base.record.Record;
import com.hp.hpl.jena.tdb.base.record.RecordFactory;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable;
import com.hp.hpl.jena.tdb.store.NodeId;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
public class TupleLib
{
Added: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/B.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/B.java?rev=1622772&view=auto
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/B.java (added)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/B.java Fri Sep 5 19:44:35 2014
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.tdb.setup;
+
+import com.hp.hpl.jena.tdb.base.file.FileSet ;
+import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
+import com.hp.hpl.jena.tdb.index.Index ;
+//import com.hp.hpl.jena.tdb.index.IndexBuilder ;
+import com.hp.hpl.jena.tdb.index.RangeIndex ;
+
+public class B {
+ // Build things.
+
+ //RecordFactory recordFactory = new RecordFactory(SizeOfNodeId*colMap.length(),0) ;
+
+ public static RangeIndex buildRangeIndex(FileSet fileset, RecordFactory recordFactory) {
+ BlockMgrBuilder nodeBld = new Builder.BlockMgrBuilderStd() ;
+ BlockMgrBuilder leavesBld = new Builder.BlockMgrBuilderStd() ;
+ RangeIndexBuilder builder = new Builder.RangeIndexBuilderStd(nodeBld, leavesBld) ;
+ return builder.buildRangeIndex(fileset, recordFactory) ;
+ }
+
+ public static Index buildIndex(FileSet fileset, RecordFactory recordFactory) {
+ BlockMgrBuilder nodeBld = new Builder.BlockMgrBuilderStd() ;
+ BlockMgrBuilder leavesBld = new Builder.BlockMgrBuilderStd() ;
+ IndexBuilder builder = new Builder.IndexBuilderStd(nodeBld, leavesBld) ;
+ return builder.buildIndex(fileset, recordFactory) ;
+ }
+
+
+
+}
+
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java Fri Sep 5 19:44:35 2014
@@ -29,16 +29,15 @@ import com.hp.hpl.jena.tdb.base.file.Fil
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
-import com.hp.hpl.jena.tdb.index.Index ;
-import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndexRecord ;
+import com.hp.hpl.jena.tdb.index.* ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTreeParams ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableCache ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableInline ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableNative ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableCache ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableInline ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableNative ;
+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 ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
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=1622772&r1=1622771&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -29,10 +29,10 @@ import com.hp.hpl.jena.sparql.engine.opt
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.solver.OpExecutorTDB1 ;
import com.hp.hpl.jena.tdb.store.* ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
import com.hp.hpl.jena.tdb.sys.DatasetControl ;
import com.hp.hpl.jena.tdb.sys.DatasetControlMRSW ;
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=1622772&r1=1622771&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -36,10 +36,10 @@ import com.hp.hpl.jena.tdb.base.block.Bl
import com.hp.hpl.jena.tdb.base.file.BufferChannel ;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.solver.OpExecutorTDB1 ;
import com.hp.hpl.jena.tdb.store.* ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
import com.hp.hpl.jena.tdb.sys.* ;
/**
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=1622772&r1=1622771&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -19,7 +19,7 @@
package com.hp.hpl.jena.tdb.setup;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
public interface NodeTableBuilder {
NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile,
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=1622772&r1=1622771&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.tdb.setup;
import org.apache.jena.atlas.lib.ColumnMap ;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
public interface TupleIndexBuilder {
TupleIndex buildTupleIndex(FileSet fileSet, ColumnMap colMap, String name) ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/BindingTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/BindingTDB.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/BindingTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/BindingTDB.java Fri Sep 5 19:44:35 2014
@@ -27,8 +27,8 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.engine.binding.BindingBase ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
/** Bind that delays turning a NodeId into a Node until explicitly needed by get() */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIteratorIdToNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIteratorIdToNode.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIteratorIdToNode.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIteratorIdToNode.java Fri Sep 5 19:44:35 2014
@@ -25,7 +25,7 @@ import org.apache.jena.atlas.iterator.It
import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.engine.iterator.QueryIter ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
/** Wrap a iterator of BindingNodeId to get a QueryIterator of Bindings. */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java Fri Sep 5 19:44:35 2014
@@ -41,11 +41,11 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.engine.iterator.QueryIterNullIterator ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.lib.NodeLib ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.GraphTDB ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.sys.TDBInternal ;
/** Utilities used within the TDB BGP solver : local TDB store */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java Fri Sep 5 19:44:35 2014
@@ -26,13 +26,11 @@ import org.apache.jena.atlas.iterator.*
import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Node;
-
import com.hp.hpl.jena.sparql.core.Var;
import com.hp.hpl.jena.sparql.engine.ExecutionContext;
-
-import com.hp.hpl.jena.tdb.nodetable.NodeTable;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.store.NodeId;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
public class StageMatchTuple extends RepeatApplyIterator<BindingNodeId>
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/StatsCollectorNodeId.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/StatsCollectorNodeId.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/StatsCollectorNodeId.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/StatsCollectorNodeId.java Fri Sep 5 19:44:35 2014
@@ -23,8 +23,8 @@ import java.util.Map ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
/** Statistics collector, aggregates based on NodeId */
public class StatsCollectorNodeId extends StatsCollectorBase<NodeId>
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java Fri Sep 5 19:44:35 2014
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.sparql.core.Quad
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.lib.NodeLib ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.sys.Session ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java Fri Sep 5 19:44:35 2014
@@ -39,12 +39,12 @@ 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.index.IndexBuilder ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndexRecord ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableFactory ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTableConcrete ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableFactory ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTableConcrete ;
+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.DatasetControl ;
import com.hp.hpl.jena.tdb.sys.DatasetControlMRSW ;
import com.hp.hpl.jena.tdb.sys.Names ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java Fri Sep 5 19:44:35 2014
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.sparql.core.Quad
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.graph.BulkUpdateHandlerTDB ;
import com.hp.hpl.jena.tdb.graph.TransactionHandlerTDB ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
import com.hp.hpl.jena.util.iterator.WrappedIterator ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java Fri Sep 5 19:44:35 2014
@@ -28,9 +28,9 @@ import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
import com.hp.hpl.jena.tdb.lib.TupleLib ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
import com.hp.hpl.jena.tdb.sys.DatasetControl ;
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=1622772&r1=1622771&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -23,8 +23,8 @@ 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.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.setup.SystemParams ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.sys.FileRef ;
public class StorageConfig
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TableBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TableBase.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TableBase.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TableBase.java Fri Sep 5 19:44:35 2014
@@ -21,10 +21,10 @@ package com.hp.hpl.jena.tdb.store;
import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.atlas.lib.Sync ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTableConcrete ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTableConcrete ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
import com.hp.hpl.jena.tdb.sys.DatasetControl ;
public class TableBase implements Sync, Closeable
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java Fri Sep 5 19:44:35 2014
@@ -27,9 +27,9 @@ import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
import com.hp.hpl.jena.tdb.lib.TupleLib ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
import com.hp.hpl.jena.tdb.sys.DatasetControl ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexes.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexes.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexes.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexes.java Fri Sep 5 19:44:35 2014
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.tdb.store.bulkloader;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
public interface BuilderSecondaryIndexes
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesInterleaved.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesInterleaved.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesInterleaved.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesInterleaved.java Fri Sep 5 19:44:35 2014
@@ -19,7 +19,7 @@
package com.hp.hpl.jena.tdb.store.bulkloader;
import com.hp.hpl.jena.sparql.util.Timer ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
public class BuilderSecondaryIndexesInterleaved implements BuilderSecondaryIndexes
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesParallel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesParallel.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesParallel.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesParallel.java Fri Sep 5 19:44:35 2014
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.tdb.store.bulklo
import java.util.concurrent.Semaphore ;
import com.hp.hpl.jena.sparql.util.Timer ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
public class BuilderSecondaryIndexesParallel implements BuilderSecondaryIndexes
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java Fri Sep 5 19:44:35 2014
@@ -19,7 +19,7 @@
package com.hp.hpl.jena.tdb.store.bulkloader;
import com.hp.hpl.jena.sparql.util.Timer ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
public class BuilderSecondaryIndexesSequential implements BuilderSecondaryIndexes
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java Fri Sep 5 19:44:35 2014
@@ -34,11 +34,11 @@ import com.hp.hpl.jena.sparql.core.Quad
import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.TDBException ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTableView ;
import com.hp.hpl.jena.tdb.solver.stats.Stats ;
import com.hp.hpl.jena.tdb.solver.stats.StatsCollector ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTableView ;
import com.hp.hpl.jena.tdb.sys.Names ;
/** Overall framework for bulk loading */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoaderNodeTupleTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoaderNodeTupleTable.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoaderNodeTupleTable.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoaderNodeTupleTable.java Fri Sep 5 19:44:35 2014
@@ -28,9 +28,9 @@ import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
/**
* Load into one NodeTupleTable (triples, quads, other)
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java Fri Sep 5 19:44:35 2014
@@ -34,8 +34,8 @@ import com.hp.hpl.jena.tdb.base.file.Loc
import com.hp.hpl.jena.tdb.base.record.Record ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
/** Copy one index to another, probably with a different key order */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java Fri Sep 5 19:44:35 2014
@@ -47,8 +47,6 @@ import com.hp.hpl.jena.sparql.core.Quad
import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
import com.hp.hpl.jena.tdb.solver.stats.Stats ;
import com.hp.hpl.jena.tdb.solver.stats.StatsCollectorNodeId ;
@@ -56,6 +54,8 @@ import com.hp.hpl.jena.tdb.store.Dataset
import com.hp.hpl.jena.tdb.store.NodeId ;
import com.hp.hpl.jena.tdb.store.bulkloader.BulkLoader ;
import com.hp.hpl.jena.tdb.store.bulkloader.BulkStreamRDF ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.sys.Names ;
/** Build node table - write triples/quads as text file */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/IndexFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/IndexFactory.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/IndexFactory.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/IndexFactory.java Fri Sep 5 19:44:35 2014
@@ -23,8 +23,8 @@ import org.apache.jena.atlas.lib.ColumnM
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndexRecord ;
+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.SetupTDB ;
public class IndexFactory
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTable.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTable.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTable.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import java.util.Iterator ;
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=1622772&r1=1622369&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import java.util.Iterator ;
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableFactory.java (from r1622717, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableFactory.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableFactory.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableFactory.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableFactory.java&r1=1622717&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableFactory.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableFactory.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import com.hp.hpl.jena.tdb.base.file.FileFactory ;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableInline.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableInline.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableInline.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableInline.java Fri Sep 5 19:44:35 2014
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
/** NodeTable wrapper to handle inline node ids.
* If a node can be made inline, then the underlying table never sees it.
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLib.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLib.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import java.util.Iterator ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLogger.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLogger.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLogger.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableLogger.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import java.util.Iterator ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableNative.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableNative.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableNative.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableNative.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import static com.hp.hpl.jena.tdb.lib.NodeLib.setHash ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableReadonly.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableReadonly.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableReadonly.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableReadonly.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.tdb.TDBException ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableSink.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableSink.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableSink.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableSink.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import java.util.Iterator ;
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableWrapper.java (from r1622698, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableWrapper.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableWrapper.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableWrapper.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableWrapper.java&r1=1622698&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableWrapper.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodeTableWrapper.java Fri Sep 5 19:44:35 2014
@@ -16,16 +16,15 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import java.util.Iterator ;
import org.apache.jena.atlas.lib.Pair ;
-
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
public class NodeTableWrapper implements NodeTable
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/Nodec.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/Nodec.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/Nodec.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/Nodec.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable ;
+package com.hp.hpl.jena.tdb.store.nodetable ;
import java.nio.ByteBuffer ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecLib.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecLib.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.atlas.logging.Log ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecSSE.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecSSE.java?rev=1622772&r1=1622369&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecSSE.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetable/NodecSSE.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetable;
import java.nio.ByteBuffer ;
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTable.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTable.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTable.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTable.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTable.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTable.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTable.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable ;
+package com.hp.hpl.jena.tdb.store.nodetupletable ;
import java.util.Iterator ;
@@ -25,8 +25,9 @@ import org.apache.jena.atlas.lib.Sync ;
import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.tdb.index.TupleTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleTable ;
import com.hp.hpl.jena.tdb.sys.DatasetControl ;
public interface NodeTupleTable extends Sync, Closeable
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableConcrete.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableConcrete.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableConcrete.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableConcrete.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableConcrete.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableConcrete.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableConcrete.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable ;
+package com.hp.hpl.jena.tdb.store.nodetupletable ;
import static java.lang.String.format ;
@@ -28,10 +28,11 @@ import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.tdb.TDBException ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.index.TupleTable ;
import com.hp.hpl.jena.tdb.lib.TupleLib ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleTable ;
import com.hp.hpl.jena.tdb.sys.DatasetControl ;
/** Group a tuple table and node table together to provide a real NodeTupleTable */
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableView.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableView.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableView.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableView.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableView.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableView.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableView.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetupletable;
import java.util.Iterator ;
@@ -24,8 +24,8 @@ import org.apache.jena.atlas.lib.ArrayUt
import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.tdb.index.TupleTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleTable ;
/** (Read-only?) projection of another NodeTupleTable.
* This will not reduce a N-wide tuple to N-1 when find*() used.
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableWrapper.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableWrapper.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableWrapper.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableWrapper.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableWrapper.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableWrapper.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/nodetupletable/NodeTupleTableWrapper.java Fri Sep 5 19:44:35 2014
@@ -16,15 +16,16 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.nodetable;
+package com.hp.hpl.jena.tdb.store.nodetupletable;
import java.util.Iterator ;
import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.tdb.index.TupleTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleTable ;
import com.hp.hpl.jena.tdb.sys.DatasetControl ;
public class NodeTupleTableWrapper implements NodeTupleTable
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndex.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndex.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndex.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndex.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndex.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndex.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndex.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.index;
+package com.hp.hpl.jena.tdb.store.tupletable;
import java.util.Iterator ;
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexBase.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexBase.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexBase.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexBase.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexBase.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexBase.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexBase.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.index;
+package com.hp.hpl.jena.tdb.store.tupletable;
import java.util.Iterator ;
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexRecord.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexRecord.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexRecord.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexRecord.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexRecord.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexRecord.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexRecord.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.index;
+package com.hp.hpl.jena.tdb.store.tupletable;
import static com.hp.hpl.jena.tdb.sys.SystemTDB.SizeOfNodeId;
import static java.lang.String.format;
@@ -30,9 +30,11 @@ import org.apache.jena.atlas.lib.Tuple ;
+
import com.hp.hpl.jena.tdb.TDBException;
import com.hp.hpl.jena.tdb.base.record.Record;
import com.hp.hpl.jena.tdb.base.record.RecordFactory;
+import com.hp.hpl.jena.tdb.index.RangeIndex ;
import com.hp.hpl.jena.tdb.lib.TupleLib;
import com.hp.hpl.jena.tdb.store.NodeId;
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexWrapper.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexWrapper.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexWrapper.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexWrapper.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexWrapper.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexWrapper.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleIndexWrapper.java Fri Sep 5 19:44:35 2014
@@ -16,15 +16,15 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.index;
+package com.hp.hpl.jena.tdb.store.tupletable;
import java.util.Iterator ;
import org.apache.jena.atlas.lib.ColumnMap ;
import org.apache.jena.atlas.lib.Tuple ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
public class TupleIndexWrapper implements TupleIndex
{
Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleTable.java (from r1622369, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleTable.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleTable.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleTable.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleTable.java&r1=1622369&r2=1622772&rev=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleTable.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/tupletable/TupleTable.java Fri Sep 5 19:44:35 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.index;
+package com.hp.hpl.jena.tdb.store.tupletable;
import static java.lang.String.format ;
Added: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndex.java?rev=1622772&view=auto
==============================================================================
(empty)
Added: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexBase.java?rev=1622772&view=auto
==============================================================================
(empty)
Added: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexRecord.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexRecord.java?rev=1622772&view=auto
==============================================================================
(empty)
Added: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexWrapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleIndexWrapper.java?rev=1622772&view=auto
==============================================================================
(empty)
Added: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/structure/TupleTable.java?rev=1622772&view=auto
==============================================================================
(empty)
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DebugTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DebugTDB.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DebugTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DebugTDB.java Fri Sep 5 19:44:35 2014
@@ -27,12 +27,12 @@ import com.hp.hpl.jena.tdb.base.file.Loc
import com.hp.hpl.jena.tdb.base.record.Record ;
import com.hp.hpl.jena.tdb.index.Index ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndexRecord ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableLib ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableLib ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndexRecord ;
/** Lowlevel utilities for working with TDB */
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=1622772&r1=1622771&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -36,15 +36,8 @@ import com.hp.hpl.jena.tdb.base.record.R
import com.hp.hpl.jena.tdb.index.Index ;
import com.hp.hpl.jena.tdb.index.IndexBuilder ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndexRecord ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTreeParams ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableCache ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableFactory ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableInline ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableNative ;
import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
import com.hp.hpl.jena.tdb.setup.SystemParams ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
@@ -52,6 +45,9 @@ import com.hp.hpl.jena.tdb.store.Dataset
import com.hp.hpl.jena.tdb.store.NodeId ;
import com.hp.hpl.jena.tdb.store.QuadTable ;
import com.hp.hpl.jena.tdb.store.TripleTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.* ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ;
+import com.hp.hpl.jena.tdb.store.tupletable.TupleIndexRecord ;
/** Makes things : datasets from locations, indexes, etc etc. */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java Fri Sep 5 19:44:35 2014
@@ -23,9 +23,9 @@ import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.tdb.TDBException ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
/** A collection of helpers to abstract away from internal details of TDB.
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=1622772&r1=1622771&r2=1622772&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 Fri Sep 5 19:44:35 2014
@@ -31,13 +31,13 @@ import com.hp.hpl.jena.tdb.base.objectfi
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
import com.hp.hpl.jena.tdb.index.Index ;
import com.hp.hpl.jena.tdb.index.IndexMap ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableInline ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableReadonly ;
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.store.DatasetGraphTDB ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableInline ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableReadonly ;
import com.hp.hpl.jena.tdb.sys.FileRef ;
import com.hp.hpl.jena.tdb.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java Fri Sep 5 19:44:35 2014
@@ -42,9 +42,9 @@ import com.hp.hpl.jena.tdb.base.file.Loc
import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
import com.hp.hpl.jena.tdb.index.IndexMap ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.StorageConfig ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.sys.FileRef ;
import com.hp.hpl.jena.tdb.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java Fri Sep 5 19:44:35 2014
@@ -35,11 +35,11 @@ import com.hp.hpl.jena.tdb.TDBException
import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
import com.hp.hpl.jena.tdb.base.record.Record ;
import com.hp.hpl.jena.tdb.index.Index ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableCache ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableInline ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableNative ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableCache ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableInline ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTableNative ;
public class NodeTableTrans implements NodeTable, TransactionLifecycle
{
Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbnode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbnode.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tdbnode.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tdbnode.java Fri Sep 5 19:44:35 2014
@@ -25,10 +25,10 @@ import tdb.cmdline.CmdTDB ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.tdb.lib.NodeLib ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.Hash ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
public class tdbnode extends CmdTDB
Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbstats.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbstats.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tdbstats.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tdbstats.java Fri Sep 5 19:44:35 2014
@@ -27,14 +27,14 @@ import tdb.cmdline.CmdTDBGraph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
import com.hp.hpl.jena.tdb.solver.SolverLib ;
import com.hp.hpl.jena.tdb.solver.stats.Stats ;
import com.hp.hpl.jena.tdb.solver.stats.StatsCollectorNodeId ;
import com.hp.hpl.jena.tdb.solver.stats.StatsResults ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.nodetupletable.NodeTupleTable ;
public class tdbstats extends CmdTDBGraph
{
Modified: jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java?rev=1622772&r1=1622771&r2=1622772&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java Fri Sep 5 19:44:35 2014
@@ -33,11 +33,11 @@ import com.hp.hpl.jena.sparql.util.Utils
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.base.record.Record ;
import com.hp.hpl.jena.tdb.index.RangeIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndex ;
-import com.hp.hpl.jena.tdb.index.TupleIndexRecord ;
import com.hp.hpl.jena.tdb.index.bplustree.BPlusTree ;
import com.hp.hpl.jena.tdb.store.NodeId ;
import com.hp.hpl.jena.tdb.store.bulkloader2.IndexFactory ;
+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 ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;