[teiid-commits] teiid SVN: r545 - trunk/engine/src/main/java/com/metamatrix/query/processor/relational.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-03-10 11:32:16 -0400 (Tue, 10 Mar 2009)
New Revision: 545

Modified:
   trunk/engine/src/main/java/com/metamatrix/query/processor/relational/JoinNode.java
Log:
TEIID-411 adding join columns to process plan string output.

Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/JoinNode.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/JoinNode.java	2009-03-10 00:48:34 UTC (rev 544)
+++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/JoinNode.java	2009-03-10 15:32:16 UTC (rev 545)
@@ -206,7 +206,13 @@
         }
         props.put(PROP_JOIN_STRATEGY, this.joinStrategy.toString());
         props.put(PROP_JOIN_TYPE, this.joinType.toString());
-        List critList = new ArrayList();
+        List critList = getCriteriaList();
+        props.put(PROP_JOIN_CRITERIA, critList);
+        return props;
+    }
+
+	private List getCriteriaList() {
+		List critList = new ArrayList();
         if (leftExpressions != null) {
             for(int i=0; i < this.leftExpressions.size(); i++) {
                 critList.add(this.leftExpressions.get(i).toString() + "=" + this.rightExpressions.get(i).toString());  //$NON-NLS-1$
@@ -217,9 +223,8 @@
                 critList.add(crit.toString());
             }
         }
-        props.put(PROP_JOIN_CRITERIA, critList);
-        return props;
-    }
+		return critList;
+	}
 
     /** 
      * @see com.metamatrix.query.processor.relational.RelationalNode#getNodeString(java.lang.StringBuffer)
@@ -236,12 +241,12 @@
         str.append(this.joinStrategy.toString());
         str.append("] [");//$NON-NLS-1$
         str.append(this.joinType.toString());
-        str.append("] output="); //$NON-NLS-1$
+        str.append("]"); //$NON-NLS-1$
+        if (getJoinType() != JoinType.JOIN_CROSS) {
+        	str.append(" criteria=").append(getCriteriaList()); //$NON-NLS-1$
+        }
+        str.append(" output="); //$NON-NLS-1$
         str.append(getElements());
-        str.append(" "); //$NON-NLS-1$
-        if (this.joinCriteria != null) {
-            str.append(" criteria=[").append(this.joinCriteria).append("] "); //$NON-NLS-1$ //$NON-NLS-2$
-        }
     }
 
     /**