#652 - ENH: L2 cache - add @CacheQueryTuning annotation

src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java

@@ -0,0 +1,52 @@
+package com.avaje.ebeaninternal.server.cache;
+
+import com.avaje.ebean.cache.ServerCacheOptions;
+import com.avaje.ebean.cache.ServerCacheType;
+import com.avaje.tests.model.basic.Article;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.Product;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class DefaultCacheHolder_getCacheOptions_Test {
+
+  private DefaultCacheHolder cacheHolder;
+
+  public DefaultCacheHolder_getCacheOptions_Test() {
+
+    ServerCacheOptions defaultOptions = new ServerCacheOptions();
+    defaultOptions.setMaxSize(10000);
+    defaultOptions.setMaxSecsToLive(120);
+
+    this.cacheHolder = new DefaultCacheHolder(null, defaultOptions);
+  }
+
+  @Test
+  public void beanOptions_when_set() {
+
+    ServerCacheOptions options = cacheHolder.getCacheOptions(Article.class.getName(), ServerCacheType.BEAN);
+    assertEquals(options.getMaxSecsToLive(), 45);
+  }
+
+  @Test
+  public void beanOptions_when_notSet_expect_default() {
+
+    ServerCacheOptions options = cacheHolder.getCacheOptions(Order.class.getName(), ServerCacheType.BEAN);
+    assertEquals(options.getMaxSecsToLive(), 120);
+  }
+
+  @Test
+  public void queryOptions_when_set() {
+
+    ServerCacheOptions options = cacheHolder.getCacheOptions(Product.class.getName(), ServerCacheType.QUERY);
+    assertEquals(options.getMaxSecsToLive(), 15);
+  }
+
+  @Test
+  public void queryOptions_when_notSet_expect_default() {
+
+    ServerCacheOptions options = cacheHolder.getCacheOptions(Order.class.getName(), ServerCacheType.QUERY);
+    assertEquals(options.getMaxSecsToLive(), 120);
+  }
+}

src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheTest.java

@@ -51,9 +51,38 @@ public class DefaultServerCacheTest {
   }
 
   @Test
-  public void testGetTrimSize() throws Exception {
+  public void trimFreq_halfIdle() throws Exception {
 
-    DefaultServerCache cache = createCache();
-    assertEquals(90, cache.getTrimSize());
+    DefaultServerCache cache = new DefaultServerCache("", null, 10000, 10, 20, 0);
+    assertEquals(cache.trimFrequency, 4);
   }
+
+  @Test
+  public void trimFreq_halfIdle_withRounding() throws Exception {
+
+    DefaultServerCache cache = new DefaultServerCache("", null, 10000, 11, 20, 0);
+    assertEquals(cache.trimFrequency, 4);
+  }
+
+  @Test
+  public void trimFreq_halfTTL() throws Exception {
+
+    DefaultServerCache cache = new DefaultServerCache("", null, 10000, 0, 20, 0);
+    assertEquals(cache.trimFrequency, 9);
+  }
+
+  @Test
+  public void trimFreq_halfTTL_withRounding() throws Exception {
+
+    DefaultServerCache cache = new DefaultServerCache("", null, 10000, 0, 21, 0);
+    assertEquals(cache.trimFrequency, 9);
+  }
+
+  @Test
+  public void trimFreq_explicit() throws Exception {
+
+    DefaultServerCache cache = new DefaultServerCache("", null, 10000, 10, 20, 42);
+    assertEquals(cache.trimFrequency, 42);
+  }
+
 }

src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java

