[teiid-commits] teiid SVN: r2849 - in branches/7.1.x/engine/src: test/java/org/teiid/dqp/internal/process and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-01-18 13:54:42 -0500 (Tue, 18 Jan 2011)
New Revision: 2849

Modified:
   branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java
   branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
   branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java
   branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedPlanCache.java
Log:
TEIID-1441 properly configuring the distributed cache for use with mattables and ensuring that -1 means "unlimited" for the sessionawarecache.

Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java	2011-01-18 18:47:06 UTC (rev 2848)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java	2011-01-18 18:54:42 UTC (rev 2849)
@@ -96,7 +96,7 @@
 		this.lobChunkSizeInKB = lobChunkSizeInKB;
 	}
 
-	@ManagementProperty(description="The maximum number of query plans that are cached. Note: this is a memory based cache. (default 250)")
+	@ManagementProperty(description="The maximum number of query plans that are cached. Note: this is a memory based cache. (default 512)")
 	public int getPreparedPlanCacheMaxCount() {
 		return this.preparedPlanCacheMaxCount;
 	}

Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java	2011-01-18 18:47:06 UTC (rev 2848)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java	2011-01-18 18:54:42 UTC (rev 2849)
@@ -706,7 +706,8 @@
         this.processWorkerPool = new ThreadReuseExecutor(DQPConfiguration.PROCESS_PLAN_QUEUE_NAME, config.getMaxThreads());
         
         if (cacheFactory.isReplicated()) {
-        	matTables = new SessionAwareCache<CachedResults>();
+        	matTables = new SessionAwareCache<CachedResults>(this.cacheFactory, Cache.Type.RESULTSET, new CacheConfiguration(Policy.LRU, -1, -1));
+        	matTables.setBufferManager(this.bufferManager);
         }
         
         dataTierMgr = new TempTableDataManager(new DataTierManagerImpl(this,

Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java	2011-01-18 18:47:06 UTC (rev 2848)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/SessionAwareCache.java	2011-01-18 18:54:42 UTC (rev 2849)
@@ -74,7 +74,7 @@
 	SessionAwareCache (final CacheFactory cacheFactory, final Cache.Type type, final CacheConfiguration config){
 		this.maxSize = config.getMaxEntries();
 		if(this.maxSize < 0){
-			this.maxSize = DEFAULT_MAX_SIZE_TOTAL;
+			this.maxSize = Integer.MAX_VALUE;
 		}		
 		this.localCache = new DefaultCache<CacheID, T>("local", maxSize, config.getMaxAgeInSeconds()*1000); //$NON-NLS-1$
 		

Modified: branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedPlanCache.java
===================================================================
--- branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedPlanCache.java	2011-01-18 18:47:06 UTC (rev 2848)
+++ branches/7.1.x/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedPlanCache.java	2011-01-18 18:54:42 UTC (rev 2849)
@@ -128,13 +128,11 @@
         assertEquals(0, cache.getTotalCacheEntries());        
     }
     
-    // set init size to negative number, which should default to 100 (default)
+    // set init size to negative number, which should default to max
     @Test public void testNegativeSizeCacheUsesDefault() {
-        SessionAwareCache<PreparedPlan> negativeSizedCache = new SessionAwareCache<PreparedPlan>(-1000);
-        SessionAwareCache<PreparedPlan> defaultSizedCache = new SessionAwareCache<PreparedPlan>();
+        SessionAwareCache<PreparedPlan> negativeSizedCache = new SessionAwareCache<PreparedPlan>(-1);
         
-        assertEquals(defaultSizedCache.getSpaceAllowed(), negativeSizedCache.getSpaceAllowed());
-        assertEquals(SessionAwareCache.DEFAULT_MAX_SIZE_TOTAL, negativeSizedCache.getSpaceAllowed());                       
+        assertEquals(Integer.MAX_VALUE, negativeSizedCache.getSpaceAllowed());                       
     }
     
     //====Help methods====//