[teiid-commits] teiid SVN: r2997 - in branches/7.1.x/engine/src/main: resources/org/teiid/query and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-16 23:43:53 -0400 (Wed, 16 Mar 2011)
New Revision: 2997

Modified:
   branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
   branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
Log:
TEIID-1505 ensuring that maxActivePlans is picked up from the config

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-03-17 03:33:13 UTC (rev 2996)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java	2011-03-17 03:43:53 UTC (rev 2997)
@@ -703,7 +703,13 @@
 		
         
         this.processWorkerPool = new ThreadReuseExecutor(DQPConfiguration.PROCESS_PLAN_QUEUE_NAME, config.getMaxThreads());
+        this.maxActivePlans = config.getMaxActivePlans();
         
+        if (this.maxActivePlans > config.getMaxThreads()) {
+        	LogManager.logWarning(LogConstants.CTX_DQP, QueryPlugin.Util.getString("DQPCore.invalid_max_active_plan", this.maxActivePlans, config.getMaxThreads())); //$NON-NLS-1$
+        	this.maxActivePlans = config.getMaxThreads();
+        }
+        
         if (cacheFactory.isReplicated()) {
         	matTables = new SessionAwareCache<CachedResults>(this.cacheFactory, SessionAwareCache.Type.RESULTSET, new CacheConfiguration(Policy.EXPIRATION, -1, -1, "MaterilizationTables")); //$NON-NLS-1$
         	matTables.setBufferManager(this.bufferManager);

Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties	2011-03-17 03:33:13 UTC (rev 2996)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties	2011-03-17 03:43:53 UTC (rev 2997)
@@ -814,6 +814,7 @@
 DQPCore.The_request_has_been_closed.=The request {0} has been closed.
 DQPCore.The_atomic_request_has_been_cancelled=The atomic request {0} has been canceled.
 DQPCore.failed_to_cancel=Failed to Cancel request, as request already finished processing
+DQPCore.invalid_max_active_plan=The maxActivePlan {0} setting should never be greater than the max processing threads {1}.
 
 ProcessWorker.failed_rollback=Failed to properly rollback autowrap transaction properly
 ProcessWorker.error=Unexpected exception for request {0}