[teiid-commits] teiid SVN: r2362 - in trunk: build/kits/jboss-container/deploy/teiid and 10 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Tue Jul 20 17:37:33 EDT 2010


Author: rareddy
Date: 2010-07-20 17:37:32 -0400 (Tue, 20 Jul 2010)
New Revision: 2362

Removed:
   trunk/api/src/main/java/org/teiid/translator/CacheScope.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/cache/
   trunk/engine/src/test/java/org/teiid/dqp/internal/cache/
Modified:
   trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java
   trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
   trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
   trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ExecutionContextImpl.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
   trunk/engine/src/main/java/org/teiid/dqp/service/BufferService.java
   trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java
   trunk/runtime/pom.xml
   trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
   trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
Log:
TEIID-1140: commons-logging was set to "provided". The jboss-cache need was removed, by removing the DQPContextCache as this feature is no longer internally used.

Deleted: trunk/api/src/main/java/org/teiid/translator/CacheScope.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/CacheScope.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/api/src/main/java/org/teiid/translator/CacheScope.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-package org.teiid.translator;
-
-import java.io.Serializable;
-
-/**
- * Cache Scope
- * 
- * REQUEST - Items placed in this scope are retained until the end of the top level request. The items to be placed
- * does not need to implement {@link Serializable}, however recommended. These items are not replicated across the cluster.
- * SERVICE - Items from this scope are available to the identified connector
- * 
- * All the items placed in the below scopes must be {@link Serializable}, as they are replicated across cluster.
- *  
- * SESSION - Items placed in the scope retained until the particular User's session of top level request is alive. 
- * VDB - Items placed with this scope retained until the life of the VDB; 
- * 
- * GLOBAL - Items placed in this will available to all until the Query Service is recycled. 
- */
-public enum CacheScope {
-	REQUEST, 
-	SERVICE,
-	SESSION, 
-	VDB, 
-	GLOBAL;
-}

Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -132,36 +132,4 @@
      * @return
      */
     boolean isTransactional();
-
-	/**
-	 * Get a item that has been placed previously from cache. If no such object then a null will be returned. 
-	 * The item is placed in {@link CacheScope#REQUEST} scope.
-	 * @param key
-	 * @return
-	 */
-	Object get(Object key);
-	
-	/**
-	 * Place a item in the Cache in {@link CacheScope#REQUEST} scope.
-	 * @param key
-	 * @param value
-	 */
-	void put(Object key, Object value);    
-	
-	/**
-	 * Get a item that has been placed previously from cache. If no such object then a null will be returned. The item looked
-	 * up in the specified scope.
-	 * @param scope
-	 * @param key
-	 * @return
-	 */
-	Object getFromCache(CacheScope scope, Object key);
-
-	/**
-	 * Place a item in the Cache in the given scope.
-	 * @param scope
-	 * @param key
-	 * @param value
-	 */
-	void storeInCache(CacheScope scope, Object key, Object value);
 }

Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml	2010-07-20 21:37:32 UTC (rev 2362)
@@ -16,8 +16,6 @@
     </bean>
     
     <bean name="BufferService" class="org.teiid.services.BufferServiceImpl">
-        <property name="contextCache"><inject bean="ContextCache"/></property>
-        <property name="cacheFactory"><inject bean="TeiidCache"/></property>
         <!-- Use disk for buffer management -->
         <property name="useDisk">true</property>
         <!-- Directory location for the buffer files -->

Modified: trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml
===================================================================
--- trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/build/kits/jboss-container/deployers/teiid.deployer/teiid-deployer-jboss-beans.xml	2010-07-20 21:37:32 UTC (rev 2362)
@@ -45,7 +45,6 @@
             </parameter>
         </uninstall>
         <property name="VDBRepository"><inject bean="VDBRepository"/></property>
-        <property name="contextCache"><inject bean="ContextCache"/></property>
         <property name="objectSerializer"><inject bean="ObjectSerializer"/></property>
         <property name="connectorManagerRepository"><inject bean="ConnectorManagerRepository"/></property>  
         <property name="translatorRepository"><inject bean="translatorRepository"/></property>      
