Merge branch 'md5-for-querybindhash' of https://github.com/FOCONIS/ebean into FOCONIS-md5-for-querybindhash

ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java

@@ -3,6 +3,8 @@ package io.ebeaninternal.server.expression;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import io.ebeaninternal.api.BindHash;
+import io.ebeaninternal.server.querydefn.HashCodeBindHash;
 
 public class RawExpressionTest extends BaseExpressionTest {
 
@@ -61,11 +63,17 @@ public class RawExpressionTest extends BaseExpressionTest {
   }
 
   public void assert_queryBindHash_isDifferent(RawExpression exp0, RawExpression exp1) {
-    assertThat(exp0.queryBindHash()).isNotEqualTo(exp1.queryBindHash());
+    assertThat(getHash(exp0)).isNotEqualTo(getHash(exp1));
   }
 
   public void assert_queryBindHash_isSame(RawExpression exp0, RawExpression exp1) {
-    assertThat(exp0.queryBindHash()).isEqualTo(exp1.queryBindHash());
+    assertThat(getHash(exp0)).isEqualTo(getHash(exp1));
   }
 
+  private int getHash(RawExpression query) {
+    BindHash hash = new HashCodeBindHash();
+    query.queryBindHash(hash);
+    hash.finish();
+    return hash.hashCode();
+  }
 }

ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java

@@ -4,6 +4,7 @@ package io.ebeaninternal.server.querydefn;
 import io.ebean.BaseTestCase;
 import io.ebean.CacheMode;
 import io.ebean.Ebean;
+import io.ebeaninternal.api.BindHash;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import org.junit.Test;
@@ -62,7 +63,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isNotEqualTo(q2.createQueryPlanKey());
-    assertThat(q1.queryBindHash()).isNotEqualTo(q2.queryBindHash());
+    assertThat(getHash(q1)).isNotEqualTo(getHash(q2));
   }
 
   @Test
@@ -73,7 +74,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey());
-    assertThat(q1.queryBindHash()).isNotEqualTo(q2.queryBindHash());
+    assertThat(getHash(q1)).isNotEqualTo(getHash(q2));
   }
 
   @Test
@@ -84,7 +85,7 @@ public class DefaultOrmQueryTest extends BaseTestCase {
 
     prepare(q1, q2);
     assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey());
-    assertThat(q1.queryBindHash()).isEqualTo(q2.queryBindHash());
+    assertThat(getHash(q1)).isEqualTo(getHash(q2));
   }
 
   @Test
@@ -110,4 +111,11 @@ public class DefaultOrmQueryTest extends BaseTestCase {
     OrmQueryRequest<T> r2 = createQueryRequest(SpiQuery.Type.LIST, q2, null);
     q2.prepare(r2);
   }
+
+  private int getHash(DefaultOrmQuery<Order> query) {
+    BindHash hash = new HashCodeBindHash();
+    query.queryBindHash(hash);
+    hash.finish();
+    return hash.hashCode();
+  }
 }

ebean-core/src/test/java/org/tests/cache/TestQueryCache.java

@@ -3,7 +3,7 @@ package org.tests.cache;
 import io.ebean.BaseTestCase;
 import io.ebean.CacheMode;
 import io.ebean.DB;
-import io.ebean.Ebean;
+import io.ebean.ExpressionList;
 import io.ebean.bean.BeanCollection;
 import io.ebean.cache.ServerCache;
 import org.ebeantest.LoggedSqlCollector;
@@ -14,6 +14,7 @@ import org.tests.model.basic.ResetBasicData;
 import org.tests.model.cache.EColAB;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,8 +27,7 @@ public class TestQueryCache extends BaseTestCase {
     new EColAB("02", "10").save();
 
     List<EColAB> list1 =
-      Ebean.getServer(null)
-        .find(EColAB.class)
+      DB.find(EColAB.class)
         .setUseQueryCache(true)
         .where()
         .eq("columnA", "01")
@@ -35,8 +35,7 @@ public class TestQueryCache extends BaseTestCase {
         .findList();
 
     List<EColAB> list2 =
-      Ebean.getServer(null)
-        .find(EColAB.class)
+      DB.find(EColAB.class)
         .setUseQueryCache(true)
         .where()
         .eq("columnA", "02")
@@ -57,7 +56,7 @@ public class TestQueryCache extends BaseTestCase {
     new EColAB("03", "SingleAttribute").save();
     new EColAB("03", "SingleAttribute").save();
 
-    List<String> colA_first = Ebean.getServer(null)
+    List<String> colA_first = DB
       .find(EColAB.class)
       .setUseQueryCache(true)
       .setDistinct(true)
@@ -66,7 +65,7 @@ public class TestQueryCache extends BaseTestCase {
       .eq("columnB", "SingleAttribute")
       .findSingleAttributeList();
 
-    List<String> colA_Second = Ebean.getServer(null)
+    List<String> colA_Second = DB
       .find(EColAB.class)
       .setUseQueryCache(true)
       .setDistinct(true)
@@ -77,7 +76,7 @@ public class TestQueryCache extends BaseTestCase {
 
     assertThat(colA_Second).isSameAs(colA_first);
 
-    List<String> colA_NotDistinct = Ebean.getServer(null)
+    List<String> colA_NotDistinct = DB
       .find(EColAB.class)
       .setUseQueryCache(true)
       .select("columnA")
@@ -89,7 +88,7 @@ public class TestQueryCache extends BaseTestCase {
 
     // ensure that findCount & findSingleAttribute use different
     // slots in cache. If not a "Cannot cast List to int" should happen.
-    int count = Ebean.getServer(null)
+    int count = DB
         .find(EColAB.class)
         .setUseQueryCache(true)
         .select("columnA")
@@ -107,13 +106,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    int count0 = Ebean.find(EColAB.class)
+    int count0 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "count")
       .findCount();
 
-    int count1 = Ebean.find(EColAB.class)
+    int count1 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "count")
@@ -126,7 +125,7 @@ public class TestQueryCache extends BaseTestCase {
 
     // and now, ensure that we hit the database
     LoggedSqlCollector.start();
-    int count2 = Ebean.find(EColAB.class)
+    int count2 = DB.find(EColAB.class)
         .setUseQueryCache(CacheMode.OFF)
         .where()
         .eq("columnB", "count")
@@ -142,13 +141,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    int count0 = Ebean.find(EColAB.class)
+    int count0 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "abc")
       .findCount();
 
-    int count1 = Ebean.find(EColAB.class)
+    int count1 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "def")
@@ -167,13 +166,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    int count0 = Ebean.find(EColAB.class)
+    int count0 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "uvw")
       .findCount();
 
-    int count1 = Ebean.find(EColAB.class)
+    int count1 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.PUT)
       .where()
       .eq("columnB", "uvw")
@@ -193,13 +192,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    int count0 = Ebean.find(EColAB.class)
+    int count0 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.PUT)
       .where()
       .eq("columnB", "xyz")
       .findCount();
 
