Author: bpoussin Date: 2010-12-17 18:51:06 +0100 (Fri, 17 Dec 2010) New Revision: 626 Url: http://nuiton.org/repositories/revision/wikitty/626 Log: - add memory usage in cache log - add small test of cache service Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-12-17 17:18:17 UTC (rev 625) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-12-17 17:51:06 UTC (rev 626) @@ -35,6 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.StringUtil; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.entities.Wikitty; @@ -112,8 +113,12 @@ protected void statAdd(int asked, int missed) { this.asked += asked; this.missed += missed; - if(log.isDebugEnabled()) { - log.debug(String.format("cache stat (missed/asked): %s/%s", missed, asked)); + if(log.isDebugEnabled() || true) { + String total = StringUtil.convertMemory(Runtime.getRuntime().totalMemory()); + String free = StringUtil.convertMemory(Runtime.getRuntime().freeMemory()); + String msg = String.format("cache stat (missed/asked): %s/%s (memory %s/%s [total/free])", + this.missed, this.asked, total, free); + log.debug(msg); } } Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java 2010-12-17 17:51:06 UTC (rev 626) @@ -0,0 +1,75 @@ +package org.nuiton.wikitty.services; + + +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.entities.WikittyUserImpl; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyServiceCachedTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyServiceCachedTest.class); + + protected ApplicationConfig getConfig() { + WikittyConfig result = new WikittyConfig(); + return result; + } + + @Test + public void testCache() throws Exception { + ApplicationConfig config = getConfig(); + WikittyServiceInMemory ws = new WikittyServiceInMemory(config); + WikittyServiceCached cache = new WikittyServiceCached(config, ws); + + WikittyProxy proxy = new WikittyProxy(config, cache); + List<BusinessEntity> toStore = new ArrayList<BusinessEntity>(); + List<String> toRestore = new ArrayList<String>(); + + WikittyUser u1 = new WikittyUserImpl(); + WikittyUser u2 = new WikittyUserImpl(); + WikittyUser u3 = new WikittyUserImpl(); + WikittyUser u4 = new WikittyUserImpl(); + WikittyUser u5 = new WikittyUserImpl(); + + toStore.add(u1); + toStore.add(u2); + toStore.add(u3); + toStore.add(u4); + toStore.add(u5); + + toStore = proxy.store(toStore); + + u1 = proxy.restore(WikittyUser.class, u1.getWikittyId()); + u2 = proxy.restore(WikittyUser.class, u2.getWikittyId()); + u3 = proxy.restore(WikittyUser.class, u3.getWikittyId()); + u4 = proxy.restore(WikittyUser.class, u4.getWikittyId()); + u5 = proxy.restore(WikittyUser.class, u5.getWikittyId()); + u1 = proxy.restore(WikittyUser.class, u1.getWikittyId()); + u2 = proxy.restore(WikittyUser.class, u2.getWikittyId()); + u3 = proxy.restore(WikittyUser.class, u3.getWikittyId()); + + toRestore.add(u1.getWikittyId()); + toRestore.add(u2.getWikittyId()); + toRestore.add(u3.getWikittyId()); + toRestore.add(u4.getWikittyId()); + toRestore.add(u5.getWikittyId()); + + proxy.restore(WikittyUser.class, toRestore); + } +}