@@ -98,79 +97,4 @@
     <!--  used for the translators -->
    <bean name="TranslatorDeploymentTemplateInfoFactory" class="org.teiid.templates.TranslatorTemplateInfoFactory"/>
            
-   <!--  JBOSS Cache -->
-   <!-- Uncomment for JBoss Cache -->
-   <!-- 
-   <bean name="TeiidJBossCacheConfig" class="org.jboss.cache.config.Configuration">
-      <property name="runtimeConfig">
-         <bean class="org.jboss.cache.config.RuntimeConfig">
-            <property name="transactionManager">
-               <inject bean="TransactionManager" property="transactionManager"/>
-            </property>
-         </bean>
-      </property>
-    
-      <property name="isolationLevel">READ_COMMITTED</property>
-
-      <property name="cacheMode">LOCAL</property>     
-
-      <property name="lockAcquisitionTimeout">15000</property>
-
-      <property name="exposeManagementStatistics">true</property>
-
-      <property name="evictionConfig">
-         <bean class="org.jboss.cache.config.EvictionConfig">
-            <property name="defaultEvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</property>
-            <property name="wakeupIntervalSeconds">15</property>
-            <property name="evictionRegionConfigs">
-               <list>
-                  <bean class="org.jboss.cache.config.EvictionRegionConfig">
-                     <property name="regionName">/_default_</property>
-                     <property name="evictionAlgorithmConfig">
-                        <bean class="org.jboss.cache.eviction.LRUAlgorithmConfig">
-                           <property name="maxAge">-1</property>
-                           <property name="timeToLive">-1</property>
-                           <property name="maxNodes">10000</property>
-                        </bean>
-                     </property>
-                  </bean>
-               </list>
-            </property>
-         </bean>
-      </property>
-   </bean>
-
-   <bean name="TeiidDefaultCacheFactory" class="org.jboss.cache.DefaultCacheFactory">      
-      <constructor factoryClass="org.jboss.cache.DefaultCacheFactory" factoryMethod="getInstance"/>
-   </bean>
-
-   <bean name="TeiidJBossCache" class="org.jboss.cache.Cache">  
-      <constructor factoryMethod="createCache">
-          <factory bean="TeiidDefaultCacheFactory"/>
-          <parameter class="org.jboss.cache.config.Configuration"><inject bean="TeiidJBossCacheConfig"/></parameter>
-          <parameter class="boolean">false</parameter>
-      </constructor>
-   </bean>
-   
-   <bean name="TeiidJBossCacheMBean" class="org.jboss.cache.jmx.CacheJmxWrapper">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=TeiidCache",exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class,registerDirectly=true)</annotation> 
-        <constructor>
-          <parameter class="org.jboss.cache.Cache"><inject bean="TeiidJBossCache"/></parameter>
-      </constructor>
-   </bean>
-   
-    <bean name="TeiidCache" class="com.metamatrix.cache.jboss.JBossCacheFactory">
-        <property name="cacheName">jboss.cache:service=TeiidCache</property>
-        <demand>TransactionManager</demand>
-        <demand>TeiidJBossCacheMBean</demand>
-    </bean>       
-    --> 
-    
-    <bean name="TeiidCache" class="org.teiid.cache.DefaultCacheFactory">
-    </bean> 
-    
-    <bean name="ContextCache" class="org.teiid.dqp.internal.cache.DQPContextCache">
-        <property name="cacheFactory"><inject bean="TeiidCache"/></property>
-        <property name="processName">localhost</property>
-    </bean>    
 </deployment>
\ No newline at end of file

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -37,7 +37,6 @@
 import org.teiid.core.TeiidComponentException;
 import org.teiid.core.util.Assertion;
 import org.teiid.dqp.DQPPlugin;
-import org.teiid.dqp.internal.cache.DQPContextCache;
 import org.teiid.dqp.message.AtomicRequestID;
 import org.teiid.dqp.message.AtomicRequestMessage;
 import org.teiid.dqp.service.BufferService;
@@ -252,14 +251,6 @@
     	return null;
     }
     
