[teiid-commits] teiid SVN: r3121 - in branches/7.1.x/engine/src: main/java/org/teiid/query/tempdata and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2011-04-26 11:12:52 -0400 (Tue, 26 Apr 2011)
New Revision: 3121

Modified:
   branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java
   branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
   branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestCachedResults.java
Log:
SOA-3037

Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java	2011-04-25 20:29:04 UTC (rev 3120)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java	2011-04-26 15:12:52 UTC (rev 3121)
@@ -140,6 +140,7 @@
 				}
 				this.results = buffer;	
 				bufferManager.addTupleBuffer(this.results);
+				this.results.close();
 			}
 			return true;
 		} catch (TeiidComponentException e) {

Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java	2011-04-25 20:29:04 UTC (rev 3120)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java	2011-04-26 15:12:52 UTC (rev 3121)
@@ -396,10 +396,10 @@
 				key.vdb = new VDBKey(context.getVdbName(), context.getVdbVersion());
 				
 				MatTableEntry entry = this.tables.get(key);
-				if (entry != null && entry.lastUpdate > info.getUpdateTime() 
-						&& info.getState() != MatState.LOADING) {
+				boolean firstload = !info.isValid();
+				if (entry != null && entry.lastUpdate > info.getUpdateTime() && info.getState() != MatState.LOADING) {
 					//remote load
-					info.setState(MatState.NEEDS_LOADING, entry.valid, null);
+					info.setState(MatState.NEEDS_LOADING, firstload?false:entry.valid, null);
 					loadTime = entry.lastUpdate;
 				}
 			}

Modified: branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestCachedResults.java
===================================================================
--- branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestCachedResults.java	2011-04-25 20:29:04 UTC (rev 3120)
+++ branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestCachedResults.java	2011-04-26 15:12:52 UTC (rev 3121)
@@ -23,6 +23,7 @@
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -125,6 +126,7 @@
 		
 		TupleBuffer cachedTb = cachedResults.getResults();
 		
+		assertTrue(cachedTb.isFinal());
 		assertEquals(tb.getRowCount(), cachedTb.getRowCount());
 		assertEquals(tb.getBatchSize(), cachedTb.getBatchSize());