-    int count1 = Ebean.find(EColAB.class)
+    int count1 = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "xyz")
@@ -214,26 +213,26 @@ public class TestQueryCache extends BaseTestCase {
 
   @Test
   @SuppressWarnings("unchecked")
-  public void test() {
+  public void testReadOnlyFind() {
 
     ResetBasicData.reset();
 
-    ServerCache customerCache = Ebean.getServerCacheManager().getQueryCache(Customer.class);
+    ServerCache customerCache = DB.getServerCacheManager().getQueryCache(Customer.class);
     customerCache.clear();
 
-    List<Customer> list = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where()
+    List<Customer> list = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where()
       .ilike("name", "Rob").findList();
 
     BeanCollection<Customer> bc = (BeanCollection<Customer>) list;
     Assert.assertTrue(bc.isReadOnly());
     Assert.assertFalse(bc.isEmpty());
     Assert.assertTrue(!list.isEmpty());
-    Assert.assertTrue(Ebean.getBeanState(list.get(0)).isReadOnly());
+    Assert.assertTrue(DB.getBeanState(list.get(0)).isReadOnly());
 
-    List<Customer> list2 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where()
+    List<Customer> list2 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where()
       .ilike("name", "Rob").findList();
 
-    List<Customer> list2B = Ebean.find(Customer.class).setUseQueryCache(true)
+    List<Customer> list2B = DB.find(Customer.class).setUseQueryCache(true)
       // .setReadOnly(true)
       .where().ilike("name", "Rob").findList();
 
@@ -245,7 +244,7 @@ public class TestQueryCache extends BaseTestCase {
 
 
 
-    List<Customer> list3 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(false).where()
+    List<Customer> list3 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(false).where()
         .ilike("name", "Rob").findList();
 
     Assert.assertNotSame(list, list3);
@@ -269,13 +268,13 @@ public class TestQueryCache extends BaseTestCase {
 
     LoggedSqlCollector.start();
 
-    List<Integer> colA_first = Ebean.find(EColAB.class)
+    List<Integer> colA_first = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "someId")
       .findIds();
 
-    List<Integer> colA_second = Ebean.find(EColAB.class)
+    List<Integer> colA_second = DB.find(EColAB.class)
       .setUseQueryCache(CacheMode.ON)
       .where()
       .eq("columnB", "someId")
@@ -289,7 +288,7 @@ public class TestQueryCache extends BaseTestCase {
 
     // and now, ensure that we hit the database
     LoggedSqlCollector.start();
-    colA_second = Ebean.find(EColAB.class)
+    colA_second = DB.find(EColAB.class)
         .setUseQueryCache(CacheMode.PUT)
         .where()
         .eq("columnB", "someId")
@@ -299,4 +298,35 @@ public class TestQueryCache extends BaseTestCase {
     assertThat(sql).hasSize(1);
   }
 
+  @Test
+  public void findCountDifferentQueriesBit() {
+    DB.getDefault().getPluginApi().getServerCacheManager().clearAll();
+    differentFindCount(q->q.bitwiseAny("id",1), q->q.bitwiseAny("id",0));
+    differentFindCount(q->q.bitwiseAll("id",1), q->q.bitwiseAll("id",0));
+    // differentFindCount(q->q.bitwiseNot("id",1), q->q.bitwiseNot("id",0)); NOT 1 == AND 1 = 0
+    differentFindCount(q->q.bitwiseAnd("id",1, 0), q->q.bitwiseAnd("id",1, 1));
+
+    differentFindCount(q->q.bitwiseAnd("id",2, 0), q->q.bitwiseAnd("id",4, 0));
+    differentFindCount(q->q.bitwiseAnd("id",2, 1), q->q.bitwiseAnd("id",4, 1));
+    // Will produce hash collision
+    differentFindCount(q->q.bitwiseAnd("id",10, 0), q->q.bitwiseAnd("id",0, 928210));
+
+  }
+
+  void differentFindCount(Consumer<ExpressionList<EColAB>> q0, Consumer<ExpressionList<EColAB>> q1) {
+    LoggedSqlCollector.start();
+
+    ExpressionList<EColAB> el0 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where();
+    q0.accept(el0);
+    el0.findCount();
+
+    ExpressionList<EColAB> el1 = DB.find(EColAB.class).setUseQueryCache(CacheMode.ON).where();
+    q1.accept(el1);
+    el1.findCount();
+
+    List<String> sql = LoggedSqlCollector.stop();
+
+    assertThat(sql).hasSize(2); // different queries
+  }
+
 }