-    
-    DQPContextCache getContextCache() {
-     	if (bufferService != null) {
-    		return bufferService.getContextCache();
-    	}
-    	return null;
-    }
-    
     private void checkStatus() throws TeiidComponentException {
     	if (stopped) {
     		throw new TeiidComponentException(DQPPlugin.Util.getString("ConnectorManager.not_in_valid_state", this.translatorName)); //$NON-NLS-1$

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -102,7 +102,6 @@
                 );
         this.securityContext.setUser(requestMsg.getWorkContext().getSubject());
         this.securityContext.setBatchSize(this.requestMsg.getFetchSize());
-        this.securityContext.setContextCache(manager.getContextCache());
         
         this.connector = manager.getExecutionFactory();
     	VDBMetaData vdb = requestMsg.getWorkContext().getVDB();

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ExecutionContextImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ExecutionContextImpl.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/ExecutionContextImpl.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -30,13 +30,8 @@
 
 import javax.security.auth.Subject;
 
-import org.teiid.cache.Cache;
 import org.teiid.common.buffer.BufferManager;
 import org.teiid.core.util.HashCodeUtil;
-import org.teiid.dqp.DQPPlugin;
-import org.teiid.dqp.internal.cache.DQPContextCache;
-import org.teiid.dqp.internal.process.DQPWorkContext;
-import org.teiid.translator.CacheScope;
 import org.teiid.translator.ExecutionContext;
 
 
@@ -66,7 +61,6 @@
     private boolean keepAlive = false;
     
     private boolean isTransactional;
-    private DQPContextCache contextCache;
     
     private int batchSize = BufferManager.DEFAULT_CONNECTOR_BATCH_SIZE;
 	private List<Exception> warnings = new LinkedList<Exception>();
@@ -210,79 +204,4 @@
 		warnings.clear();
 		return result;
 	}
-	
-	public void setContextCache(DQPContextCache cache) {
-		this.contextCache = cache;
-	}
-	
-	@Override
-	public Object get(Object key) {
-		if (this.contextCache != null) {
-			Cache cache = contextCache.getRequestScopedCache(getRequestIdentifier());
-			return cache.get(key);
-		}
-		return null;
-	}
-	
-	@Override
-	public void put(Object key, Object value) {
-		if (this.contextCache != null) {
-			Cache cache = contextCache.getRequestScopedCache(getRequestIdentifier());
-			cache.put(key, value);
-		}
-	}	
-	
-	
-	@Override
-	public Object getFromCache(CacheScope scope, Object key) {
-		DQPWorkContext context = DQPWorkContext.getWorkContext();
-		checkScopeValidity(scope, context);
-
-		Cache cache = getScopedCache(scope, context);
-		if (cache != null) {
-			return cache.get(key);
-		}
-		return null;
-	}
-	
-	@Override
-	public void storeInCache(CacheScope scope, Object key, Object value) {
-		DQPWorkContext context = DQPWorkContext.getWorkContext();
-		checkScopeValidity(scope, context);
-		Cache cache = getScopedCache(scope, context);
-		if (cache != null) {
-			cache.put(key, value);
-		}
-	}
-	
-	private Cache getScopedCache(CacheScope scope, DQPWorkContext context) {
-		switch (scope) {
-			case SERVICE:
-				return contextCache.getServiceScopedCache(getConnectorIdentifier());
-			case SESSION:
-				return contextCache.getSessionScopedCache(String.valueOf(context.getSessionToken().getSessionID()));
-			case VDB:
-				return contextCache.getVDBScopedCache(context.getVdbName(), context.getVdbVersion());
-			case GLOBAL:
-				return contextCache.getGlobalScopedCache();
-		}
-		return null;
-	}
-	
-	private void checkScopeValidity(CacheScope scope, DQPWorkContext context) {
-		if (scope == CacheScope.REQUEST) {
-			throw new IllegalStateException(DQPPlugin.Util.getString("ConnectorEnvironmentImpl.request_scope_error")); //$NON-NLS-1$
-		}
-		
-		if (scope == CacheScope.SESSION) {
-			if (context == null || context.getSessionToken() == null) {
-				throw new IllegalStateException(DQPPlugin.Util.getString("ConnectorEnvironmentImpl.session_scope_error")); //$NON-NLS-1$
-			}
-		}
-		else if (scope == CacheScope.VDB) {
-			if (context == null || context.getVdbName() == null || context.getVdbVersion() == 0) {
-				throw new IllegalStateException(DQPPlugin.Util.getString("ConnectorEnvironmentImpl.vdb_scope_error")); //$NON-NLS-1$
-			}
-		}
-	}	
 }

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	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -58,7 +58,6 @@
 import org.teiid.core.TeiidProcessingException;
 import org.teiid.core.types.Streamable;
 import org.teiid.dqp.DQPPlugin;
