Author: kfujino
Date: Wed Jan 31 06:37:53 2018
New Revision: 1822767

URL: http://svn.apache.org/viewvc?rev=1822767&view=rev
Log:
Expose the cache size for each connection via JMX in StatementCache.

Modified:
    
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
    
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCacheMBean.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1822767&r1=1822766&r2=1822767&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Wed Jan 31 06:37:53 2018
@@ -252,6 +252,13 @@ public class StatementCache extends Stat
                 
(ConcurrentHashMap<CacheKey,CachedStatement>)pCon.getAttributes().get(STATEMENT_CACHE_ATTR);
         return cache;
     }
+ 
+    @Override
+    public int getCacheSizePerConnection() {
+        ConcurrentHashMap<CacheKey,CachedStatement> cache = getCache();
+        if (cache == null) return 0;
+        return cache.size();
+    }
 
     protected class CachedStatement extends 
StatementDecoratorInterceptor.StatementProxy<Statement> {
         boolean cached = false;

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCacheMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCacheMBean.java?rev=1822767&r1=1822766&r2=1822767&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCacheMBean.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCacheMBean.java
 Wed Jan 31 06:37:53 2018
@@ -7,4 +7,5 @@ public interface StatementCacheMBean {
     public boolean isCacheCallable();
     public int getMaxCacheSize();
     public AtomicInteger getCacheSize();
+    public int getCacheSizePerConnection();
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822767&r1=1822766&r2=1822767&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 31 06:37:53 2018
@@ -167,6 +167,10 @@
       <add>
         <bug>62011</bug>: Add MBean for <code>StatementCache</code>. (kfujino)
       </add>
+      <add>
+        Expose the cache size for each connection via JMX in
+        <code>StatementCache</code>. (kfujino)
+      </add>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to