[teiid-commits] teiid SVN: r4558 - in branches/7.7.x: engine/src/main/java/org/teiid/query/processor/relational and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: jolee
Date: 2013-04-05 15:00:46 -0400 (Fri, 05 Apr 2013)
New Revision: 4558

Modified:
   branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
   branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/SourceState.java
   branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
Log:
BZ907640:  + TEIID-2457 and updated teiid-releasenotes.html

Modified: branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html	2013-04-04 18:54:05 UTC (rev 4557)
+++ branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html	2013-04-05 19:00:46 UTC (rev 4558)
@@ -262,6 +262,10 @@
 </li>
 <li>[<a href='https://issues.jboss.org/browse/TEIID-2410'>TEIID-2410</a>] -  issues with output buffer blocking
 </li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2457'>TEIID-2457</a>] -  Assertion error with INTERSECT  
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2460'>TEIID-2460</a>] -  Weird behavior when Max buffer space restriction is hit 
+</li>
 </ul>
 
 <h4>From 7.7.5</h4>

Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/SourceState.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/SourceState.java	2013-04-04 18:54:05 UTC (rev 4557)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/processor/relational/SourceState.java	2013-04-05 19:00:46 UTC (rev 4558)
@@ -305,7 +305,8 @@
     		return;
     	} 
     	TupleBuffer sorted = sortUtility.sort();
-    	if (this.buffer != null) {
+    	//only remove the buffer if this is the first time through
+ 	if (this.buffer != null && this.buffer != sorted) {
     		this.buffer.remove();
     	}
     	this.prefetch = null;

Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java	2013-04-04 18:54:05 UTC (rev 4557)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java	2013-04-05 19:00:46 UTC (rev 4558)
@@ -174,7 +174,7 @@
         
         List leftElements = new ArrayList();
         leftElements.add(es1);
-        leftNode = new FakeRelationalNode(1, leftTuples);
+        leftNode = new BlockingFakeRelationalNode(1, leftTuples);
         leftNode.setElements(leftElements);
         
         List rightElements = new ArrayList();