-import org.teiid.dqp.internal.cache.DQPContextCache;
 import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
 import org.teiid.dqp.internal.process.ThreadReuseExecutor.PrioritizedRunnable;
 import org.teiid.dqp.message.AtomicRequestMessage;
@@ -203,7 +202,6 @@
     
 	private Map<RequestID, RequestWorkItem> requests = new ConcurrentHashMap<RequestID, RequestWorkItem>();			
 	private Map<String, ClientState> clientState = Collections.synchronizedMap(new HashMap<String, ClientState>());
-	private DQPContextCache contextCache;
     private boolean useEntitlements = false;
     
     private int maxActivePlans = DQPConfiguration.DEFAULT_MAX_ACTIVE_PLANS;
@@ -396,7 +394,6 @@
     	if (state != null) {
     		state.removeRequest(workItem.requestID);
     	}
-    	contextCache.removeRequestScopedCache(workItem.requestID.toString());
     }
     
     void addWork(Runnable work) {
@@ -489,7 +486,6 @@
         } catch (XATransactionException err) {
             LogManager.logWarning(LogConstants.CTX_DQP, "rollback failed for requestID=" + sessionId); //$NON-NLS-1$
         } 
-        contextCache.removeSessionScopedCache(sessionId);
     }
 
     public boolean cancelRequest(String sessionId, long requestId) throws TeiidComponentException {
@@ -668,7 +664,6 @@
                         
         //get buffer manager
         this.bufferManager = bufferService.getBufferManager();
-        this.contextCache = bufferService.getContextCache();
 
         this.processWorkerPool = new ThreadReuseExecutor(DQPConfiguration.PROCESS_PLAN_QUEUE_NAME, config.getMaxThreads());
         
@@ -683,13 +678,8 @@
 	
 	public void setBufferService(BufferService service) {
 		this.bufferService = service;
-		setContextCache(service.getContextCache());
 	}
 	
-	public void setContextCache(DQPContextCache cache) {
-		this.contextCache = cache;
-	}
-
 	public void setTransactionService(TransactionService service) {
 		this.transactionService = service;
 	}

Modified: trunk/engine/src/main/java/org/teiid/dqp/service/BufferService.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/service/BufferService.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/main/java/org/teiid/dqp/service/BufferService.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -22,19 +22,10 @@
 
 package org.teiid.dqp.service;
 
-import org.teiid.cache.CacheFactory;
 import org.teiid.common.buffer.BufferManager;
-import org.teiid.dqp.internal.cache.DQPContextCache;
 
 
-/**
- */
 public interface BufferService {
-
     BufferManager getBufferManager();
+}
 
-    DQPContextCache getContextCache();
-    
-    CacheFactory getCacheFactory();
- }
-

Modified: trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/engine/src/test/java/org/teiid/dqp/service/FakeBufferService.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -22,12 +22,8 @@
 
 package org.teiid.dqp.service;
 
-import org.teiid.cache.CacheFactory;
-import org.teiid.cache.FakeCache.FakeCacheFactory;
 import org.teiid.common.buffer.BufferManager;
 import org.teiid.common.buffer.BufferManagerFactory;
-import org.teiid.dqp.internal.cache.DQPContextCache;
-import org.teiid.dqp.service.BufferService;
 
 public class FakeBufferService implements BufferService {
 
@@ -43,16 +39,4 @@
         return bufferMgr;
     }
 
