Modified: jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java (original) +++ jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java Fri Sep 5 19:44:35 2014 @@ -36,9 +36,9 @@ import com.hp.hpl.jena.sparql.util.FmtUt import com.hp.hpl.jena.sparql.util.Utils ; import com.hp.hpl.jena.tdb.StoreConnection ; import com.hp.hpl.jena.tdb.base.file.Location ; -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.sys.Names ; import com.hp.hpl.jena.tdb.sys.SetupTDB ; import com.hp.hpl.jena.tdb.sys.SystemTDB ;
Modified: jena/trunk/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java (original) +++ jena/trunk/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java Fri Sep 5 19:44:35 2014 @@ -24,8 +24,8 @@ import org.apache.jena.atlas.lib.Tuple ; import com.hp.hpl.jena.sparql.util.Utils ; import com.hp.hpl.jena.tdb.base.file.Location ; -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.Names ; import com.hp.hpl.jena.tdb.sys.SetupTDB ; import com.hp.hpl.jena.tdb.sys.SystemTDB ; Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java Fri Sep 5 19:44:35 2014 @@ -34,9 +34,10 @@ import com.hp.hpl.jena.tdb.base.objectfi import com.hp.hpl.jena.tdb.graph.TS_Graph ; import com.hp.hpl.jena.tdb.index.TS_Index ; import com.hp.hpl.jena.tdb.lib.TS_LibTDB ; -import com.hp.hpl.jena.tdb.nodetable.TS_NodeTable ; import com.hp.hpl.jena.tdb.solver.TS_SolverTDB ; import com.hp.hpl.jena.tdb.store.TS_Store ; +import com.hp.hpl.jena.tdb.store.nodetable.TS_NodeTable ; +import com.hp.hpl.jena.tdb.store.tupletable.TS_TupleTable ; import com.hp.hpl.jena.tdb.sys.SystemTDB ; import com.hp.hpl.jena.tdb.sys.TS_Sys ; import com.hp.hpl.jena.tdb.transaction.TS_TransactionTDB ; @@ -52,6 +53,7 @@ import com.hp.hpl.jena.tdb.transaction.T , TS_LibTDB.class , TS_NodeTable.class , TS_Index.class + , TS_TupleTable.class , TS_Store.class // The main storage implementation. Slow tests. , TS_SolverTDB.class , TS_Sys.class Copied: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestIndex.java (from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndex.java) URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestIndex.java?p2=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestIndex.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndex.java&r1=1622369&r2=1622772&rev=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndex.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestIndex.java Fri Sep 5 19:44:35 2014 @@ -30,7 +30,7 @@ import org.junit.Test; //import com.hp.hpl.jena.tdb.base.record.RecordLib; -public abstract class TestIndex extends BaseTest +public abstract class AbstractTestIndex extends BaseTest { Index index = null ; Copied: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestRangeIndex.java (from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestRangeIndex.java) URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestRangeIndex.java?p2=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestRangeIndex.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestRangeIndex.java&r1=1622369&r2=1622772&rev=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestRangeIndex.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestRangeIndex.java Fri Sep 5 19:44:35 2014 @@ -33,7 +33,7 @@ import org.junit.Test ; import com.hp.hpl.jena.tdb.base.record.RecordLib ; -public abstract class TestRangeIndex extends BaseTest { +public abstract class AbstractTestRangeIndex extends BaseTest { private RangeIndex rIndex = null ; @After Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestTupleIndex.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestTupleIndex.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestTupleIndex.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/AbstractTestTupleIndex.java Fri Sep 5 19:44:35 2014 @@ -28,6 +28,7 @@ import static org.apache.jena.atlas.lib. import org.junit.Test ; import com.hp.hpl.jena.tdb.store.NodeId ; +import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ; /** Test TupleIndexes (general) */ public abstract class AbstractTestTupleIndex extends BaseTest Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TS_Index.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TS_Index.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TS_Index.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TS_Index.java Fri Sep 5 19:44:35 2014 @@ -34,9 +34,8 @@ import com.hp.hpl.jena.tdb.index.ext.Tes TestBPlusTreeRewriter.class, TestExtHash.class, - TestTupleIndexRecord.class, - TestTupleIndexRecordDirect.class, - TestTupleTable.class + TestIndexMem.class + } ) public class TS_Index Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndexMem.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndexMem.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndexMem.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndexMem.java Fri Sep 5 19:44:35 2014 @@ -20,7 +20,7 @@ package com.hp.hpl.jena.tdb.index; import com.hp.hpl.jena.tdb.base.record.RecordFactory ; -public class TestIndexMem extends TestIndex +public class TestIndexMem extends AbstractTestIndex { @Override protected Index makeIndex(int kLen, int vLen) Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java Fri Sep 5 19:44:35 2014 @@ -23,10 +23,10 @@ import org.junit.BeforeClass ; import com.hp.hpl.jena.tdb.base.record.RecordLib ; import com.hp.hpl.jena.tdb.index.RangeIndex ; -import com.hp.hpl.jena.tdb.index.TestRangeIndex ; +import com.hp.hpl.jena.tdb.index.AbstractTestRangeIndex ; import com.hp.hpl.jena.tdb.sys.SystemTDB ; -public class TestBPlusTree extends TestRangeIndex +public class TestBPlusTree extends AbstractTestRangeIndex { static boolean originalNullOut ; @BeforeClass static public void beforeClass() Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java Fri Sep 5 19:44:35 2014 @@ -27,11 +27,11 @@ import com.hp.hpl.jena.tdb.base.block.Bl import com.hp.hpl.jena.tdb.base.file.PlainFileMem; import com.hp.hpl.jena.tdb.base.record.RecordFactory; import com.hp.hpl.jena.tdb.index.Index; -import com.hp.hpl.jena.tdb.index.TestIndex; +import com.hp.hpl.jena.tdb.index.AbstractTestIndex; import com.hp.hpl.jena.tdb.index.ext.ExtHash; import com.hp.hpl.jena.tdb.sys.SystemTDB; -public class TestExtHash extends TestIndex +public class TestExtHash extends AbstractTestIndex { static boolean originalNullOut ; Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestStats.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestStats.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestStats.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestStats.java Fri Sep 5 19:44:35 2014 @@ -28,12 +28,12 @@ import com.hp.hpl.jena.graph.NodeFactory import com.hp.hpl.jena.sparql.core.Quad ; import com.hp.hpl.jena.sparql.sse.SSE ; import com.hp.hpl.jena.tdb.TDBFactory ; -import com.hp.hpl.jena.tdb.nodetable.NodeTable ; -import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ; 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 ; import com.hp.hpl.jena.tdb.sys.TDBInternal ; public class TestStats extends BaseTest Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java Fri Sep 5 19:44:35 2014 @@ -36,7 +36,7 @@ import com.hp.hpl.jena.sparql.core.Quad import com.hp.hpl.jena.sparql.sse.SSE ; import com.hp.hpl.jena.tdb.TDB ; import com.hp.hpl.jena.tdb.TDBFactory ; -import com.hp.hpl.jena.tdb.nodetable.NodeTable ; +import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ; import com.hp.hpl.jena.tdb.sys.SystemTDB ; public class TestQuadFilter extends BaseTest Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java?rev=1622772&r1=1622369&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.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.junit.BaseTest ; import org.junit.Test ; @@ -25,6 +25,7 @@ import com.hp.hpl.jena.graph.Node ; import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ; import com.hp.hpl.jena.tdb.TDBException ; import com.hp.hpl.jena.tdb.store.NodeId ; +import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ; public abstract class AbstractTestNodeTable extends BaseTest { Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TS_NodeTable.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TS_NodeTable.java?rev=1622772&r1=1622369&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TS_NodeTable.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TS_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 org.junit.runner.RunWith ; import org.junit.runners.Suite ; Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestCodec.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestCodec.java?rev=1622772&r1=1622369&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestCodec.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestCodec.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 ; import java.util.Arrays ; @@ -32,6 +32,8 @@ import org.junit.runners.Parameterized.P import com.hp.hpl.jena.graph.Node ; import com.hp.hpl.jena.rdf.model.AnonId ; import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ; +import com.hp.hpl.jena.tdb.store.nodetable.Nodec ; +import com.hp.hpl.jena.tdb.store.nodetable.NodecSSE ; @RunWith(Parameterized.class) public class TestCodec extends BaseTest Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java?rev=1622772&r1=1622369&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTable.java Fri Sep 5 19:44:35 2014 @@ -16,9 +16,10 @@ * 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.Location ; +import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ; import com.hp.hpl.jena.tdb.sys.Names ; import com.hp.hpl.jena.tdb.sys.SetupTDB ; Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java?rev=1622772&r1=1622369&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/TestNodeTableStored.java Fri Sep 5 19:44:35 2014 @@ -16,9 +16,10 @@ * 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.Location ; +import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ; import com.hp.hpl.jena.tdb.sys.Names ; import com.hp.hpl.jena.tdb.sys.SetupTDB ; Added: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TS_TupleTable.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TS_TupleTable.java?rev=1622772&view=auto ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TS_TupleTable.java (added) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TS_TupleTable.java Fri Sep 5 19:44:35 2014 @@ -0,0 +1,32 @@ +/* + * 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.store.tupletable; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) [email protected]( { + TestTupleIndexRecord.class, + TestTupleIndexRecordDirect.class, + TestTupleTable.class +} ) + +public class TS_TupleTable +{ } Propchange: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TS_TupleTable.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java (from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecord.java) URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java?p2=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecord.java&r1=1622369&r2=1622772&rev=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecord.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecord.java Fri Sep 5 19:44:35 2014 @@ -16,13 +16,17 @@ * limitations under the License. */ -package com.hp.hpl.jena.tdb.index; +package com.hp.hpl.jena.tdb.store.tupletable; import org.apache.jena.atlas.lib.ColumnMap ; 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.AbstractTestTupleIndex ; +import com.hp.hpl.jena.tdb.index.IndexBuilder ; +import com.hp.hpl.jena.tdb.index.RangeIndex ; +import com.hp.hpl.jena.tdb.store.tupletable.TupleIndexRecord ; import com.hp.hpl.jena.tdb.sys.SystemTDB ; public class TestTupleIndexRecord extends AbstractTestTupleIndex Copied: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java (from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecordDirect.java) URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java?p2=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecordDirect.java&r1=1622369&r2=1622772&rev=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecordDirect.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleIndexRecordDirect.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 ; import java.util.Set ; @@ -26,12 +26,14 @@ import org.apache.jena.atlas.junit.BaseT import org.apache.jena.atlas.lib.ColumnMap ; import org.apache.jena.atlas.lib.Tuple ; import static org.apache.jena.atlas.lib.Tuple.* ; - import org.junit.Test ; 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.IndexBuilder ; +import com.hp.hpl.jena.tdb.index.RangeIndex ; import com.hp.hpl.jena.tdb.store.NodeId ; +import com.hp.hpl.jena.tdb.store.tupletable.TupleIndexRecord ; import com.hp.hpl.jena.tdb.sys.SystemTDB ; public class TestTupleIndexRecordDirect extends BaseTest Copied: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleTable.java (from r1622369, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleTable.java) URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleTable.java?p2=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleTable.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleTable.java&r1=1622369&r2=1622772&rev=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleTable.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/tupletable/TestTupleTable.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 java.util.List; import com.hp.hpl.jena.tdb.base.record.RecordFactory; -import com.hp.hpl.jena.tdb.index.TupleIndex; -import com.hp.hpl.jena.tdb.index.TupleTable; import com.hp.hpl.jena.tdb.store.NodeId; +import com.hp.hpl.jena.tdb.store.tupletable.TupleIndex ; +import com.hp.hpl.jena.tdb.store.tupletable.TupleTable ; import com.hp.hpl.jena.tdb.sys.SystemTDB; import org.apache.jena.atlas.iterator.Iter ; Added: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleIndexRecord.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleIndexRecord.java?rev=1622772&view=auto ============================================================================== (empty) Added: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleIndexRecordDirect.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleIndexRecordDirect.java?rev=1622772&view=auto ============================================================================== (empty) Added: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleTable.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/structure/TestTupleTable.java?rev=1622772&view=auto ============================================================================== (empty) Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java?rev=1622772&r1=1622771&r2=1622772&view=diff ============================================================================== --- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java (original) +++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java Fri Sep 5 19:44:35 2014 @@ -29,8 +29,8 @@ 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.store.NodeId ; +import com.hp.hpl.jena.tdb.store.nodetable.NodeTable ; import com.hp.hpl.jena.tdb.sys.SetupTDB ; import com.hp.hpl.jena.tdb.sys.SystemTDB ;