@@ -0,0 +1,59 @@
+package com.avaje.ebeaninternal.server.cache;
+
+import com.avaje.ebean.cache.ServerCacheOptions;
+import com.avaje.ebean.cache.ServerCacheStatistics;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.Random;
+
+
+public class DefaultServerCache_RunEvictionTest {
+
+
+  private DefaultServerCache createCache() {
+
+    ServerCacheOptions cacheOptions = new ServerCacheOptions();
+    cacheOptions.setMaxSize(10000);
+    cacheOptions.setMaxIdleSecs(1);
+    cacheOptions.setMaxSecsToLive(2);
+    cacheOptions.setTrimFrequency(1);
+
+    return new DefaultServerCache("foo", cacheOptions);
+  }
+
+  private final DefaultServerCache cache;
+
+  private final Random random = new Random();
+
+  public DefaultServerCache_RunEvictionTest(){
+    this.cache = createCache();
+  }
+
+  @Ignore
+  @Test
+  public void runEvict() throws InterruptedException {
+
+    for (int i = 0; i < 15; i++) {
+      doStuff();
+      cache.runEviction();
+      ServerCacheStatistics statistics = cache.getStatistics(true);
+      System.out.println(statistics);
+      Thread.sleep(500);
+    }
+  }
+
+  private void doStuff() {
+
+    for (int i = 0; i < 500; i++) {
+      String key = ""+random.nextInt(20000);
+
+      int mode = random.nextInt(10);
+      if (mode < 8) {
+        cache.get(key);
+      } else {
+        cache.put(key, key+"-"+System.currentTimeMillis());
+      }
+    }
+  }
+}

src/test/java/com/avaje/tests/model/basic/Article.java

@@ -1,66 +1,64 @@
 package com.avaje.tests.model.basic;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.avaje.ebean.annotation.CacheStrategy;
+import com.avaje.ebean.annotation.CacheTuning;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
-
-import com.avaje.ebean.annotation.CacheStrategy;
+import java.util.ArrayList;
+import java.util.List;
 
 
 @CacheStrategy
+@CacheTuning(maxSecsToLive = 45)
 @Entity
 public class Article extends BasicDomain {
 
-    private static final long serialVersionUID = 1L;
+  String name;
 
-    String name;
-    
-    String author;
-    
-    @OneToMany(cascade=CascadeType.ALL)
-    List<Section> sections;
+  String author;
 
-    public Article() {
-        
-    }
-    
-    public Article(String name, String author) {
-        this.name = name;
-        this.author = author;
-    }
-    
-    public String getName() {
-        return name;
-    }
+  @OneToMany(cascade = CascadeType.ALL)
+  List<Section> sections;
 
-    public void setName(String name) {
-        this.name = name;
-    }
+  public Article() {
+  }
 
-    public String getAuthor() {
-        return author;
-    }
+  public Article(String name, String author) {
+    this.name = name;
+    this.author = author;
+  }
 
-    public void setAuthor(String author) {
-        this.author = author;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public List<Section> getSections() {
-        return sections;
-    }
+  public void setName(String name) {
+    this.name = name;
+  }
 
-    public void setSections(List<Section> sections) {
-        this.sections = sections;
+  public String getAuthor() {
+    return author;
+  }
+
+  public void setAuthor(String author) {
+    this.author = author;
+  }
+
+  public List<Section> getSections() {
+    return sections;
+  }
+
+  public void setSections(List<Section> sections) {
+    this.sections = sections;
+  }
+
+  public void addSection(Section s) {
+    if (sections == null) {
+      sections = new ArrayList<Section>();
     }
-    
-    public void addSection(Section s){
-        if (sections == null){
-            sections = new ArrayList<Section>();
-        }
-        sections.add(s);
-    }
-    
+    sections.add(s);
+  }
+
 }

src/test/java/com/avaje/tests/model/basic/Product.java

@@ -9,6 +9,7 @@ import javax.persistence.Table;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
 
+import com.avaje.ebean.annotation.CacheQueryTuning;
 import com.avaje.ebean.annotation.CacheStrategy;
 import com.avaje.ebean.annotation.CreatedTimestamp;
 import com.avaje.ebean.annotation.DocStore;
@@ -18,6 +19,7 @@ import com.avaje.ebean.annotation.DocStore;
  */
 @DocStore
 @CacheStrategy
+@CacheQueryTuning(maxSecsToLive = 15)
 @Entity
 @Table(name = "o_product")
 public class Product implements Serializable {