Refactor of query plan hash - add HashQueryPlan, HashQuery etc

This commit is contained in:
Rob Bygrave committed 2014-01-21 00:48:38 +13:00
1 parent 6bd8c2bd05
commit f287205421
36 files changed
+499 -300

No files matched your search

@@ -3,9 +3,11 @@ package com.avaje.ebeaninternal.server.expression;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -105,29 +107,29 @@ class AllEqualsExpression implements SpiExpression {
* The null check is required due to the "is null" sql being generated.
* </p>
*/
public int queryAutoFetchHash() {
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
int hc = AllEqualsExpression.class.getName().hashCode();
Set<Entry<String, Object>> entries = propMap.entrySet();
Iterator<Entry<String, Object>> it = entries.iterator();
builder.add(AllEqualsExpression.class);
while (it.hasNext()) {
Map.Entry<java.lang.String, java.lang.Object> entry = it.next();
for (Entry<String, Object> entry : propMap.entrySet()) {
Object value = entry.getValue();
String propName = entry.getKey();
builder.add(propName).add(value == null ? 0 : 1);
builder.bind(value == null ? 0 : 1);
}
}
hc = hc * 31 + propName.hashCode();
hc = hc * 31 + (value == null ? 0 : 1);
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
int hc = 31;
for (Object value : propMap.values()) {
hc = hc * 31 + Objects.hashCode(value);
}
return hc;
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
}
public int queryBindHash() {
return queryAutoFetchHash();
}
}
@@ -1,6 +1,7 @@
package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -30,14 +31,13 @@ class BetweenExpression extends AbstractExpression {
request.append(getPropertyName()).append(BETWEEN).append(" ? and ? ");
}
public int queryAutoFetchHash() {
int hc = BetweenExpression.class.getName().hashCode();
hc = hc * 31 + propName.hashCode();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(BetweenExpression.class).add(propName);
builder.bind(2);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -1,6 +1,7 @@
package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -65,15 +66,13 @@ class BetweenPropertyExpression implements SpiExpression {
request.append(" ? ").append(BETWEEN).append(name(lowProperty)).append(" and ").append(name(highProperty));
}
public int queryAutoFetchHash() {
int hc = BetweenPropertyExpression.class.getName().hashCode();
hc = hc * 31 + lowProperty.hashCode();
hc = hc * 31 + highProperty.hashCode();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(BetweenPropertyExpression.class).add(lowProperty).add(highProperty);
builder.bind(1);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -1,10 +1,11 @@
package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
class CaseInsensitiveEqualExpression extends AbstractExpression implements LuceneAwareExpression {
class CaseInsensitiveEqualExpression extends AbstractExpression {
private static final long serialVersionUID = -6406036750998971064L;
@@ -40,14 +41,13 @@ class CaseInsensitiveEqualExpression extends AbstractExpression implements Lucen
request.append("lower(").append(pname).append(") =? ");
}
public int queryAutoFetchHash() {
int hc = CaseInsensitiveEqualExpression.class.getName().hashCode();
hc = hc * 31 + propName.hashCode();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(CaseInsensitiveEqualExpression.class).add(propName);
builder.bind(1);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -6,6 +6,7 @@ import java.util.Iterator;
import com.avaje.ebean.ExampleExpression;
import com.avaje.ebean.LikeType;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -163,28 +164,26 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
/**
* Return a hash for autoFetch query identification.
*/
public int queryAutoFetchHash() {
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
// we have not yet built the list of expressions
// so just based on the class name
return DefaultExampleExpression.class.getName().hashCode();
builder.add(DefaultExampleExpression.class);
}
/**
* Return a hash for query plan identification.
*/
public int queryPlanHash(BeanQueryRequest<?> request) {
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
// this is always called once, and always called before
// addSql() and addBindValues() methods
list = buildExpressions(request);
int hc = DefaultExampleExpression.class.getName().hashCode();
builder.add(DefaultExampleExpression.class);
for (int i = 0; i < list.size(); i++) {
hc = hc * 31 + list.get(i).queryPlanHash(request);
list.get(i).queryPlanHash(request, builder);
}
return hc;
}
/**
@@ -1,6 +1,7 @@
package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -49,14 +50,13 @@ class IdExpression implements SpiExpression {
/**
* No properties so this is just a unique static number.
*/
public int queryAutoFetchHash() {
// this number is unique for a given bean type
// which is all that is required
return IdExpression.class.getName().hashCode();
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(IdExpression.class);
builder.bind(1);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -3,6 +3,7 @@ package com.avaje.ebeaninternal.server.expression;
import java.util.List;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -67,16 +68,13 @@ public class IdInExpression implements SpiExpression {
/**
* Incorporates the number of Id values to bind.
*/
public int queryAutoFetchHash() {
// this number is unique for a given bean type
// which is all that is required
int hc = IdInExpression.class.getName().hashCode();
hc = hc * 31 + idList.size();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(IdInExpression.class).add(idList.size());
builder.bind(idList.size());
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -3,6 +3,7 @@ package com.avaje.ebeaninternal.server.expression;
import java.util.Collection;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
@@ -79,19 +80,18 @@ class InExpression extends AbstractExpression {
/**
* Based on the number of values in the in clause.
*/
public int queryAutoFetchHash() {
int hc = InExpression.class.getName().hashCode() + 31 * values.length;
hc = hc * 31 + propName.hashCode();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(InExpression.class).add(propName).add(values.length);
builder.bind(values.length);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
int hc = 0;
for (int i = 1; i < values.length; i++) {
int hc = 31;
for (int i = 0; i < values.length; i++) {
hc = 31 * hc + values[i].hashCode();
}
return hc;
@@ -3,6 +3,7 @@ package com.avaje.ebeaninternal.server.expression;
import java.util.List;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.api.SpiQuery;
@@ -26,23 +27,19 @@ class InQueryExpression extends AbstractExpression {
this.subQuery = subQuery;
}
public int queryAutoFetchHash() {
int hc = InQueryExpression.class.getName().hashCode();
hc = hc * 31 + propName.hashCode();
hc = hc * 31 + subQuery.queryAutofetchHash();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(InQueryExpression.class).add(propName);
subQuery.queryAutofetchHash(builder);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
// queryPlanHash executes prior to addSql() or addBindValues()
// ... so compiledQuery will exist
compiledSubQuery = compileSubQuery(request);
int hc = InQueryExpression.class.getName().hashCode();
hc = hc * 31 + propName.hashCode();
hc = hc * 31 + subQuery.queryPlanHash(request);
return hc;
queryAutoFetchHash(builder);
}
/**
@@ -17,6 +17,7 @@ import com.avaje.ebean.QueryIterator;
import com.avaje.ebean.QueryListener;
import com.avaje.ebean.QueryResultVisitor;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -115,28 +116,20 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
/**
* Based on Junction type and all the expression contained.
*/
public int queryAutoFetchHash() {
int hc = JunctionExpression.class.getName().hashCode();
hc = hc * 31 + joinType.hashCode();
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(JunctionExpression.class).add(joinType);
List<SpiExpression> list = exprList.internalList();
for (int i = 0; i < list.size(); i++) {
hc = hc * 31 + list.get(i).queryAutoFetchHash();
list.get(i).queryAutoFetchHash(builder);
}
return hc;
}
public int queryPlanHash(BeanQueryRequest<?> request) {
int hc = JunctionExpression.class.getName().hashCode();
hc = hc * 31 + joinType.hashCode();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
builder.add(JunctionExpression.class).add(joinType);
List<SpiExpression> list = exprList.internalList();
for (int i = 0; i < list.size(); i++) {
hc = hc * 31 + list.get(i).queryPlanHash(request);
list.get(i).queryPlanHash(request, builder);
}
return hc;
}
public int queryBindHash() {
@@ -2,10 +2,11 @@ package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.LikeType;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
class LikeExpression extends AbstractExpression implements LuceneAwareExpression {
class LikeExpression extends AbstractExpression {
private static final long serialVersionUID = -5398151809111172380L;
@@ -59,15 +60,13 @@ class LikeExpression extends AbstractExpression implements LuceneAwareExpression
/**
* Based on caseInsensitive and the property name.
*/
public int queryAutoFetchHash() {
int hc = LikeExpression.class.getName().hashCode();
hc = hc * 31 + (caseInsensitive ? 0 : 1);
hc = hc * 31 + propName.hashCode();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(LikeExpression.class).add(caseInsensitive).add(propName);
builder.bind(1);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -2,6 +2,7 @@ package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.Expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -69,18 +70,16 @@ abstract class LogicExpression implements SpiExpression {
/**
* Based on the joinType plus the two expressions.
*/
public int queryAutoFetchHash() {
int hc = LogicExpression.class.getName().hashCode() + joinType.hashCode();
hc = hc * 31 + expOne.queryAutoFetchHash();
hc = hc * 31 + expTwo.queryAutoFetchHash();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(LogicExpression.class).add(joinType);
expOne.queryAutoFetchHash(builder);
expTwo.queryAutoFetchHash(builder);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
int hc = LogicExpression.class.getName().hashCode() + joinType.hashCode();
hc = hc * 31 + expOne.queryPlanHash(request);
hc = hc * 31 + expTwo.queryPlanHash(request);
return hc;
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
builder.add(LogicExpression.class).add(joinType);
expOne.queryPlanHash(request, builder);
expTwo.queryPlanHash(request, builder);
}
public int queryBindHash() {
@@ -1,10 +0,0 @@
package com.avaje.ebeaninternal.server.expression;
/**
* Marker interface for lucene aware expressions.
*
* @author rbygrave
*/
public interface LuceneAwareExpression {
}
@@ -2,12 +2,13 @@ package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.Expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
final class NotExpression implements SpiExpression, LuceneAwareExpression {
final class NotExpression implements SpiExpression {
private static final long serialVersionUID = 5648926732402355781L;
@@ -36,16 +37,13 @@ final class NotExpression implements SpiExpression, LuceneAwareExpression {
/**
* Based on the expression.
*/
public int queryAutoFetchHash() {
int hc = NotExpression.class.getName().hashCode();
hc = hc * 31 + exp.queryAutoFetchHash();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(NotExpression.class);
exp.queryAutoFetchHash(builder);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
int hc = NotExpression.class.getName().hashCode();
hc = hc * 31 + exp.queryPlanHash(request);
return hc;
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -1,6 +1,7 @@
package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
@@ -41,15 +42,12 @@ class NullExpression extends AbstractExpression {
/**
* Based on notNull flag and the propertyName.
*/
public int queryAutoFetchHash() {
int hc = NullExpression.class.getName().hashCode();
hc = hc * 31 + (notNull ? 1 : 0);
hc = hc * 31 + propName.hashCode();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(NullExpression.class).add(notNull).add(propName);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -1,16 +0,0 @@
package com.avaje.ebeaninternal.server.expression;
import javax.persistence.PersistenceException;
/**
* Exception used to wrap Lucene parsing exceptions.
*/
public class PersistenceLuceneParseException extends PersistenceException {
private static final long serialVersionUID = 838790249273928392L;
public PersistenceLuceneParseException(Throwable e){
super(e);
}
}
@@ -1,6 +1,7 @@
package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiExpression;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
@@ -38,14 +39,12 @@ class RawExpression implements SpiExpression {
/**
* Based on the sql.
*/
public int queryAutoFetchHash() {
int hc = RawExpression.class.getName().hashCode();
hc = hc * 31 + sql.hashCode();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(RawExpression.class).add(sql);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {
@@ -1,10 +1,11 @@
package com.avaje.ebeaninternal.server.expression;
import com.avaje.ebean.event.BeanQueryRequest;
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
public class SimpleExpression extends AbstractExpression implements LuceneAwareExpression {
public class SimpleExpression extends AbstractExpression {
private static final long serialVersionUID = -382881395755603790L;
@@ -91,15 +92,13 @@ public class SimpleExpression extends AbstractExpression implements LuceneAwareE
/**
* Based on the type and propertyName.
*/
public int queryAutoFetchHash() {
int hc = SimpleExpression.class.getName().hashCode();
hc = hc * 31 + propName.hashCode();
hc = hc * 31 + type.name().hashCode();
return hc;
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(SimpleExpression.class).add(propName).add(type.name());
builder.bind(1);
}
public int queryPlanHash(BeanQueryRequest<?> request) {
return queryAutoFetchHash();
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
queryAutoFetchHash(builder);
}
public int queryBindHash() {