[Bigdata-commit] SF.net SVN: bigdata:[4186] branches/QUADS_QUERY_BRANCH

[<tho...@us...>]

Revision: 4186
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4186&view=rev
Author:   thompsonbry
Date:     2011-02-09 17:12:31 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
Fixed the deep copy constructor signature for Bind().
Fixed the set of unit tests run by build.xml (CI) (I reconciled them with com.bigdata.TestAll).
Fixed unit test for DistinctBindingSets to specify the necessary annotations.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/Bind.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/solutions/TestDistinctBindingSets.java
    branches/QUADS_QUERY_BRANCH/build.xml

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/Bind.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/Bind.java	2011-02-09 17:00:01 UTC (rev 4185)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/Bind.java	2011-02-09 17:12:31 UTC (rev 4186)
@@ -18,7 +18,7 @@
 	/**
 	 * Required deep copy constructor.
 	 */
-	public Bind(BOpBase op) {
+	public Bind(Bind<E> op) {
 		super(op);
 	}
 

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/solutions/TestDistinctBindingSets.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/solutions/TestDistinctBindingSets.java	2011-02-09 17:00:01 UTC (rev 4185)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/solutions/TestDistinctBindingSets.java	2011-02-09 17:12:31 UTC (rev 4186)
@@ -36,6 +36,7 @@
 
 import com.bigdata.bop.BOp;
 import com.bigdata.bop.BOpContext;
+import com.bigdata.bop.BOpEvaluationContext;
 import com.bigdata.bop.Constant;
 import com.bigdata.bop.IBindingSet;
 import com.bigdata.bop.IConstant;
@@ -178,6 +179,10 @@
                 NV.asMap(new NV[]{//
                     new NV(DistinctBindingSetOp.Annotations.BOP_ID,distinctId),//
                     new NV(DistinctBindingSetOp.Annotations.VARIABLES,new IVariable[]{x}),//
+                    new NV(MemorySortOp.Annotations.EVALUATION_CONTEXT,
+                            BOpEvaluationContext.CONTROLLER),//
+//                    new NV(MemorySortOp.Annotations.SHARED_STATE,
+//                            true),//
                 }));
         
         // the expected solutions

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-02-09 17:00:01 UTC (rev 4185)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-02-09 17:12:31 UTC (rev 4186)
@@ -1706,29 +1706,27 @@
         <test name="com.bigdata.striterator.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.counters.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.rawstore.TestAll" todir="${test.results.dir}" unless="testName" />
-
         <test name="com.bigdata.btree.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.concurrent.TestAll" todir="${test.results.dir}" unless="testName" />
-
       	<test name="com.bigdata.quorum.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.ha.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.io.writecache.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.journal.TestAll" todir="${test.results.dir}" unless="testName" />
-<!-- To run only specific test suites.
-        <test name="com.bigdata.journal.TestWORMStrategy" todir="${test.results.dir}" unless="testName" />
-        <test name="com.bigdata.rwstore.TestRWJournal" todir="${test.results.dir}" unless="testName" />
-        -->
       	<!-- Performance of this test suite has regressed and needs to be investigated.
-      	        <test name="com.bigdata.journal.ha.TestAll" todir="${test.results.dir}" unless="testName" />
+ 	    <test name="com.bigdata.journal.ha.TestAll" todir="${test.results.dir}" unless="testName" />
       	-->
-<!-- end of specific journal test suite runs. -->
-
         <test name="com.bigdata.resources.TestAll" todir="${test.results.dir}" unless="testName" />
+        <test name="com.bigdata.relation.TestAll" todir="${test.results.dir}" unless="testName" />
+        <test name="com.bigdata.bop.TestAll" todir="${test.results.dir}" unless="testName" />
+        <test name="com.bigdata.relation.rule.eval.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.mdi.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.service.TestAll" todir="${test.results.dir}" unless="testName" />
+        <test name="com.bigdata.bop.fed.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.sparse.TestAll" todir="${test.results.dir}" unless="testName" />
         <test name="com.bigdata.search.TestAll" todir="${test.results.dir}" unless="testName" />
-        <test name="com.bigdata.relation.TestAll" todir="${test.results.dir}" unless="testName" />
+        <!-- not suppported yet.
+        <test name="com.bigdata.bfs.TestAll" todir="${test.results.dir}" unless="testName" />
+        -->
 
         <!-- See https://sourceforge.net/apps/trac/bigdata/ticket/53 -->
         <test name="com.bigdata.jini.TestAll" todir="${test.results.dir}" unless="testName" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.