-	@Override
-	public DQPContextCache getContextCache() {
-		DQPContextCache cache =  new DQPContextCache();
-		cache.setCacheFactory(new FakeCacheFactory());
-		cache.setProcessName("test");
-		return cache;
-	}
-
-	@Override
-	public CacheFactory getCacheFactory() {
-		return null;
-	}
 }

Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/runtime/pom.xml	2010-07-20 21:37:32 UTC (rev 2362)
@@ -45,10 +45,6 @@
       <artifactId>teiid-metadata</artifactId>
     </dependency>
     <dependency>
-    	<groupId>org.jboss.teiid</groupId>
-    	<artifactId>teiid-cache-jbosscache</artifactId>
-    </dependency>
-    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>provided</scope>
@@ -56,6 +52,7 @@
     <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
+        <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>org.jboss.netty</groupId>

Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBDeployer.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -41,7 +41,6 @@
 import org.teiid.adminapi.impl.VDBTranslatorMetaData;
 import org.teiid.core.CoreConstants;
 import org.teiid.core.util.FileUtils;
-import org.teiid.dqp.internal.cache.DQPContextCache;
 import org.teiid.dqp.internal.datamgr.ConnectorManager;
 import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
 import org.teiid.dqp.internal.datamgr.TranslatorRepository;
@@ -60,7 +59,6 @@
 	private VDBRepository vdbRepository;
 	private ConnectorManagerRepository connectorManagerRepository;
 	private TranslatorRepository translatorRepository;
-	private DQPContextCache contextCache;
 	private ObjectSerializer serializer;
 	private ContainerLifeCycleListener shutdownListener;
 	
@@ -245,11 +243,6 @@
 			this.vdbRepository.removeVDB(deployment.getName(), deployment.getVersion());
 		}
 		
-		if (this.contextCache != null) {
-			// remove any vdb specific context cache
-			this.contextCache.removeVDBScopedCache(deployment.getName(), deployment.getVersion());			
-		}
-
 		try {
 			deleteMetadataStore((VFSDeploymentUnit)unit, deployment);
 		} catch (IOException e) {
@@ -259,10 +252,6 @@
 		LogManager.logInfo(LogConstants.CTX_RUNTIME, RuntimePlugin.Util.getString("vdb_undeployed", deployment)); //$NON-NLS-1$
 	}
 
-	public void setContextCache(DQPContextCache cache) {
-		this.contextCache = cache;
-	}
-	
 	public void setObjectSerializer(ObjectSerializer serializer) {
 		this.serializer = serializer;
 	}		

Modified: trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java	2010-07-20 20:42:43 UTC (rev 2361)
+++ trunk/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java	2010-07-20 21:37:32 UTC (rev 2362)
@@ -38,7 +38,6 @@
 import org.teiid.core.TeiidComponentException;
 import org.teiid.core.TeiidRuntimeException;
 import org.teiid.core.util.FileUtils;
-import org.teiid.dqp.internal.cache.DQPContextCache;
 import org.teiid.dqp.service.BufferService;
 import org.teiid.runtime.RuntimePlugin;
 
@@ -58,7 +57,6 @@
     private BufferManagerImpl bufferMgr;
 	private File bufferDir;
 	private boolean useDisk = true;
-	private DQPContextCache contextCache;
 	private int processorBatchSize = BufferManager.DEFAULT_PROCESSOR_BATCH_SIZE;
 	private int connectorBatchSize = BufferManager.DEFAULT_CONNECTOR_BATCH_SIZE;
 	private CacheFactory cacheFactory;
@@ -128,16 +126,7 @@
     public BufferManager getBufferManager() {
         return this.bufferMgr;
     }
-
-	@Override
-	public DQPContextCache getContextCache() {
-		return this.contextCache;
-	}
 	
-	public void setContextCache(DQPContextCache cache) {
-		this.contextCache = cache;
-	}
-	
 	public void setUseDisk(boolean flag) {
 		this.useDisk = flag;
 	}
@@ -174,11 +163,6 @@
 		return this.connectorBatchSize;
 	}
 
-	@Override
-	public CacheFactory getCacheFactory() {
-		return this.cacheFactory;
-	}
-	
 	public void setCacheFactory(CacheFactory cf) {
 		this.cacheFactory = cf;
 	}



More information about the teiid-commits mailing list