[teiid-commits] teiid SVN: r4288 - in trunk: engine/src/main/java/org/teiid/cache and 2 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-08-01 16:18:03 -0400 (Wed, 01 Aug 2012)
New Revision: 4288

Modified:
   trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
   trunk/engine/src/main/java/org/teiid/cache/DefaultCache.java
   trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
   trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
Log:
updating the release notes, fixing a log message, and attempting to resolve a test issue

Modified: trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html	2012-08-01 20:03:42 UTC (rev 4287)
+++ trunk/build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html	2012-08-01 20:18:03 UTC (rev 4288)
@@ -31,6 +31,7 @@
   <LI>TEIID-2083 <B>Admin Metadata</B> - you can now retrieve metadata in DDL from the admin api via the getSchema method.
   <LI>TEIID-2105 <B>Improved VDB loading</B> - vdb loading logic was refined to make administration easier.  ExecutionFactory now has is/setSourceRequiredForMetadata() to indicate whether a source connection is needed for the getMetadata call.
   <LI>TEIID-1598 <B>Translator Result Caching</B> - translators can interact with the result set caching facility via a CacheDirective.  See the Developer's Guide for more.
+  <LI>TEIID-2077 <B>Result reuse</B> - the engine will automatically detect if the same source query is used multiple times in a plan and reuse the result rather than issuing another query.
 </UL>
 
 <h2><a name="Compatibility">Compatibility Issues</a></h2>

Modified: trunk/engine/src/main/java/org/teiid/cache/DefaultCache.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/cache/DefaultCache.java	2012-08-01 20:03:42 UTC (rev 4287)
+++ trunk/engine/src/main/java/org/teiid/cache/DefaultCache.java	2012-08-01 20:18:03 UTC (rev 4288)
@@ -74,7 +74,7 @@
 	protected Set<ExpirationEntry<K, V>> expirationQueue;
 	
 	public DefaultCache(String name) {
-		this(name, DEFAULT_MAX_SIZE_TOTAL, DEFAULT_MAX_SIZE_TOTAL);
+		this(name, DEFAULT_MAX_SIZE_TOTAL, -1);
 	}
 	
 	public DefaultCache(String name, int maxEntries, long ttl) {

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	2012-08-01 20:03:42 UTC (rev 4287)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java	2012-08-01 20:18:03 UTC (rev 4288)
@@ -119,8 +119,10 @@
 		rm = new DQPCore();
         rm.setTransactionService(new FakeTransactionService());
         rm.setBufferManager(bs.getBufferManager());
-        rm.setResultsetCache(new SessionAwareCache<CachedResults>(new DefaultCacheFactory(), SessionAwareCache.Type.RESULTSET, new CacheConfiguration()));
-        rm.setPreparedPlanCache(new SessionAwareCache<PreparedPlan>(new DefaultCacheFactory(), SessionAwareCache.Type.PREPAREDPLAN, new CacheConfiguration()));
+        CacheConfiguration config = new CacheConfiguration();
+        config.setMaxAgeInSeconds(-1);
+		rm.setResultsetCache(new SessionAwareCache<CachedResults>(new DefaultCacheFactory(), SessionAwareCache.Type.RESULTSET, config));
+        rm.setPreparedPlanCache(new SessionAwareCache<PreparedPlan>(new DefaultCacheFactory(), SessionAwareCache.Type.PREPAREDPLAN, config));
         rm.start(new DQPConfiguration());
 
         ConnectorManagerRepository repo = Mockito.mock(ConnectorManagerRepository.class);

Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties	2012-08-01 20:03:42 UTC (rev 4287)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties	2012-08-01 20:18:03 UTC (rev 4288)
@@ -60,7 +60,7 @@
 TEIID50043=Invalid metadata file found at {0}; delete this file and restart server.
 TEIID50069=Failed to load module {0}
 TEIID50089=Failed to find any services of type {0} from module {1}
-TEIID50007=Failed to load module {1} for translator {2}
+TEIID50007=Failed to load module {0} for translator {1}
 TEIID50088=Failed to load module {0} for UDF in VDB {1}.{2}:{3}
 TEIID50072=The username "{0}" and/or password and/or payload token could not be authenticated by any membership domain.
 TEIID50074=VDB has validity errors; failed to deploy - {0}