#1863 - L2 cache miss on natural key cache when multiple properties that include a ManyToOne

src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java

@@ -2,6 +2,7 @@ package io.ebeaninternal.api;
 
 
 import io.ebean.Pairs;
+import io.ebeaninternal.server.deploy.BeanNaturalKey;
 
 import java.util.HashMap;
 import java.util.List;
@@ -19,7 +20,7 @@ public class NaturalKeyEntry {
   /**
    * Used when query query just has a series of EQ expressions (no IN clause).
    */
-  public NaturalKeyEntry(String[] naturalKey, List<NaturalKeyEq> eqList) {
+  NaturalKeyEntry(BeanNaturalKey naturalKey, List<NaturalKeyEq> eqList) {
     load(eqList);
     this.key = calculateKey(naturalKey);
   }
@@ -27,7 +28,7 @@ public class NaturalKeyEntry {
   /**
    * Create when query uses an IN clause.
    */
-  public NaturalKeyEntry(String[] naturalKey, List<NaturalKeyEq> eqList, String inProperty, Object inValue) {
+  NaturalKeyEntry(BeanNaturalKey naturalKey, List<NaturalKeyEq> eqList, String inProperty, Object inValue) {
     load(eqList);
     if (inProperty != null) {
       map.put(inProperty, inValue);
@@ -39,7 +40,7 @@ public class NaturalKeyEntry {
   /**
    * Create when query uses an IN PAIRS clause.
    */
-  public NaturalKeyEntry(String[] naturalKey, List<NaturalKeyEq> eqList,
+  NaturalKeyEntry(BeanNaturalKey naturalKey, List<NaturalKeyEq> eqList,
                          String inMapProperty0, String inMapProperty1, Pairs.Entry pair) {
     load(eqList);
     map.put(inMapProperty0, pair.getA());
@@ -56,18 +57,8 @@ public class NaturalKeyEntry {
     }
   }
 
-  private Object calculateKey(String[] naturalKey) {
-
-    if (naturalKey.length == 1) {
-      return map.get(naturalKey[0]);
-    }
-
-    StringBuilder sb = new StringBuilder();
-    for (String key : naturalKey) {
-      sb.append(map.get(key)).append(";");
-    }
-
-    return sb.toString();
+  private Object calculateKey(BeanNaturalKey naturalKey) {
+    return naturalKey.calculateKey(map);
   }
 
   /**
@@ -80,7 +71,7 @@ public class NaturalKeyEntry {
   /**
    * Return the inValue (used to remove from IN clause of original query).
    */
-  public Object getInValue() {
+  Object getInValue() {
     return inValue;
   }
 }

src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java

@@ -1,6 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebean.Pairs;
+import io.ebeaninternal.server.deploy.BeanNaturalKey;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -12,7 +13,7 @@ import java.util.Set;
  */
 public class NaturalKeyQueryData<T> {
 
-  private final String[] naturalKey;
+  private final BeanNaturalKey naturalKey;
 
   /**
    * Only one of IN or IN PAIRS is allowed.
@@ -34,18 +35,12 @@ public class NaturalKeyQueryData<T> {
 
   private int hitCount;
 
-  public NaturalKeyQueryData(String[] naturalKey) {
+  public NaturalKeyQueryData(BeanNaturalKey naturalKey) {
     this.naturalKey = naturalKey;
   }
 
   private boolean matchProperty(String propName) {
-
-    for (String key : naturalKey) {
-      if (key.equals(propName)) {
-        return true;
-      }
-    }
-    return false;
+    return naturalKey.matchProperty(propName);
   }
 
   /**
@@ -132,13 +127,8 @@ public class NaturalKeyQueryData<T> {
    * Return true if the properties match the natural key properties.
    */
   private boolean matchProperties() {
-    if (naturalKey.length == 1) {
-      // simple single property case
-      if (inProperty != null) {
-        return inProperty.equals(naturalKey[0]);
-      } else {
-        return eqList.get(0).property.equals(naturalKey[0]);
-      }
+    if (naturalKey.isSingleProperty()) {
+      naturalKey.matchSingleProperty((inProperty != null) ? inProperty : eqList.get(0).property);
     }
 
     // multiple properties case
@@ -157,27 +147,17 @@ public class NaturalKeyQueryData<T> {
         exprProps.add(eq.property);
       }
     }
-    if (exprProps.size() != naturalKey.length) {
-      return false;
-    }
-    for (String key : naturalKey) {
-      if (!exprProps.remove(key)) {
-        return false;
-      }
-    }
-
-    return exprProps.isEmpty();
+    return naturalKey.matchMultiProperties(exprProps);
   }
 
   /**
    * Check that all the natural key properties are defined.
    */
   private boolean expressionCount() {
-
     int defined = (inValues == null) ? 0 : 1;
     defined += (inPairs == null) ? 0 : 2;
     defined += (eqList == null) ? 0 : eqList.size();
-    return defined == naturalKey.length;
+    return defined == naturalKey.length();
   }
 
   /**