[teiid-commits] teiid SVN: r4231 - in trunk: test-integration/common/src/test/java/org/teiid/dqp/internal/process and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-07-11 20:48:08 -0400 (Wed, 11 Jul 2012)
New Revision: 4231

Modified:
   trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
   trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestExecutionReuse.java
Log:
TEIID-2097 fixing the QueryProcessor hasFinalBuffer method

Modified: trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java	2012-07-11 17:26:02 UTC (rev 4230)
+++ trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java	2012-07-12 00:48:08 UTC (rev 4231)
@@ -336,7 +336,7 @@
 
 	@Override
 	public boolean hasFinalBuffer() {
-		return this.processPlan.hasFinalBuffer();
+		return !continuous && this.processPlan.hasFinalBuffer();
 	}
 	
 	public BufferManager getBufferManager() {

Modified: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestExecutionReuse.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestExecutionReuse.java	2012-07-11 17:26:02 UTC (rev 4230)
+++ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestExecutionReuse.java	2012-07-12 00:48:08 UTC (rev 4231)
@@ -161,7 +161,7 @@
 		Statement s = c.createStatement();
 		TeiidStatement ts = s.unwrap(TeiidStatement.class);
 		final ResultsFuture<Integer> result = new ResultsFuture<Integer>(); 
-		ts.submitExecute("select part_id from parts", new StatementCallback() {
+		ts.submitExecute("select part_id from parts order by part_id", new StatementCallback() {
 			int rowCount;
 			@Override
 			public void onRow(Statement stmt, ResultSet rs) throws SQLException {