Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4228] branches/QUADS_QUERY_BRANCH/bigdata/src/test/com /bigdata
|
From: <mrp...@us...> - 2011-02-22 23:38:07
|
Revision: 4228
http://bigdata.svn.sourceforge.net/bigdata/?rev=4228&view=rev
Author: mrpersonick
Date: 2011-02-22 23:38:00 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
refactor constraints -> value expressions
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/bset/TestConditionalRoutingOp.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/bset/TestCopyBindingSets.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestEQ.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestEQConstant.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestINConstraint.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestInBinarySearch.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestNE.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestNEConstant.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestOR.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph/TestPartitionedJoinGroup.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility_canJoinUsingConstraints.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/relation/rule/AbstractRuleTestCase.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/bset/TestConditionalRoutingOp.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/bset/TestConditionalRoutingOp.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/bset/TestConditionalRoutingOp.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -44,6 +44,7 @@
import com.bigdata.bop.Var;
import com.bigdata.bop.bindingSet.ArrayBindingSet;
import com.bigdata.bop.bindingSet.HashBindingSet;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.EQConstant;
import com.bigdata.bop.engine.BOpStats;
import com.bigdata.bop.engine.BlockingBufferWithStats;
@@ -151,7 +152,7 @@
NV.asMap(new NV[]{//
new NV(BOp.Annotations.BOP_ID,bopId),//
new NV(ConditionalRoutingOp.Annotations.CONDITION,
- new EQConstant(x,new Constant<String>("Mary"))),//
+ Constraint.wrap(new EQConstant(x,new Constant<String>("Mary")))),//
}));
// the expected solutions (default sink).
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/bset/TestCopyBindingSets.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/bset/TestCopyBindingSets.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/bset/TestCopyBindingSets.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -42,6 +42,7 @@
import com.bigdata.bop.NV;
import com.bigdata.bop.Var;
import com.bigdata.bop.bindingSet.HashBindingSet;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.EQConstant;
import com.bigdata.bop.engine.BOpStats;
import com.bigdata.bop.engine.BlockingBufferWithStats;
@@ -246,7 +247,7 @@
new NV(BOp.Annotations.BOP_ID, bopId),//
new NV(CopyOp.Annotations.CONSTRAINTS,
new IConstraint[] {
- new EQConstant(x, new Constant<String>("Mary"))
+ Constraint.wrap(new EQConstant(x, new Constant<String>("Mary")))
}),//
}));
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestEQ.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestEQ.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestEQ.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -94,7 +94,7 @@
new IConstant[] { new Constant<String>("1"),
new Constant<String>("1") });
- assertTrue(op.accept(bs1));
+ assertTrue(op.get(bs1));
}
@@ -110,7 +110,7 @@
new IConstant[] { new Constant<String>("1"),
new Constant<String>("2") });
- assertFalse(op.accept(bs1));
+ assertFalse(op.get(bs1));
}
@@ -122,7 +122,7 @@
new IVariable[] { Var.var("x") }, //
new IConstant[] { new Constant<String>("1") });
- assertTrue(op.accept(bs1));
+ assertTrue(op.get(bs1));
}
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestEQConstant.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestEQConstant.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestEQConstant.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -88,9 +88,9 @@
IBindingSet ne2 = new ArrayBindingSet ( new IVariable<?> [] { var }, new IConstant [] { val3 } ) ;
IBindingSet nb = new ArrayBindingSet ( new IVariable<?> [] {}, new IConstant [] {} ) ;
- assertTrue ( op.accept ( eq ) ) ;
- assertFalse ( op.accept ( ne1 ) ) ;
- assertFalse ( op.accept ( ne2 ) ) ;
- assertTrue ( op.accept ( nb ) ) ;
+ assertTrue ( op.get ( eq ) ) ;
+ assertFalse ( op.get ( ne1 ) ) ;
+ assertFalse ( op.get ( ne2 ) ) ;
+ assertTrue ( op.get ( nb ) ) ;
}
}
\ No newline at end of file
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestINConstraint.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestINConstraint.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestINConstraint.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -123,9 +123,9 @@
IBindingSet notin = new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { val3 } ) ;
IBindingSet nb = new ArrayBindingSet ( new IVariable<?> [] {}, new IConstant [] {} ) ;
- assertTrue ( op.accept ( in ) ) ;
- assertFalse ( op.accept ( notin ) ) ;
- assertTrue ( op.accept ( nb ) ) ;
+ assertTrue ( op.get ( in ) ) ;
+ assertFalse ( op.get ( notin ) ) ;
+ assertTrue ( op.get ( nb ) ) ;
}
protected abstract INConstraint newINConstraint ( IVariable<?> var, IConstant<?> vals [] ) ;
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestInBinarySearch.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestInBinarySearch.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestInBinarySearch.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -79,10 +79,10 @@
INConstraint op = new INBinarySearch ( x, vals ) ;
- assertTrue ( op.accept ( new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<Integer> ( 21 ) } ) ) ) ;
- assertTrue ( op.accept ( new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<Integer> ( 37 ) } ) ) ) ;
- assertTrue ( op.accept ( new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<Integer> ( 75 ) } ) ) ) ;
- assertFalse ( op.accept ( new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<Integer> ( 101 ) } ) ) ) ;
+ assertTrue ( op.get ( new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<Integer> ( 21 ) } ) ) ) ;
+ assertTrue ( op.get ( new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<Integer> ( 37 ) } ) ) ) ;
+ assertTrue ( op.get ( new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<Integer> ( 75 ) } ) ) ) ;
+ assertFalse ( op.get ( new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<Integer> ( 101 ) } ) ) ) ;
}
@Override protected INConstraint newINConstraint ( IVariable<?> var, IConstant<?> vals [] )
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestNE.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestNE.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestNE.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -75,9 +75,9 @@
}
/**
- * Unit test for {@link NE#accept(IBindingSet)}
+ * Unit test for {@link NE#get(IBindingSet)}
*/
- public void testAccept ()
+ public void testGet ()
{
Var<?> x = Var.var ( "x" ) ;
Var<?> y = Var.var ( "y" ) ;
@@ -89,8 +89,8 @@
IBindingSet ne = new ArrayBindingSet ( vars, new IConstant [] { new Constant<String> ( "1" ), new Constant<String> ( "2" ) } ) ;
IBindingSet nb = new ArrayBindingSet ( new IVariable<?> [] { x }, new IConstant [] { new Constant<String> ( "1" ) } ) ;
- assertTrue ( op.accept ( ne ) ) ;
- assertFalse ( op.accept ( eq ) ) ;
- assertTrue ( op.accept ( nb ) ) ;
+ assertTrue ( op.get ( ne ) ) ;
+ assertFalse ( op.get ( eq ) ) ;
+ assertTrue ( op.get ( nb ) ) ;
}
}
\ No newline at end of file
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestNEConstant.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestNEConstant.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestNEConstant.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -72,7 +72,7 @@
}
/**
- * Unit test for {@link NEConstant#accept(IBindingSet)}
+ * Unit test for {@link NEConstant#get(IBindingSet)}
*/
public void testAccept ()
{
@@ -88,9 +88,9 @@
IBindingSet ne2 = new ArrayBindingSet ( new IVariable<?> [] { var }, new IConstant [] { val3 } ) ;
IBindingSet nb = new ArrayBindingSet ( new IVariable<?> [] {}, new IConstant [] {} ) ;
- assertFalse ( op.accept ( eq ) ) ;
- assertTrue ( op.accept ( ne1 ) ) ;
- assertTrue ( op.accept ( ne2 ) ) ;
- assertTrue ( op.accept ( nb ) ) ;
+ assertFalse ( op.get ( eq ) ) ;
+ assertTrue ( op.get ( ne1 ) ) ;
+ assertTrue ( op.get ( ne2 ) ) ;
+ assertTrue ( op.get ( nb ) ) ;
}
}
\ No newline at end of file
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestOR.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestOR.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/constraint/TestOR.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -63,8 +63,8 @@
*/
public void testConstructor ()
{
- IConstraint eq = new EQ ( Var.var ( "x" ), Var.var ( "y" ) ) ;
- IConstraint ne = new EQ ( Var.var ( "x" ), Var.var ( "y" ) ) ;
+ BooleanValueExpression eq = new EQ ( Var.var ( "x" ), Var.var ( "y" ) ) ;
+ BooleanValueExpression ne = new EQ ( Var.var ( "x" ), Var.var ( "y" ) ) ;
try { assertTrue ( null != new OR ( null, eq ) ) ; fail ( "IllegalArgumentException expected, lhs was null" ) ; }
catch ( IllegalArgumentException e ) {}
@@ -76,7 +76,7 @@
}
/**
- * Unit test for {@link OR#accept(IBindingSet)}
+ * Unit test for {@link OR#get(IBindingSet)}
*/
public void testAccept ()
{
@@ -85,8 +85,8 @@
Constant<Integer> val1 = new Constant<Integer> ( 1 ) ;
Constant<Integer> val2 = new Constant<Integer> ( 2 ) ;
- IConstraint eq = new EQ ( x, y ) ;
- IConstraint eqc = new EQConstant ( y, val2 ) ;
+ BooleanValueExpression eq = new EQ ( x, y ) ;
+ BooleanValueExpression eqc = new EQConstant ( y, val2 ) ;
OR op = new OR ( eq, eqc ) ;
@@ -94,8 +94,8 @@
IBindingSet eqrhs = new ArrayBindingSet ( new IVariable<?> [] { x, y }, new IConstant [] { val1, val2 } ) ;
IBindingSet ne = new ArrayBindingSet ( new IVariable<?> [] { x, y }, new IConstant [] { val2, val1 } ) ;
- assertTrue ( op.accept ( eqlhs ) ) ;
- assertTrue ( op.accept ( eqrhs ) ) ;
- assertFalse ( op.accept ( ne ) ) ;
+ assertTrue ( op.get ( eqlhs ) ) ;
+ assertTrue ( op.get ( eqrhs ) ) ;
+ assertFalse ( op.get ( ne ) ) ;
}
}
\ No newline at end of file
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -56,6 +56,7 @@
import com.bigdata.bop.bindingSet.HashBindingSet;
import com.bigdata.bop.bset.ConditionalRoutingOp;
import com.bigdata.bop.bset.StartOp;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.NEConstant;
import com.bigdata.bop.engine.BOpStats;
import com.bigdata.bop.engine.IChunkMessage;
@@ -598,7 +599,7 @@
new NV(PipelineJoin.Annotations.PREDICATE, pred3Op),//
// constraint d != Leon
new NV(PipelineJoin.Annotations.CONSTRAINTS,
- new IConstraint[] { new NEConstant(d, new Constant<String>("Leon")) })
+ new IConstraint[] { Constraint.wrap(new NEConstant(d, new Constant<String>("Leon"))) })
// // join is optional.
// new NV(PipelineJoin.Annotations.OPTIONAL, true),//
// // optional target is the same as the default target.
@@ -834,7 +835,7 @@
new NV(Predicate.Annotations.BOP_ID, joinId1),//
new NV(PipelineJoin.Annotations.PREDICATE,pred1Op));
- final IConstraint condition = new NEConstant(a, new Constant<String>("Paul"));
+ final IConstraint condition = Constraint.wrap(new NEConstant(a, new Constant<String>("Paul")));
final ConditionalRoutingOp condOp = new ConditionalRoutingOp(new BOp[]{join1Op},
NV.asMap(new NV[]{//
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -62,6 +62,7 @@
import com.bigdata.bop.bindingSet.HashBindingSet;
import com.bigdata.bop.bset.ConditionalRoutingOp;
import com.bigdata.bop.bset.StartOp;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.EQ;
import com.bigdata.bop.constraint.EQConstant;
import com.bigdata.bop.fed.TestFederatedQueryEngine;
@@ -1144,8 +1145,8 @@
new NV(PipelineJoin.Annotations.PREDICATE, predOp),//
// impose constraint on the join.
new NV(PipelineJoin.Annotations.CONSTRAINTS,
- new IConstraint[] { new EQConstant(y,
- new Constant<String>("Paul")) })//
+ new IConstraint[] { Constraint.wrap(new EQConstant(y,
+ new Constant<String>("Paul"))) })//
);
final PipelineOp query = new SliceOp(new BOp[] { joinOp },
@@ -1610,7 +1611,7 @@
new NV(PipelineJoin.Annotations.PREDICATE, pred2Op),//
// constraint x == z
new NV(PipelineJoin.Annotations.CONSTRAINTS,
- new IConstraint[] { new EQ(x, z) }),
+ new IConstraint[] { Constraint.wrap(new EQ(x, z)) }),
// join is optional.
// optional target is the same as the default target.
new NV(PipelineOp.Annotations.ALT_SINK_REF, sliceId));
@@ -1769,7 +1770,7 @@
int joinId1 = 2;
int joinId2 = 3;
- IConstraint condition = new EQConstant(Var.var("x"), new Constant<String>("Mary"));
+ IConstraint condition = Constraint.wrap(new EQConstant(Var.var("x"), new Constant<String>("Mary")));
IRunningQuery runningQuery = initQueryWithConditionalRoutingOp(condition, startId, joinId1, joinId2);
// verify solutions.
@@ -1851,7 +1852,7 @@
int joinId2 = 3;
// 'x' is actually bound to "Mary" so this condition will be false.
- IConstraint condition = new EQConstant(Var.var("x"), new Constant<String>("Fred"));
+ IConstraint condition = Constraint.wrap(new EQConstant(Var.var("x"), new Constant<String>("Fred")));
IRunningQuery runningQuery = initQueryWithConditionalRoutingOp(condition, startId, joinId1, joinId2);
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -38,18 +38,19 @@
import com.bigdata.bop.IBindingSet;
import com.bigdata.bop.IConstant;
import com.bigdata.bop.IConstraint;
+import com.bigdata.bop.IPredicate.Annotations;
import com.bigdata.bop.IVariable;
import com.bigdata.bop.IVariableOrConstant;
import com.bigdata.bop.NV;
import com.bigdata.bop.PipelineOp;
import com.bigdata.bop.Var;
-import com.bigdata.bop.IPredicate.Annotations;
import com.bigdata.bop.ap.E;
import com.bigdata.bop.ap.Predicate;
import com.bigdata.bop.ap.R;
import com.bigdata.bop.bindingSet.ArrayBindingSet;
import com.bigdata.bop.bindingSet.HashBindingSet;
import com.bigdata.bop.bset.StartOp;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.EQ;
import com.bigdata.bop.constraint.EQConstant;
import com.bigdata.bop.engine.BOpStats;
@@ -719,8 +720,8 @@
BOpEvaluationContext.SHARDED),//
// impose constraint on the join.
new NV(PipelineJoin.Annotations.CONSTRAINTS,
- new IConstraint[] { new EQConstant(y,
- new Constant<String>("Paul")) }));
+ new IConstraint[] { Constraint.wrap(new EQConstant(y,
+ new Constant<String>("Paul"))) }));
final PipelineOp query = new SliceOp(new BOp[] { joinOp },
// slice annotations
@@ -1240,7 +1241,7 @@
BOpEvaluationContext.SHARDED),//
// constraint x == z
new NV(PipelineJoin.Annotations.CONSTRAINTS,
- new IConstraint[] { new EQ(x, z) }),
+ new IConstraint[] { Constraint.wrap(new EQ(x,z)) }),
// optional target is the same as the default target.
new NV(PipelineOp.Annotations.ALT_SINK_REF, sliceId));
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -51,6 +51,7 @@
import com.bigdata.bop.bindingSet.ArrayBindingSet;
import com.bigdata.bop.bindingSet.HashBindingSet;
import com.bigdata.bop.bset.CopyOp;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.INBinarySearch;
import com.bigdata.bop.engine.BlockingBufferWithStats;
import com.bigdata.bop.engine.MockRunningQuery;
@@ -393,7 +394,7 @@
new NV(BOpBase.Annotations.BOP_ID, joinId),//
new NV(PipelineJoin.Annotations.PREDICATE, predOp),//
new NV(PipelineJoin.Annotations.CONSTRAINTS,
- new IConstraint[] { new INBinarySearch<String>(y, set) }));
+ new IConstraint[] { Constraint.wrap(new INBinarySearch<String>(y, set)) }));
// the expected solution (just one).
final IBindingSet[] expected = new IBindingSet[] {//
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph/TestPartitionedJoinGroup.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph/TestPartitionedJoinGroup.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph/TestPartitionedJoinGroup.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -30,30 +30,19 @@
import java.util.Arrays;
import java.util.Iterator;
-import org.openrdf.query.algebra.Compare.CompareOp;
-import org.openrdf.query.algebra.MathExpr.MathOp;
-
import junit.framework.TestCase2;
import com.bigdata.bop.BOp;
import com.bigdata.bop.Constant;
import com.bigdata.bop.IConstraint;
import com.bigdata.bop.IPredicate;
+import com.bigdata.bop.IPredicate.Annotations;
import com.bigdata.bop.IVariable;
import com.bigdata.bop.NV;
import com.bigdata.bop.Var;
-import com.bigdata.bop.IPredicate.Annotations;
import com.bigdata.bop.ap.Predicate;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.NEConstant;
-import com.bigdata.bop.joinGraph.PartitionedJoinGroup;
-import com.bigdata.rdf.internal.XSDIntIV;
-import com.bigdata.rdf.internal.constraints.CompareBOp;
-import com.bigdata.rdf.internal.constraints.MathBOp;
-import com.bigdata.rdf.model.BigdataURI;
-import com.bigdata.rdf.model.BigdataValue;
-import com.bigdata.rdf.model.BigdataValueFactory;
-import com.bigdata.rdf.spo.SPOPredicate;
-import com.bigdata.rdf.store.AbstractTripleStore;
/**
* Unit tests for {@link PartitionedJoinGroup}.
@@ -220,11 +209,11 @@
// Test w/ constraint(s) on the join graph.
{
- final IConstraint c1 = new NEConstant(x,
- new Constant<String>("Bob"));
+ final IConstraint c1 = Constraint.wrap(new NEConstant(x,
+ new Constant<String>("Bob")));
- final IConstraint c2 = new NEConstant(y,
- new Constant<String>("UNCG"));
+ final IConstraint c2 = Constraint.wrap(new NEConstant(y,
+ new Constant<String>("UNCG")));
final IConstraint[] constraints = new IConstraint[] { c1, c2 };
@@ -417,14 +406,14 @@
// Test w/ constraint(s) on the join graph.
{
- final IConstraint c1 = new NEConstant(x,
- new Constant<String>("Bob"));
+ final IConstraint c1 = Constraint.wrap(new NEConstant(x,
+ new Constant<String>("Bob")));
- final IConstraint c2 = new NEConstant(y,
- new Constant<String>("UNCG"));
+ final IConstraint c2 = Constraint.wrap(new NEConstant(y,
+ new Constant<String>("UNCG")));
- final IConstraint c3 = new NEConstant(z,
- new Constant<String>("Physics"));
+ final IConstraint c3 = Constraint.wrap(new NEConstant(z,
+ new Constant<String>("Physics")));
final IConstraint[] constraints = new IConstraint[] { c1, c2, c3 };
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -37,6 +37,7 @@
import com.bigdata.bop.NV;
import com.bigdata.bop.Var;
import com.bigdata.bop.ap.Predicate;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.NEConstant;
/**
@@ -94,7 +95,7 @@
new Predicate(new BOp[]{Var.var("y"),Var.var("z")}),//
};
final IConstraint[] constraints = new IConstraint[] { //
- new NEConstant(Var.var("x"), new Constant<Long>(12L)) //
+ Constraint.wrap(new NEConstant(Var.var("x"), new Constant<Long>(12L))) //
};
final JoinGraph joinGraph = new JoinGraph(new BOp[0],//
new NV(JoinGraph.Annotations.VERTICES, vertices),//
@@ -118,7 +119,7 @@
new Predicate(new BOp[]{Var.var("y"),Var.var("z")}),//
};
final IConstraint[] constraints = new IConstraint[] { //
- new NEConstant(Var.var("x"), new Constant<Long>(12L)) //
+ Constraint.wrap(new NEConstant(Var.var("x"), new Constant<Long>(12L))) //
};
final int limit = 50;
final int nedges = 1;
@@ -234,7 +235,7 @@
new Predicate(new BOp[] { Var.var("y"), Var.var("z") }),//
};
final IConstraint[] constraints = new IConstraint[] { //
- new NEConstant(Var.var("x"), new Constant<Long>(12L)) //
+ Constraint.wrap(new NEConstant(Var.var("x"), new Constant<Long>(12L))) //
};
final int limit = 0;
final int nedges = 1;
@@ -262,7 +263,7 @@
new Predicate(new BOp[] { Var.var("y"), Var.var("z") }),//
};
final IConstraint[] constraints = new IConstraint[] { //
- new NEConstant(Var.var("x"), new Constant<Long>(12L)) //
+ Constraint.wrap(new NEConstant(Var.var("x"), new Constant<Long>(12L))) //
};
final int limit = 10;
final int nedges = 0;
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -29,7 +29,6 @@
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.FutureTask;
import junit.framework.TestCase2;
@@ -48,9 +47,6 @@
import com.bigdata.bop.NV;
import com.bigdata.bop.PipelineOp;
import com.bigdata.bop.Var;
-import com.bigdata.bop.BOp.Annotations;
-import com.bigdata.bop.ap.Predicate;
-import com.bigdata.bop.constraint.BOpConstraint;
/**
* Unit tests for {@link BOpUtility}.
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility_canJoinUsingConstraints.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility_canJoinUsingConstraints.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util/TestBOpUtility_canJoinUsingConstraints.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -46,10 +46,10 @@
import com.bigdata.bop.ImmutableBOp;
import com.bigdata.bop.NV;
import com.bigdata.bop.Var;
-import com.bigdata.bop.BOp.Annotations;
import com.bigdata.bop.ap.Predicate;
import com.bigdata.bop.constraint.AND;
-import com.bigdata.bop.constraint.BOpConstraint;
+import com.bigdata.bop.constraint.BooleanValueExpression;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.joinGraph.rto.JoinGraph.JGraph;
/**
@@ -214,7 +214,7 @@
new IPredicate[] { p2 }, // path
p1,// vertex
new IConstraint[] { //
- new NEConstant(x, new Constant<Integer>(12)), //
+ Constraint.wrap(new NEConstant(x, new Constant<Integer>(12))), //
null //
}// constraints
);
@@ -240,7 +240,7 @@
* used to test the logic which decides when two predicates can join based
* on variable(s) shared via a constraint.
*/
- static private final class MyCompareOp extends BOpConstraint {
+ static private final class MyCompareOp extends BooleanValueExpression {
private static final long serialVersionUID = 1L;
@@ -261,7 +261,7 @@
super(args, annotations);
}
- public boolean accept(IBindingSet bindingSet) {
+ public Boolean get(IBindingSet bindingSet) {
throw new UnsupportedOperationException();
}
@@ -272,7 +272,7 @@
* used to test the logic which decides when two predicates can join based
* on variable(s) shared via a constraint.
*/
- static private final class NEConstant extends BOpConstraint {
+ static private final class NEConstant extends BooleanValueExpression {
private static final long serialVersionUID = 1L;
@@ -297,7 +297,7 @@
this(new BOp[] { var, value }, null/* annotations */);
}
- public boolean accept(IBindingSet bindingSet) {
+ public Boolean get(IBindingSet bindingSet) {
throw new UnsupportedOperationException();
}
@@ -449,8 +449,8 @@
/**
* FILTER (productInstance != ?product)
*/
- final IConstraint c0 = new NEConstant(product, new Constant<String>(
- productInstance));
+ final IConstraint c0 = Constraint.wrap(new NEConstant(product, new Constant<String>(
+ productInstance)));
/**
* FILTER (?simProperty1 < (?origProperty1 + 120) && ?simProperty1 >
@@ -460,7 +460,7 @@
* that each of these is represented as its own IConstraint, but I have
* combined them for the purposes of these unit tests.
*/
- final IConstraint c1 = new AND(//
+ final IConstraint c1 = Constraint.wrap(new AND(//
new MyCompareOp(
new BOp[] {
simProperty1,
@@ -471,7 +471,7 @@
simProperty1,
new MathBOp(origProperty1, new Constant<Integer>(120),
MINUS) }, NV.asMap(new NV[] { new NV(OP, GT) }))//
- );
+ ));
/**
* FILTER (?simProperty2 < (?origProperty2 + 170) && ?simProperty2 >
@@ -481,7 +481,7 @@
* that each of these is represented as its own IConstraint, but I have
* combined them for the purposes of these unit tests.
*/
- final IConstraint c2 = new AND(//
+ final IConstraint c2 = Constraint.wrap(new AND(//
new MyCompareOp(
new BOp[] {
simProperty2,
@@ -492,7 +492,7 @@
simProperty2,
new MathBOp(origProperty2, new Constant<Integer>(170),
MINUS) }, NV.asMap(new NV[] { new NV(OP, GT) }))//
- );
+ ));
/** The constraints on the join graph. */
final IConstraint[] constraints = new IConstraint[] { c0, c1, c2 };
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/relation/rule/AbstractRuleTestCase.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/relation/rule/AbstractRuleTestCase.java 2011-02-22 23:36:59 UTC (rev 4227)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/relation/rule/AbstractRuleTestCase.java 2011-02-22 23:38:00 UTC (rev 4228)
@@ -30,15 +30,14 @@
import java.util.Map;
import junit.framework.TestCase2;
-import com.bigdata.rdf.internal.IV;
-import com.bigdata.rdf.internal.TermId;
-import com.bigdata.rdf.internal.VTE;
+
import com.bigdata.bop.BOp;
import com.bigdata.bop.Constant;
import com.bigdata.bop.IConstraint;
import com.bigdata.bop.IPredicate;
import com.bigdata.bop.IVariableOrConstant;
import com.bigdata.bop.Var;
+import com.bigdata.bop.constraint.Constraint;
import com.bigdata.bop.constraint.NE;
import com.bigdata.rdf.internal.IV;
import com.bigdata.rdf.internal.TermId;
@@ -102,7 +101,7 @@
new P(relation, var("v"), rdfType, var("u")) //
},//
new IConstraint[] {
- new NE(var("u"),var("x"))
+ Constraint.wrap(new NE(var("u"),var("x")))
}
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
