#1211 - ENH: Support L2 cache complex natural keys include findList() queries

This commit is contained in:
Rob Bygrave committed 2017-11-18 22:20:42 +13:00
1 parent c5a11aa5a8
commit d5555ed9a9
44 files changed
+1427 -152

No files matched your search

@@ -9,6 +9,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.el.ElPropertyDeploy;
import io.ebeaninternal.server.el.ElPropertyValue;
import io.ebean.util.SplitName;
import io.ebeaninternal.api.NaturalKeyQueryData;
/**
* Base class for simple expressions.
@@ -21,6 +22,12 @@ public abstract class AbstractExpression implements SpiExpression {
this.propName = propName;
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// by default can't use naturalKey cache
return false;
}
@Override
public void simplify() {
// do nothing
@@ -4,6 +4,7 @@ import io.ebean.ExampleExpression;
import io.ebean.LikeType;
import io.ebean.bean.EntityBean;
import io.ebean.event.BeanQueryRequest;
import io.ebean.util.SplitName;
import io.ebeaninternal.api.ManyWhereJoins;
import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest;
@@ -11,7 +12,7 @@ import io.ebeaninternal.api.SpiExpressionValidation;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
import io.ebean.util.SplitName;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
import java.util.ArrayList;
@@ -87,6 +88,12 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
}
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
@Override
public void simplify() {
// do nothing
@@ -27,6 +27,7 @@ import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.api.SpiExpressionValidation;
import io.ebeaninternal.api.SpiJunction;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
import java.sql.Timestamp;
@@ -123,6 +124,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return new JunctionExpression<>(Junction.Type.FILTER, this);
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
@Override
public void simplify() {
simplifyEntries();
@@ -161,7 +161,7 @@ public class DefaultExpressionRequest implements SpiExpressionRequest {
}
@Override
public void appendInExpression(boolean not, Object[] bindValues) {
public void appendInExpression(boolean not, List<Object> bindValues) {
append(binder.getInExpression(not, bindValues));
}
}
@@ -9,6 +9,7 @@ import io.ebeaninternal.api.SpiExpressionValidation;
import io.ebeaninternal.api.SpiQuery;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.query.CQuery;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
import java.util.List;
@@ -35,6 +36,12 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress
this.subQuery = null;
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
@Override
public void simplify() {
// do nothing
@@ -6,6 +6,7 @@ import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.server.el.ElPropertyValue;
import io.ebeaninternal.server.persist.MultiValueWrapper;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
import java.util.ArrayList;
@@ -20,7 +21,7 @@ class InExpression extends AbstractExpression {
private final Collection<?> sourceValues;
private Object[] bindValues;
private List<Object> bindValues;
private boolean multiValueSupported;
@@ -36,25 +37,31 @@ class InExpression extends AbstractExpression {
this.not = not;
}
private Object[] values() {
private List<Object> values() {
List<Object> vals = new ArrayList<>(sourceValues.size());
for (Object sourceValue : sourceValues) {
NamedParamHelp.valueAdd(vals, sourceValue);
}
return vals.toArray();
return vals;
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache for NOT IN
return !not && data.matchIn(propName, bindValues);
}
@Override
public void prepareExpression(BeanQueryRequest<?> request) {
bindValues = values();
if (bindValues.length > 0) {
multiValueSupported = request.isMultiValueSupported((bindValues[0]).getClass());
if (bindValues.size() > 0) {
multiValueSupported = request.isMultiValueSupported((bindValues.get(0)).getClass());
}
}
@Override
public void writeDocQuery(DocQueryContext context) throws IOException {
context.writeIn(propName, values(), not);
context.writeIn(propName, values().toArray(), not);
}
@Override
@@ -66,10 +73,10 @@ class InExpression extends AbstractExpression {
}
if (prop == null) {
if (bindValues.length > 0) {
if (bindValues.size() > 0) {
// if we have no property, we wrap them in a multi value wrapper.
// later the binder will decide, which bind strategy to use.
request.addBindValue(new MultiValueWrapper(Arrays.asList(bindValues)));
request.addBindValue(new MultiValueWrapper(bindValues));
}
} else {
List<Object> idList = new ArrayList<>();
@@ -89,7 +96,7 @@ class InExpression extends AbstractExpression {
@Override
public void addSql(SpiExpressionRequest request) {
if (bindValues.length == 0) {
if (bindValues.isEmpty()) {
String expr = not ? "1=1" : "1=0";
request.append(expr);
return;
@@ -102,7 +109,7 @@ class InExpression extends AbstractExpression {
if (prop != null) {
request.append(prop.getAssocIdInExpr(propName));
String inClause = prop.getAssocIdInValueExpr(not, bindValues.length);
String inClause = prop.getAssocIdInValueExpr(not, bindValues.size());
request.append(inClause);
} else {
@@ -125,7 +132,7 @@ class InExpression extends AbstractExpression {
builder.append(" ?");
if (!multiValueSupported) {
// query plan specific to the number of parameters in the IN clause
builder.append(bindValues.length);
builder.append(bindValues.size());
}
builder.append("]");
}
@@ -142,11 +149,11 @@ class InExpression extends AbstractExpression {
@Override
public boolean isSameByBind(SpiExpression other) {
InExpression that = (InExpression) other;
if (this.bindValues.length != that.bindValues.length) {
if (this.bindValues.size() != that.bindValues.size()) {
return false;
}
for (int i = 0; i < bindValues.length; i++) {
if (!bindValues[i].equals(that.bindValues[i])) {
for (int i = 0; i < bindValues.size(); i++) {
if (!bindValues.get(i).equals(that.bindValues.get(i))) {
return false;
}
}
@@ -25,6 +25,7 @@ import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.api.SpiExpressionValidation;
import io.ebeaninternal.api.SpiJunction;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
import java.sql.Timestamp;
@@ -58,6 +59,12 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
this.exprList = exprList;
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
/**
* Simplify nested expressions where possible.
* <p>
@@ -8,6 +8,7 @@ import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.api.SpiExpressionValidation;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
@@ -56,6 +57,12 @@ abstract class LogicExpression implements SpiExpression {
this.expTwo = (SpiExpression) expTwo;
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
@Override
public void simplify() {
// do nothing
@@ -6,6 +6,7 @@ import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.api.SpiExpressionValidation;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
@@ -23,6 +24,12 @@ class NestedPathWrapperExpression implements SpiExpression {
this.delegate = delegate;
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
@Override
public void simplify() {
// do nothing
@@ -59,7 +66,7 @@ class NestedPathWrapperExpression implements SpiExpression {
@Override
public void queryPlanHash(StringBuilder builder) {
builder.append("NestedPath[");
if (nestedPath != null){
if (nestedPath != null) {
builder.append("path:").append(nestedPath).append(" ");
}
delegate.queryPlanHash(builder);
@@ -2,12 +2,19 @@ package io.ebeaninternal.server.expression;
import io.ebean.event.BeanQueryRequest;
import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.NaturalKeyQueryData;
/**
* Base abstract expression that does nothing for prepareExpression().
*/
abstract class NonPrepareExpression implements SpiExpression {
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
@Override
public void simplify() {
// do nothing
@@ -6,6 +6,7 @@ import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.api.SpiExpressionValidation;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
@@ -16,6 +17,12 @@ class NoopExpression implements SpiExpression {
protected static final NoopExpression INSTANCE = new NoopExpression();
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
@Override
public void simplify() {
// do nothing
@@ -7,6 +7,7 @@ import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.api.SpiExpressionValidation;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
@@ -21,6 +22,12 @@ final class NotExpression implements SpiExpression {
this.exp = (SpiExpression) exp;
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache
return false;
}
@Override
public void simplify() {
// do nothing
@@ -5,6 +5,7 @@ import io.ebean.plugin.ExpressionPath;
import io.ebeaninternal.api.SpiExpression;
import io.ebeaninternal.api.SpiExpressionRequest;
import io.ebeaninternal.server.el.ElPropertyValue;
import io.ebeaninternal.api.NaturalKeyQueryData;
import java.io.IOException;
import java.util.Arrays;
@@ -26,6 +27,15 @@ public class SimpleExpression extends AbstractValueExpression {
return null;
}
@Override
public boolean naturalKey(NaturalKeyQueryData data) {
// can't use naturalKey cache for NOT IN
if (type != Op.EQ) {
return false;
}
return data.matchEq(propName, bindValue);
}
@Override
public void writeDocQuery(DocQueryContext context) throws IOException {
if (type == Op.BETWEEN) {