Author: vhalbert(a)redhat.com
Date: 2010-04-28 14:35:59 -0400 (Wed, 28 Apr 2010)
New Revision: 2085
Modified:
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
Log:
TEIID-1076 - Hawkins resolved the issue. The check for the final row of a batch needed
to be using ">=", instead of ">", so that no rows were
considered as the last batch.
TestCase - TestDataTierManager.testNoRowsException was created to validate the problem
and verified the change.
Modified:
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
===================================================================
---
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2010-04-27
22:25:00 UTC (rev 2084)
+++
trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2010-04-28
18:35:59 UTC (rev 2085)
@@ -104,7 +104,7 @@
}
public boolean isDone() {
- return this.arm != null && this.arm.getFinalRow() > 0;
+ return this.arm != null && this.arm.getFinalRow() >= 0;
}
void open() throws MetaMatrixComponentException, MetaMatrixProcessingException {
Modified:
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
===================================================================
---
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java 2010-04-27
22:25:00 UTC (rev 2084)
+++
trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java 2010-04-28
18:35:59 UTC (rev 2085)
@@ -130,6 +130,12 @@
}
}
+ public void testNoRowsException() throws Exception {
+ helpSetup(3);
+ this.connectorManager.setRows(0);
+ assertNull(info.nextTuple());
+ }
+
public void testCodeTableResponseDataNotAvailable() throws Exception {
helpSetup(3);
this.connectorManager.dataNotAvailable = 5;
Show replies by date