From 616ad0afb808f3fc6bc5fa0949fb14e74b90ff59 Mon Sep 17 00:00:00 2001
From: kamhung <22250530@qq.com>
Date: Thu, 19 Nov 2015 17:51:48 +0800
Subject: [PATCH]

---
 .../redkale/test/source/CacheTestBean.java    | 15 +++++++-------
 .../redkale/test/source/TestSourceCache.java  | 20 +++++++++++++++++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/test/com/wentch/redkale/test/source/CacheTestBean.java b/test/com/wentch/redkale/test/source/CacheTestBean.java
index 2795ece58..5ab4d7779 100644
--- a/test/com/wentch/redkale/test/source/CacheTestBean.java
+++ b/test/com/wentch/redkale/test/source/CacheTestBean.java
@@ -16,6 +16,7 @@ import javax.persistence.*;
  * @author zhangjx
  */
 public class CacheTestBean {
+
     @Id
     private long pkgid;
 
@@ -32,15 +33,15 @@ public class CacheTestBean {
         Attribute idattr = Attribute.create(CacheTestBean.class, "pkgid");
         Attribute nameattr = Attribute.create(CacheTestBean.class, "name");
         Attribute priceattr = Attribute.create(CacheTestBean.class, "price");
-        EntityCache<CacheTestBean> cache = new EntityCache(EntityInfo.load(CacheTestBean.class, 0, true, null)); 
+        EntityCache<CacheTestBean> cache = new EntityCache(EntityInfo.load(CacheTestBean.class, 0, true, null));
         cache.fullLoad(list);
 
-        System.out.println(cache.getMapResult("pkgid", Reckon.COUNT, "name", null,null));
-        System.out.println(cache.getMapResult("pkgid", Reckon.DISTINCTCOUNT, "name", null,null));
-        System.out.println(cache.getMapResult("pkgid", Reckon.AVG, "price", null,null));
-        System.out.println(cache.getMapResult("pkgid", Reckon.SUM, "price", null,null));
-        System.out.println(cache.getMapResult("pkgid", Reckon.MAX, "price", null,null));
-        System.out.println(cache.getMapResult("pkgid", Reckon.MIN, "price", null,null));
+        System.out.println(cache.getMapResult("pkgid", Reckon.COUNT, "name", null));
+        System.out.println(cache.getMapResult("pkgid", Reckon.DISTINCTCOUNT, "name", null));
+        System.out.println(cache.getMapResult("pkgid", Reckon.AVG, "price", null));
+        System.out.println(cache.getMapResult("pkgid", Reckon.SUM, "price", null));
+        System.out.println(cache.getMapResult("pkgid", Reckon.MAX, "price", null));
+        System.out.println(cache.getMapResult("pkgid", Reckon.MIN, "price", null));
     }
 
     public CacheTestBean() {
diff --git a/test/com/wentch/redkale/test/source/TestSourceCache.java b/test/com/wentch/redkale/test/source/TestSourceCache.java
index c7e193de8..ac37ce489 100644
--- a/test/com/wentch/redkale/test/source/TestSourceCache.java
+++ b/test/com/wentch/redkale/test/source/TestSourceCache.java
@@ -17,6 +17,20 @@ import javax.persistence.*;
  */
 public class TestSourceCache {
 
+    public static class TestEntityBean implements FilterBean {
+
+        @FilterColumn(express = FilterExpress.GREATERTHAN)
+        public int userid;
+
+        @FilterColumn(express = FilterExpress.LIKE)
+        public String username;
+
+        public TestEntityBean(int userid, String username) {
+            this.userid = userid;
+            this.username = username;
+        }
+    }
+
     public static void main(String[] args) throws Exception {
         final EntityInfo<TestEntity> info = EntityInfo.load(TestEntity.class, 0, false, null);
         TestEntity[] entitys = new TestEntity[10_0000];
@@ -39,7 +53,9 @@ public class TestSourceCache {
         flipper.setSort("userid DESC, createtime DESC");
         final FilterNode node = FilterNode.create("userid", FilterExpress.GREATERTHAN, 1000).and("username", FilterExpress.LIKE, "用户");
         System.out.println("node = " + node);
-        Sheet<TestEntity> sheet = info.getCache().querySheet(true, null, flipper, node, null);
+        Sheet<TestEntity> sheet = info.getCache().querySheet(null, flipper, node);
+        System.out.println(sheet);
+        System.out.println(info.getCache().querySheet(null, flipper, null, new TestEntityBean(1000, "用户")));
         final CountDownLatch cdl = new CountDownLatch(100);
         s = System.currentTimeMillis();
         for (int i = 0; i < 100; i++) {
@@ -47,7 +63,7 @@ public class TestSourceCache {
                 @Override
                 public void run() {
                     for (int k = 0; k < 10; k++) {
-                        info.getCache().querySheet(true, null, flipper, node, null);
+                        info.getCache().querySheet(true, null, flipper, node);
                     }
                     cdl.countDown();
                 }