[teiid-commits] teiid SVN: r2744 - in branches/7.1.x: client/src/main/java/org/teiid/adminapi and 3 other directories.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2010-11-24 13:15:45 -0500 (Wed, 24 Nov 2010)
New Revision: 2744

Modified:
   branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
   branches/7.1.x/client/src/main/java/org/teiid/adminapi/Admin.java
   branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/DQPManagement.java
   branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
   branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
Log:
TEIID-1379: Adding a new "clearCache" admin api call that can be used clear cache specific to a VDB.

Modified: branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java
===================================================================
--- branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java	2010-11-24 18:11:42 UTC (rev 2743)
+++ branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java	2010-11-24 18:15:45 UTC (rev 2744)
@@ -141,6 +141,14 @@
 			@Doc(text = "cache type") String cacheType) throws AdminException {
 		getAdmin().clearCache(cacheType);
 	}
+	
+	@Doc(text = "Clear the given cache for a VDB")
+	public static void clearCache(
+			@Doc(text = "cache type") String cacheType, @Doc(text = "vdb name") String vdbName, 
+			@Doc(text = "vdb version") int vdbVersion			
+			) throws AdminException {
+		getAdmin().clearCache(cacheType, vdbName, vdbVersion);
+	}	
 
 	@Doc(text = "Delete a VDB")
 	public static void deleteVDB(

Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/Admin.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/Admin.java	2010-11-24 18:11:42 UTC (rev 2743)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/Admin.java	2010-11-24 18:15:45 UTC (rev 2744)
@@ -168,6 +168,16 @@
      * @throws AdminException  
      */
     void clearCache(String cacheType) throws AdminException;
+    
+    /**
+     * Clear the cache of the given VDB for provided cache type
+     * @param cacheType Cache Type
+     * No wild cards currently supported, must be explicit
+     * @param vdbName - Name of the VDB
+     * @param vdbVersion - VDB version
+     * @throws AdminException  
+     */
+    void clearCache(String cacheType, String vdbName, int vdbVersion) throws AdminException;    
 
     
     /**

Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/DQPManagement.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/DQPManagement.java	2010-11-24 18:11:42 UTC (rev 2743)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/DQPManagement.java	2010-11-24 18:15:45 UTC (rev 2744)
@@ -35,6 +35,7 @@
     boolean cancelRequest(String sessionId, long requestId) throws AdminException;
     Collection<String> getCacheTypes();
     void clearCache(String cacheType);
+    void clearCache(String cacheType, String vdbName, int version);
     Collection<SessionMetadata> getActiveSessions() throws AdminException;
     int getActiveSessionsCount() throws AdminException;
     Collection<org.teiid.adminapi.Transaction> getTransactions();

Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java
===================================================================
--- branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java	2010-11-24 18:11:42 UTC (rev 2743)
+++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/adminapi/jboss/Admin.java	2010-11-24 18:15:45 UTC (rev 2744)
@@ -329,6 +329,17 @@
 	}
 	
 	@Override
+	public void clearCache(String cacheType, String vdbName, int version) throws AdminException{
+		try {
+			ManagedComponent mc = getView().getComponent(DQPNAME, DQPTYPE);	
+			ManagedUtil.executeOperation(mc, "clearCache", SimpleValueSupport.wrap(cacheType), //$NON-NLS-1$
+					SimpleValueSupport.wrap(vdbName), SimpleValueSupport.wrap(version));
+		} catch (Exception e) {
+			throw new AdminComponentException(e.getMessage(), e);
+		} 		
+	}
+	
+	@Override
 	public Collection<Transaction> getTransactions() throws AdminException {
 		try {
 			Collection<Transaction> txnList = new ArrayList<Transaction>();

Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
===================================================================
--- branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java	2010-11-24 18:11:42 UTC (rev 2743)
+++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java	2010-11-24 18:15:45 UTC (rev 2744)
@@ -426,6 +426,12 @@
 	}
 	
 	@Override
+	@ManagementOperation(description="Clear the caches in the system for a VDB", params={@ManagementParameter(name="cacheType",description="Type of Cache"), @ManagementParameter(name="vdbName",description="VDB Name"), at ManagementParameter(name="version",description="VDB Version")}, impact=Impact.ReadOnly)
+	public void clearCache(String cacheType, String vdbName, int version) {
+		this.dqpCore.clearCache(cacheType, vdbName, version);
+	}	
+	
+	@Override
 	@ManagementOperation(description="Get the cache statistics", impact=Impact.ReadOnly)
 	public CacheStatisticsMetadata getCacheStatistics(String cacheType) {
 		return this.dqpCore.getCacheStatistics(cacheType);