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 2013/10/12 19:30:58 UTC
svn commit: r1531564 - in /jena: Scratch/AFS/Dev/src-dev/dev/g2/
trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/
trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/
trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/ t...
Author: andy
Date: Sat Oct 12 17:30:57 2013
New Revision: 1531564
URL: http://svn.apache.org/r1531564
Log:
Split Tuple.create(...) into Tuple.create(existing []) and Tuple.createTuple(...).
Modified:
jena/Scratch/AFS/Dev/src-dev/dev/g2/TupleDex.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterRepeatApply.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/FileOps.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/common/IsoMatcher.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestColumnMap.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
jena/trunk/jena-tdb/bin/tdbloader2worker
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/lib/TupleLib.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/store/GraphTDB.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/TestTupleIndexRecordDirect.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleTable.java
Modified: jena/Scratch/AFS/Dev/src-dev/dev/g2/TupleDex.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/src-dev/dev/g2/TupleDex.java?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/src-dev/dev/g2/TupleDex.java (original)
+++ jena/Scratch/AFS/Dev/src-dev/dev/g2/TupleDex.java Sat Oct 12 17:30:57 2013
@@ -120,7 +120,7 @@ public class TupleDex
{
// X Y Z - 1 case
if ( bunch.contains(y, z) )
- return new SingletonIterator<Tuple<Node>>(Tuple.create(x,y,z)) ;
+ return new SingletonIterator<Tuple<Node>>(Tuple.createTuple(x,y,z)) ;
else
return zero ;
}
@@ -172,7 +172,7 @@ public class TupleDex
@Override
public Tuple<Node> convert(Node item)
{
- return Tuple.create(x, y, item) ;
+ return Tuple.createTuple(x, y, item) ;
}} ;
Iterator<Tuple<Node>> iter2 = Iter.map(part, t) ;
return iter2 ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java Sat Oct 12 17:30:57 2013
@@ -74,7 +74,7 @@ public class OpVars
Set<Var> unknownAcc = collector() ;
OpVarsPatternWithPositions visitor = new OpVarsPatternWithPositions(graphAcc, subjAcc, predAcc, objAcc, unknownAcc, false);
OpWalker.walk(op, visitor);
- return Tuple.create(graphAcc, subjAcc, predAcc, objAcc, unknownAcc);
+ return Tuple.createTuple(graphAcc, subjAcc, predAcc, objAcc, unknownAcc);
}
@SuppressWarnings("unchecked")
@@ -87,7 +87,7 @@ public class OpVars
OpVarsPatternWithPositions visitor = new OpVarsPatternWithPositions(graphAcc, subjAcc, predAcc, objAcc, unknownAcc, false);
for (Op op : ops)
OpWalker.walk(op, visitor);
- return Tuple.create(graphAcc, subjAcc, predAcc, objAcc, unknownAcc);
+ return Tuple.createTuple(graphAcc, subjAcc, predAcc, objAcc, unknownAcc);
}
// All mentioned variables regardless of scope/visibility.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterRepeatApply.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterRepeatApply.java?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterRepeatApply.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIterRepeatApply.java Sat Oct 12 17:30:57 2013
@@ -70,13 +70,8 @@ public abstract class QueryIterRepeatApp
return false ;
if ( cancelRequested )
- {
- // This ensures we don't miss a change to cancelRequested
- // In the middle of a cancel.
- // XXX This repeatedly calls subcancel if the iterator is drained.
- // But QueryItertaorBase turns that into a single call of requestCancel.
+ // Pass on the cancelRequest to the active stage.
performRequestCancel(currentStage);
- }
if ( currentStage.hasNext() )
return true ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/FileOps.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/FileOps.java?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/FileOps.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/FileOps.java Sat Oct 12 17:30:57 2013
@@ -126,7 +126,7 @@ public class FileOps
basename = basename.substring(0, i) ;
}
- return Tuple.create(path, basename, ext) ;
+ return Tuple.createTuple(path, basename, ext) ;
}
/** Split a file name into path and filename. Nulls returned if don't make sense. */
@@ -144,7 +144,7 @@ public class FileOps
path = filename.substring(0, j) ;
fn = filename.substring(j+1) ;
}
- return Tuple.create(path, fn) ;
+ return Tuple.createTuple(path, fn) ;
}
/** Return the basename (no path, no extension) */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java Sat Oct 12 17:30:57 2013
@@ -39,9 +39,13 @@ public class Tuple<T> implements Iterabl
// return Tuple.create(tuple) ;
// }
- public static <X> Tuple<X> create(/*@SuppressWarnings("unchecked")*/ X ... elements)
- { return new Tuple<X>(elements) ; }
+ public static <X> Tuple<X> createTuple(/*@SuppressWarnings("unchecked")*/ X ... elements)
+ {
+ X[] els = elements ; // ArrayUtils.copy(elements) ;
+ return create(els) ; }
+ public static <X> Tuple<X> create(X[] elements)
+ { return new Tuple<X>(elements) ; }
//TupleLib??
public static <T> Iterator<T> project(final int slot, Iterator<Tuple<T>> iter)
@@ -74,7 +78,7 @@ public class Tuple<T> implements Iterabl
protected Tuple(/*@SuppressWarnings("unchecked")*/ T...tuple)
{
- this.tuple = ArrayUtils.copy(tuple) ; // Take copy to stop 'tuple' being referenced after the call.
+ this.tuple = tuple ;
}
public T get(int idx) { return tuple[idx] ; }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/common/IsoMatcher.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/common/IsoMatcher.java?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/common/IsoMatcher.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/common/IsoMatcher.java Sat Oct 12 17:30:57 2013
@@ -24,6 +24,7 @@ import java.util.Iterator ;
import java.util.List ;
import org.apache.jena.atlas.lib.Tuple ;
+import static org.apache.jena.atlas.lib.Tuple.* ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
@@ -155,7 +156,7 @@ public class IsoMatcher
List<Tuple<Node>> tuples = new ArrayList<Tuple<Node>>() ;
for ( ; iter.hasNext() ; ) {
Triple t = iter.next() ;
- Tuple<Node> tuple = Tuple.create(t.getSubject(), t.getPredicate(), t.getObject()) ;
+ Tuple<Node> tuple = createTuple(t.getSubject(), t.getPredicate(), t.getObject()) ;
tuples.add(tuple) ;
}
return tuples ;
@@ -165,7 +166,7 @@ public class IsoMatcher
List<Tuple<Node>> tuples = new ArrayList<Tuple<Node>>() ;
for ( ; iter.hasNext() ; ) {
Quad q = iter.next() ;
- Tuple<Node> tuple = Tuple.create(q.getGraph(), q.getSubject(), q.getPredicate(), q.getObject()) ;
+ Tuple<Node> tuple = createTuple(q.getGraph(), q.getSubject(), q.getPredicate(), q.getObject()) ;
tuples.add(tuple) ;
}
return tuples ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestColumnMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestColumnMap.java?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestColumnMap.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestColumnMap.java Sat Oct 12 17:30:57 2013
@@ -18,10 +18,10 @@
package org.apache.jena.atlas.lib;
-
import org.apache.jena.atlas.junit.BaseTest ;
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 ;
public class TestColumnMap extends BaseTest
@@ -48,16 +48,16 @@ public class TestColumnMap extends BaseT
@Test public void remap3()
{
ColumnMap x = new ColumnMap("POS", 2,0,1) ;
- Tuple<String> tuple = Tuple.create("S", "P", "O") ;
+ Tuple<String> tuple = createTuple("S", "P", "O") ;
Tuple<String> mapped = x.map(tuple) ;
- Tuple<String> expected = Tuple.create("P", "O", "S") ;
+ Tuple<String> expected = createTuple("P", "O", "S") ;
assertEquals(expected, mapped) ;
}
@Test public void remap4()
{
ColumnMap x = new ColumnMap("POS", 2,0,1) ;
- Tuple<String> tuple = Tuple.create("S", "P", "O") ;
+ Tuple<String> tuple = createTuple("S", "P", "O") ;
Tuple<String> tuple2 = x.map(tuple) ;
tuple2 = x.unmap(tuple2) ;
assertEquals(tuple, tuple2) ;
@@ -81,12 +81,12 @@ public class TestColumnMap extends BaseT
@Test public void map1()
{
ColumnMap cmap = new ColumnMap("GSPO", "OSPG") ;
- Tuple<String> tuple = Tuple.create("G", "S", "P", "O") ;
+ Tuple<String> tuple = createTuple("G", "S", "P", "O") ;
Tuple<String> mapped = cmap.map(tuple) ;
- Tuple<String> expected = Tuple.create("O", "S", "P", "G") ;
+ Tuple<String> expected = createTuple("O", "S", "P", "G") ;
assertEquals(expected, mapped) ;
Tuple<String> unmapped = cmap.unmap(mapped) ;
- assertEquals(Tuple.create("G", "S", "P", "O"), unmapped) ;
+ assertEquals(createTuple("G", "S", "P", "O"), unmapped) ;
}
@Test public void map2()
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java Sat Oct 12 17:30:57 2013
@@ -378,7 +378,7 @@ public class TestPipedRDFIterators {
out.start();
// Generate tuples
for (int i = 1; i <= generateSize; i++) {
- Tuple<Node> t = Tuple.create(com.hp.hpl.jena.graph.NodeFactory.createURI("http://graph"),
+ Tuple<Node> t = Tuple.createTuple(com.hp.hpl.jena.graph.NodeFactory.createURI("http://graph"),
com.hp.hpl.jena.graph.NodeFactory.createAnon(),
com.hp.hpl.jena.graph.NodeFactory.createURI("http://predicate"), NodeFactoryExtra.intToNode(i));
out.tuple(t);
Modified: jena/trunk/jena-tdb/bin/tdbloader2worker
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/bin/tdbloader2worker?rev=1531564&r1=1531563&r2=1531564&view=diff
==============================================================================
--- jena/trunk/jena-tdb/bin/tdbloader2worker (original)
+++ jena/trunk/jena-tdb/bin/tdbloader2worker Sat Oct 12 17:30:57 2013
@@ -22,7 +22,7 @@
set -e
# Sort order is ASCII
-export LC_LOCALE="C"
+export LC_ALL="C"
log() { echo " $(date $DATE)" "$@" ; }
Modified: 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/index/TupleIndexRecord.java?rev=1531564&r1=1531563&r2=1531564&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/index/TupleIndexRecord.java Sat Oct 12 17:30:57 2013
@@ -186,10 +186,10 @@ public class TupleIndexRecord extends Tu
return Iter.map(iter, transformToTuple) ;
}
- private Transform<Record, Tuple<NodeId>> transformToTuple = new Transform<Record, Tuple<NodeId>>()
+ private final Transform<Record, Tuple<NodeId>> transformToTuple = new Transform<Record, Tuple<NodeId>>()
{
@Override
- public Tuple<NodeId> convert(Record item)
+ public final Tuple<NodeId> convert(Record item)
{
return TupleLib.tuple(item, colMap) ;
}
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=1531564&r1=1531563&r2=1531564&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 Sat Oct 12 17:30:57 2013
@@ -162,43 +162,6 @@ public class TupleLib
return new Quad(gNode, sNode, pNode, oNode) ;
}
- // ---- Tuples, Triples and Quads
-
-// /** Triple to Tuple, not remapped by a ColumnMap. */
-// public static Tuple<NodeId> tuple(Triple t, NodeTable nodeTable)
-// {
-// Node s = t.getSubject() ;
-// Node p = t.getPredicate() ;
-// Node o = t.getObject() ;
-//
-// NodeId x = nodeTable.storeNode(s) ;
-// NodeId y = nodeTable.storeNode(p) ;
-// NodeId z = nodeTable.storeNode(o) ;
-// return Tuple.create(x, y, z) ;
-// }
-//
-// /** Quad to Tuple, not remapped by a ColumnMap. */
-// public static Tuple<NodeId> tuple(Quad quad, NodeTable nodeTable)
-// {
-// return tuple(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject(), nodeTable) ;
-// }
-//
-// /** Quad (as graph node and triple) to Tuple, not remapped by a ColumnMap. */
-// public static Tuple<NodeId> tuple(Node g, Triple t, NodeTable nodeTable)
-// {
-// return tuple(g, t.getSubject(), t.getPredicate(), t.getObject(), nodeTable) ;
-// }
-//
-// public static Tuple<NodeId> tuple(Node g, Node s, Node p, Node o, NodeTable nodeTable)
-// {
-// NodeId gId = nodeTable.storeNode(g) ;
-// NodeId sId = nodeTable.storeNode(s) ;
-// NodeId pId = nodeTable.storeNode(p) ;
-// NodeId oId = nodeTable.storeNode(o) ;
-//
-// return Tuple.create(gId, sId, pId, oId) ;
-// }
-
// ---- Tuples and Records
public static Tuple<NodeId> tuple(Record r, ColumnMap cMap)
{
@@ -206,8 +169,7 @@ public class TupleLib
NodeId[] nodeIds = new NodeId[N] ;
for ( int i = 0 ; i < N ; i++ )
{
- long x = Bytes.getLong(r.getKey(), i*SizeOfLong) ;
- NodeId id = NodeId.create(x) ;
+ NodeId id = NodeId.create(r.getKey(), i*SizeOfLong) ;
int j = i ;
if ( cMap != null )
j = cMap.fetchSlotIdx(i) ;
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=1531564&r1=1531563&r2=1531564&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 Sat Oct 12 17:30:57 2013
@@ -126,10 +126,10 @@ public class SolverLib
Tuple<Node> tuple = null ;
if ( graphNode == null )
// 3-tuples
- tuple = Tuple.create(triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
+ tuple = Tuple.createTuple(triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
else
// 4-tuples.
- tuple = Tuple.create(graphNode, triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
+ tuple = Tuple.createTuple(graphNode, triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
chain = solve(nodeTupleTable, tuple, anyGraph, chain, filter, execCxt) ;
chain = makeAbortable(chain, killList) ;
}
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=1531564&r1=1531563&r2=1531564&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 Sat Oct 12 17:30:57 2013
@@ -153,10 +153,10 @@ public class StageMatchTuple extends Rep
public Tuple<NodeId> convert(Tuple<NodeId> item)
{
// Zap graph node id.
- Tuple<NodeId> t2 = Tuple.create(NodeId.NodeIdAny, // Can't be null - gets bound to a daft variable.
- item.get(1),
- item.get(2),
- item.get(3)) ;
+ Tuple<NodeId> t2 = Tuple.createTuple(NodeId.NodeIdAny, // Can't be null - gets bound to a daft variable.
+ item.get(1),
+ item.get(2),
+ item.get(3)) ;
return t2 ;
} } ;
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=1531564&r1=1531563&r2=1531564&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 Sat Oct 12 17:30:57 2013
@@ -164,7 +164,7 @@ public class GraphTDB extends GraphView
public Tuple<NodeId> convert(Tuple<NodeId> item) {
if ( item.size() != 4 )
throw new TDBException("Expected a Tuple of 4, got: "+item) ;
- return Tuple.create(item.get(1), item.get(2), item.get(3)) ;
+ return Tuple.createTuple(item.get(1), item.get(2), item.get(3)) ;
}} ;
// Convert from Iterator<Quad> to Iterator<Triple>
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=1531564&r1=1531563&r2=1531564&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 Sat Oct 12 17:30:57 2013
@@ -18,13 +18,13 @@
package com.hp.hpl.jena.tdb.index;
-
import java.util.Iterator ;
import java.util.Set ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.junit.BaseTest ;
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.store.NodeId ;
@@ -43,7 +43,7 @@ public abstract class AbstractTestTupleI
protected static void add(TupleIndex index, NodeId x1, NodeId x2, NodeId x3)
{
- Tuple<NodeId> tuple = Tuple.create(x1, x2, x3) ;
+ Tuple<NodeId> tuple = createTuple(x1, x2, x3) ;
index.add(tuple) ;
}
@@ -58,7 +58,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertTrue(iter.hasNext()) ;
iter.next();
@@ -70,7 +70,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, null) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, null) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertTrue(iter.hasNext()) ;
iter.next();
@@ -82,7 +82,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, null, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, null, n3) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertTrue(iter.hasNext()) ;
iter.next();
@@ -94,7 +94,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertTrue(iter.hasNext()) ;
iter.next();
@@ -107,12 +107,12 @@ public abstract class AbstractTestTupleI
add(index, n1, n2, n3) ;
add(index, n1, n2, n4) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(1, x.size()) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n3))) ;
- assertFalse(x.contains(Tuple.create(n1, n2, n4))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n3))) ;
+ assertFalse(x.contains(createTuple(n1, n2, n4))) ;
}
@Test public void TupleIndexRecordSPO_6()
@@ -121,12 +121,12 @@ public abstract class AbstractTestTupleI
add(index, n1, n2, n3) ;
add(index, n1, n2, n4) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(2, x.size()) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n3))) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n4))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n3))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n4))) ;
}
@Test public void TupleIndexRecordSPO_7()
@@ -135,12 +135,12 @@ public abstract class AbstractTestTupleI
add(index, n1, n2, n3) ;
add(index, n1, n2, n4) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(2, x.size()) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n3))) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n4))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n3))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n4))) ;
}
@Test public void TupleIndexRecordSPO_8()
@@ -150,19 +150,19 @@ public abstract class AbstractTestTupleI
add(index, n2, n3, n4) ;
{
- Tuple<NodeId> tuple2 = Tuple.create(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(1, x.size()) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n3))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n3))) ;
}
{
- Tuple<NodeId> tuple2 = Tuple.create(n2, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n2, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(1, x.size()) ;
- assertTrue(x.contains(Tuple.create(n2, n3, n4))) ;
+ assertTrue(x.contains(createTuple(n2, n3, n4))) ;
}
}
@@ -170,7 +170,7 @@ public abstract class AbstractTestTupleI
{
TupleIndex index = create("POS") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertTrue("Can't find tuple", iter.hasNext()) ;
iter.next();
@@ -182,7 +182,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("POS") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(null, n2, null) ;
+ Tuple<NodeId> tuple2 = createTuple(null, n2, null) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertTrue("Can't find tuple",iter.hasNext()) ;
iter.next();
@@ -195,7 +195,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("POS") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(null, n2, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(null, n2, n3) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertTrue("Can't find tuple", iter.hasNext()) ;
iter.next();
@@ -207,7 +207,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n4, n5, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n4, n5, n6) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertNotNull(iter) ;
assertFalse(iter.hasNext()) ;
@@ -218,7 +218,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n5, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n5, n6) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertFalse(iter.hasNext()) ;
}
@@ -228,7 +228,7 @@ public abstract class AbstractTestTupleI
TupleIndex index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, null, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, null, n6) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertFalse(iter.hasNext()) ;
}
@@ -239,7 +239,7 @@ public abstract class AbstractTestTupleI
add(index, n1, n2, n3) ;
add(index, n1, n5, n6) ;
- Tuple<NodeId> tuple2 = Tuple.create(n4, n5, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n4, n5, n6) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertFalse(iter.hasNext()) ;
}
@@ -250,7 +250,7 @@ public abstract class AbstractTestTupleI
add(index, n1, n2, n3) ;
add(index, n1, n5, n6) ;
- Tuple<NodeId> tuple2 = Tuple.create(n2, n5, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n2, n5, n6) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertFalse(iter.hasNext()) ;
}
@@ -261,7 +261,7 @@ public abstract class AbstractTestTupleI
add(index, n1, n2, n3) ;
add(index, n4, n5, n6) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, null, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, null, n6) ;
Iterator<Tuple<NodeId>> iter = index.find(tuple2) ;
assertFalse(iter.hasNext()) ;
}
Modified: 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/index/TestTupleIndexRecordDirect.java?rev=1531564&r1=1531563&r2=1531564&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/index/TestTupleIndexRecordDirect.java Sat Oct 12 17:30:57 2013
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.tdb.index;
-
import java.util.Iterator ;
import java.util.Set ;
@@ -26,6 +25,8 @@ import org.apache.jena.atlas.iterator.It
import org.apache.jena.atlas.junit.BaseTest ;
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 ;
@@ -53,7 +54,7 @@ public class TestTupleIndexRecordDirect
static void add(TupleIndexRecord index, NodeId x1, NodeId x2, NodeId x3)
{
- Tuple<NodeId> tuple = Tuple.create(x1, x2, x3) ;
+ Tuple<NodeId> tuple = createTuple(x1, x2, x3) ;
index.add(tuple) ;
}
@@ -68,7 +69,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertTrue(iter.hasNext()) ;
iter.next();
@@ -80,7 +81,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, null) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, null) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertTrue(iter.hasNext()) ;
iter.next();
@@ -92,7 +93,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, null, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, null, n3) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertNull(iter) ;
iter = index.findOrPartialScan(tuple2) ;
@@ -106,7 +107,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertTrue(iter.hasNext()) ;
iter.next();
@@ -119,12 +120,12 @@ public class TestTupleIndexRecordDirect
add(index, n1, n2, n3) ;
add(index, n1, n2, n4) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(1, x.size()) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n3))) ;
- assertFalse(x.contains(Tuple.create(n1, n2, n4))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n3))) ;
+ assertFalse(x.contains(createTuple(n1, n2, n4))) ;
}
@Test public void TupleIndexRecordSPO_6()
@@ -133,12 +134,12 @@ public class TestTupleIndexRecordDirect
add(index, n1, n2, n3) ;
add(index, n1, n2, n4) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(2, x.size()) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n3))) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n4))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n3))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n4))) ;
}
@Test public void TupleIndexRecordSPO_7()
@@ -147,12 +148,12 @@ public class TestTupleIndexRecordDirect
add(index, n1, n2, n3) ;
add(index, n1, n2, n4) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(2, x.size()) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n3))) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n4))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n3))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n4))) ;
}
@Test public void TupleIndexRecordSPO_8()
@@ -162,19 +163,19 @@ public class TestTupleIndexRecordDirect
add(index, n2, n3, n4) ;
{
- Tuple<NodeId> tuple2 = Tuple.create(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(1, x.size()) ;
- assertTrue(x.contains(Tuple.create(n1, n2, n3))) ;
+ assertTrue(x.contains(createTuple(n1, n2, n3))) ;
}
{
- Tuple<NodeId> tuple2 = Tuple.create(n2, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
+ Tuple<NodeId> tuple2 = createTuple(n2, NodeId.NodeIdAny, NodeId.NodeIdAny) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
Set<Tuple<NodeId>> x = Iter.toSet(iter) ;
assertEquals(1, x.size()) ;
- assertTrue(x.contains(Tuple.create(n2, n3, n4))) ;
+ assertTrue(x.contains(createTuple(n2, n3, n4))) ;
}
}
@@ -182,7 +183,7 @@ public class TestTupleIndexRecordDirect
{
TupleIndexRecord index = create("POS") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n2, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n2, n3) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertTrue("Can't find tuple", iter.hasNext()) ;
iter.next();
@@ -194,7 +195,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("POS") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(null, n2, null) ;
+ Tuple<NodeId> tuple2 = createTuple(null, n2, null) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertTrue("Can't find tuple",iter.hasNext()) ;
iter.next();
@@ -207,7 +208,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("POS") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(null, n2, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(null, n2, n3) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertTrue("Can't find tuple", iter.hasNext()) ;
iter.next();
@@ -218,7 +219,7 @@ public class TestTupleIndexRecordDirect
{
TupleIndexRecord index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, null, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, null, n3) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertNull(iter) ;
iter = index.findOrPartialScan(tuple2) ;
@@ -234,7 +235,7 @@ public class TestTupleIndexRecordDirect
add(index, n1, n2, n4) ;
- Tuple<NodeId> tuple2 = Tuple.create(null, null, n3) ;
+ Tuple<NodeId> tuple2 = createTuple(null, null, n3) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertNull(iter) ;
@@ -252,7 +253,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n4, n5, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n4, n5, n6) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertNotNull(iter) ;
assertFalse(iter.hasNext()) ;
@@ -263,7 +264,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, n5, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, n5, n6) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertFalse(iter.hasNext()) ;
}
@@ -273,7 +274,7 @@ public class TestTupleIndexRecordDirect
TupleIndexRecord index = create("SPO") ;
add(index, n1, n2, n3) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, null, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, null, n6) ;
Iterator<Tuple<NodeId>> iter = index.findOrPartialScan(tuple2) ;
assertFalse(iter.hasNext()) ;
}
@@ -284,7 +285,7 @@ public class TestTupleIndexRecordDirect
add(index, n1, n2, n3) ;
add(index, n1, n5, n6) ;
- Tuple<NodeId> tuple2 = Tuple.create(n4, n5, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n4, n5, n6) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertFalse(iter.hasNext()) ;
}
@@ -295,7 +296,7 @@ public class TestTupleIndexRecordDirect
add(index, n1, n2, n3) ;
add(index, n1, n5, n6) ;
- Tuple<NodeId> tuple2 = Tuple.create(n2, n5, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n2, n5, n6) ;
Iterator<Tuple<NodeId>> iter = index.findByIndex(tuple2) ;
assertFalse(iter.hasNext()) ;
}
@@ -306,7 +307,7 @@ public class TestTupleIndexRecordDirect
add(index, n1, n2, n3) ;
add(index, n4, n5, n6) ;
- Tuple<NodeId> tuple2 = Tuple.create(n1, null, n6) ;
+ Tuple<NodeId> tuple2 = createTuple(n1, null, n6) ;
Iterator<Tuple<NodeId>> iter = index.findOrPartialScan(tuple2) ;
assertFalse(iter.hasNext()) ;
}
Modified: 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/index/TestTupleTable.java?rev=1531564&r1=1531563&r2=1531564&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/index/TestTupleTable.java Sat Oct 12 17:30:57 2013
@@ -18,12 +18,9 @@
package com.hp.hpl.jena.tdb.index;
-
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;
@@ -33,6 +30,7 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.Tuple ;
+import static org.apache.jena.atlas.lib.Tuple.* ;
import org.junit.Test;
@@ -66,7 +64,7 @@ public class TestTupleTable extends Base
static void add(TupleTable table, NodeId x1, NodeId x2, NodeId x3)
{
- Tuple<NodeId> tuple = Tuple.create(x1, x2, x3) ;
+ Tuple<NodeId> tuple = createTuple(x1, x2, x3) ;
table.add(tuple) ;
}
@@ -77,13 +75,13 @@ public class TestTupleTable extends Base
TupleTable table = create() ;
add(table, n1, n2, n3) ;
// Cast removes compile lint warning.
- Tuple<NodeId> pat = Tuple.create((NodeId)null, null, null) ;
+ Tuple<NodeId> pat = createTuple((NodeId)null, null, null) ;
Iterator<Tuple<NodeId>> iter = table.find(pat) ;
List<Tuple<NodeId>> x = Iter.toList(iter) ;
int z = x.size() ;
assertEquals(1, z) ;
Tuple<NodeId> e1 = x.get(0) ;
- assertEquals(Tuple.create(n1, n2, n3) , e1) ;
+ assertEquals(createTuple(n1, n2, n3) , e1) ;
}
@Test public void createFind2()
@@ -92,7 +90,7 @@ public class TestTupleTable extends Base
add(table, n1, n2, n3) ;
add(table, n1, n2, n4) ;
- Tuple<NodeId> pat = Tuple.create(null, n2, null) ;
+ Tuple<NodeId> pat = createTuple(null, n2, null) ;
Iterator<Tuple<NodeId>> iter = table.find(pat) ;
assertNotNull(iter) ;
List<Tuple<NodeId>> x = Iter.toList(iter) ;
@@ -101,8 +99,8 @@ public class TestTupleTable extends Base
Tuple<NodeId> e1 = x.get(0) ;
Tuple<NodeId> e2 = x.get(1) ;
- assertEquals(Tuple.create(n1, n2, n3) , e1) ;
- assertEquals(Tuple.create(n1, n2, n4) , e2) ;
+ assertEquals(createTuple(n1, n2, n3) , e1) ;
+ assertEquals(createTuple(n1, n2, n4) , e2) ;
}
@Test public void createFind3()
@@ -112,7 +110,7 @@ public class TestTupleTable extends Base
add(table, n1, n2, n3) ;
add(table, n1, n2, n4) ;
- Tuple<NodeId> pat = Tuple.create(n1, null, n3) ;
+ Tuple<NodeId> pat = createTuple(n1, null, n3) ;
Iterator<Tuple<NodeId>> iter = table.find(pat) ;
assertNotNull(iter) ;
List<Tuple<NodeId>> x = Iter.toList(iter) ;
@@ -120,7 +118,7 @@ public class TestTupleTable extends Base
assertEquals(1, z) ;
Tuple<NodeId> e1 = x.get(0) ;
- assertEquals(Tuple.create(n1, n2, n3) , e1) ;
+ assertEquals(createTuple(n1, n2, n3) , e1) ;
}
@Test public void createFind4()
@@ -130,7 +128,7 @@ public class TestTupleTable extends Base
add(table, n1, n2, n3) ;
add(table, n1, n2, n4) ;
- Tuple<NodeId> pat = Tuple.create(null, null, n3) ;
+ Tuple<NodeId> pat = createTuple(null, null, n3) ;
Iterator<Tuple<NodeId>> iter = table.find(pat) ;
assertNotNull(iter) ;
List<Tuple<NodeId>> x = Iter.toList(iter) ;
@@ -138,7 +136,7 @@ public class TestTupleTable extends Base
assertEquals(1, z) ;
Tuple<NodeId> e1 = x.get(0) ;
- assertEquals(Tuple.create(n1, n2, n3) , e1) ;
+ assertEquals(createTuple(n1, n2, n3) , e1) ;
}
@Test public void createFind5()
@@ -148,7 +146,7 @@ public class TestTupleTable extends Base
add(table, n1, n2, n3) ;
add(table, n1, n2, n4) ;
- Tuple<NodeId> pat = Tuple.create(null, NodeId.NodeIdAny, n3) ;
+ Tuple<NodeId> pat = createTuple(null, NodeId.NodeIdAny, n3) ;
Iterator<Tuple<NodeId>> iter = table.find(pat) ;
assertNotNull(iter) ;
List<Tuple<NodeId>> x = Iter.toList(iter) ;
@@ -156,7 +154,7 @@ public class TestTupleTable extends Base
assertEquals(1, z) ;
Tuple<NodeId> e1 = x.get(0) ;
- assertEquals(Tuple.create(n1, n2, n3) , e1) ;
+ assertEquals(createTuple(n1, n2, n3) , e1) ;
}
}