[teiid-commits] teiid SVN: r3432 - in trunk: engine/src/main/java/org/teiid/dqp/internal/process and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-08-29 15:07:09 -0400 (Mon, 29 Aug 2011)
New Revision: 3432

Modified:
   trunk/cache-jbosscache/pom.xml
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
Log:
TEIID-1673 minor cleanups

Modified: trunk/cache-jbosscache/pom.xml
===================================================================
--- trunk/cache-jbosscache/pom.xml	2011-08-29 19:06:14 UTC (rev 3431)
+++ trunk/cache-jbosscache/pom.xml	2011-08-29 19:07:09 UTC (rev 3432)
@@ -33,6 +33,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
+			<scope>provided</scope>
 		</dependency>
         <dependency>
             <groupId>org.jboss.man</groupId>

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java	2011-08-29 19:06:14 UTC (rev 3431)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java	2011-08-29 19:07:09 UTC (rev 3432)
@@ -45,7 +45,6 @@
 import org.teiid.adminapi.impl.WorkerPoolStatisticsMetadata;
 import org.teiid.cache.CacheConfiguration;
 import org.teiid.cache.CacheFactory;
-import org.teiid.cache.CacheConfiguration.Policy;
 import org.teiid.client.DQP;
 import org.teiid.client.RequestMessage;
 import org.teiid.client.ResultsMessage;
@@ -204,8 +203,6 @@
     private LinkedList<RequestWorkItem> waitingPlans = new LinkedList<RequestWorkItem>();
     private CacheFactory cacheFactory;
 
-	private SessionAwareCache<CachedResults> matTables;
-	
 	private AuthorizationValidator authorizationValidator;
     
     /**
@@ -621,9 +618,6 @@
 			clearResultSetCache(vdbName, version);
 			break;
 		}
-		if (this.matTables != null) {
-			this.matTables.clearForVDB(vdbName, version);
-		}
 	}	
     
 	public Collection<org.teiid.adminapi.Transaction> getTransactions() {
@@ -723,11 +717,6 @@
         	this.userRequestSourceConcurrency = Math.min(config.getMaxThreads(), 2*config.getMaxThreads()/this.maxActivePlans);
         }
         
-        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);
-        }
-        
         DataTierManagerImpl processorDataManager = new DataTierManagerImpl(this,this.bufferService, this.config.isDetectingChangeEvents());
         processorDataManager.setEventDistributor(eventDistributor);
         processorDataManager.setMetadataRepository(metadataRepository);