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

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

Revision: 4238
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4238&view=rev
Author:   thompsonbry
Date:     2011-02-24 12:28:34 +0000 (Thu, 24 Feb 2011)

Log Message:
-----------
Improved RTO trace of cutoff joins.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Path.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/TestJoinGraphOnBSBMData.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Path.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Path.java	2011-02-24 09:10:56 UTC (rev 4237)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph/rto/Path.java	2011-02-24 12:28:34 UTC (rev 4238)
@@ -679,8 +679,9 @@
         // Reservations for the bopIds used by the constraints.
         if (c != null) {
             for (IConstraint x : c) {
-                if (log.isDebugEnabled())
-                    log.debug("Attaching constraint: " + x);
+                if (log.isTraceEnabled())
+                    log.trace(Arrays.toString(BOpUtility.getPredIds(path))
+                            + ": constraint: " + x);
                 final Iterator<BOp> itr = BOpUtility
                         .preOrderIteratorWithAnnotations(x);
                 while (itr.hasNext()) {
@@ -774,7 +775,8 @@
                 .getStats().get(joinId);
 
         if (log.isTraceEnabled())
-            log.trace(joinStats.toString());
+            log.trace(Arrays.toString(BOpUtility.getPredIds(path)) + ": "
+                    + joinStats.toString());
 
         // #of solutions in.
         final int inputCount = (int) joinStats.inputSolutions.get();
@@ -869,7 +871,7 @@
 
         if (log.isDebugEnabled())
             log.debug(Arrays.toString(BOpUtility.getPredIds(path))
-                    + " : newSample=" + edgeSample);
+                    + ": newSample=" + edgeSample);
 
         return edgeSample;
 

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/TestJoinGraphOnBSBMData.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/TestJoinGraphOnBSBMData.java	2011-02-24 09:10:56 UTC (rev 4237)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/joinGraph/TestJoinGraphOnBSBMData.java	2011-02-24 12:28:34 UTC (rev 4238)
@@ -440,7 +440,7 @@
          * to use a larger data set if we want to verify the optimizers join
          * path for a query which produces solutions in the data.
          */
-        if (true) {
+        if (false) {
             final IPredicate<?>[] runtimeOrder = doTest(preds, null/* constraints */);
             /*
              * Verify that the runtime optimizer produced the expected join
@@ -456,7 +456,7 @@
         /*
          * Run w/ constraints.
          */
-        if(false){
+        if(true){
 
             final IPredicate<?>[] runtimeOrder = doTest(preds, constraints);
             


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