[Bigdata-commit] SF.net SVN: bigdata:[3431] branches/bugfix-btm

[<btm...@us...>]

Revision: 3431
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3431&view=rev
Author:   btmurphy
Date:     2010-08-06 22:34:57 +0000 (Fri, 06 Aug 2010)

Log Message:
-----------
merge -r3427:HEAD(3430) ~/bigdata/trunk ~/bigdata/branches/bugfix-btm [trunk --> branch bugfix-btm]

Modified Paths:
--------------
    branches/bugfix-btm/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoins.java
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java

Property Changed:
----------------
    branches/bugfix-btm/
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/config/
    branches/bugfix-btm/bigdata-perf/btc/src/
    branches/bugfix-btm/bigdata-perf/lubm/lib/
    branches/bugfix-btm/bigdata-perf/lubm/src/resources/
    branches/bugfix-btm/bigdata-perf/uniprot/src/
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
    branches/bugfix-btm/dsi-utils/src/java/
    branches/bugfix-btm/dsi-utils/src/test/


Property changes on: branches/bugfix-btm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:2595-2877,2883-3010,3012-3427
   + /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:2595-2877,2883-3010,3012-3430

Modified: branches/bugfix-btm/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java
===================================================================
--- branches/bugfix-btm/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java	2010-08-06 20:24:26 UTC (rev 3430)
+++ branches/bugfix-btm/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java	2010-08-06 22:34:57 UTC (rev 3431)
@@ -185,8 +185,7 @@
         
     }
 
-    // Note: used by assertEquals in the test cases.
-    public boolean equals(Object o) {
+    public boolean equals(final Object o) {
 
         if (this == o)
             return true;


Property changes on: branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco/config
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-jini/src/java/com/bigdata/disco/config:3270-3427
   + /trunk/bigdata-jini/src/java/com/bigdata/disco/config:3270-3430


Property changes on: branches/bugfix-btm/bigdata-perf/btc/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-perf/btc/src:3270-3427
   + /trunk/bigdata-perf/btc/src:3270-3430


Property changes on: branches/bugfix-btm/bigdata-perf/lubm/lib
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-perf/lubm/lib:3270-3427
   + /trunk/bigdata-perf/lubm/lib:3270-3430


Property changes on: branches/bugfix-btm/bigdata-perf/lubm/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-perf/lubm/src/resources:3270-3427
   + /trunk/bigdata-perf/lubm/src/resources:3270-3430


Property changes on: branches/bugfix-btm/bigdata-perf/uniprot/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-perf/uniprot/src:3270-3427
   + /trunk/bigdata-perf/uniprot/src:3270-3430


Property changes on: branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3426-3427
   + /trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3426-3430

Modified: branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoins.java
===================================================================
--- branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoins.java	2010-08-06 20:24:26 UTC (rev 3430)
+++ branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoins.java	2010-08-06 22:34:57 UTC (rev 3431)
@@ -108,7 +108,12 @@
 
             try {
 
-                tckSuite.addTest(BigdataSparqlTest.suiteLTSWithPipelineJoins());
+                /*
+                 * suite() will call suiteLTSWithPipelineJoins() and then
+                 * filter out the dataset tests, which we don't need right now
+                 */
+//                tckSuite.addTest(BigdataSparqlTest.suiteLTSWithPipelineJoins());
+                tckSuite.addTest(BigdataSparqlTest.suite());
 
             } catch (Exception ex) {
 

Modified: branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java
===================================================================
--- branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java	2010-08-06 20:24:26 UTC (rev 3430)
+++ branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java	2010-08-06 22:34:57 UTC (rev 3431)
@@ -108,7 +108,12 @@
 
             try {
 
-                tckSuite.addTest(BigdataSparqlTest.suiteLTSWithPipelineJoins());
+                /*
+                 * suite() will call suiteLTSWithPipelineJoins() and then
+                 * filter out the dataset tests, which we don't need right now
+                 */
+//                tckSuite.addTest(BigdataSparqlTest.suiteLTSWithPipelineJoins());
+                tckSuite.addTest(BigdataSparqlTest.suite());
 
             } catch (Exception ex) {
 


Property changes on: branches/bugfix-btm/dsi-utils/src/java
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/src/java:3270-3427
   + /trunk/dsi-utils/src/java:3270-3430


Property changes on: branches/bugfix-btm/dsi-utils/src/test
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/src/test:3270-3427
   + /trunk/dsi-utils/src/test:3270-3430


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