[teiid-commits] teiid SVN: r3116 - in branches/451425/engine/src: main/java/org/teiid/query/tempdata and 1 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Mon Apr 25 12:11:05 EDT 2011
Author: rareddy
Date: 2011-04-25 12:11:04 -0400 (Mon, 25 Apr 2011)
New Revision: 3116
Modified:
branches/451425/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java
branches/451425/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
branches/451425/engine/src/test/java/org/teiid/dqp/internal/process/TestCachedResults.java
Log:
SOA-3037: changes to fix the clustering issue 421425
Modified: branches/451425/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java
===================================================================
--- branches/451425/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java 2011-04-25 15:44:23 UTC (rev 3115)
+++ branches/451425/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java 2011-04-25 16:11:04 UTC (rev 3116)
@@ -140,6 +140,7 @@
}
this.results = buffer;
bufferManager.addTupleBuffer(this.results);
+ this.results.close();
}
return true;
} catch (TeiidComponentException e) {
Modified: branches/451425/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
===================================================================
--- branches/451425/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2011-04-25 15:44:23 UTC (rev 3115)
+++ branches/451425/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2011-04-25 16:11:04 UTC (rev 3116)
@@ -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/451425/engine/src/test/java/org/teiid/dqp/internal/process/TestCachedResults.java
===================================================================
--- branches/451425/engine/src/test/java/org/teiid/dqp/internal/process/TestCachedResults.java 2011-04-25 15:44:23 UTC (rev 3115)
+++ branches/451425/engine/src/test/java/org/teiid/dqp/internal/process/TestCachedResults.java 2011-04-25 16:11:04 UTC (rev 3116)
@@ -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());
More information about the teiid-commits
mailing list