diff --git a/src/main/java/com/avaje/ebean/Filter.java b/src/main/java/com/avaje/ebean/Filter.java index 977b61699..f5055123c 100644 --- a/src/main/java/com/avaje/ebean/Filter.java +++ b/src/main/java/com/avaje/ebean/Filter.java @@ -36,7 +36,7 @@ import java.util.Set; * .sort("avgTimeMicros desc") * .gt("executionCount", 0) * .gt("lastQueryTime", nowMinus24Hrs) - * .eq("autofetchTuned", true) + * .eq("autoTuned", true) * .maxRows(10) * .filter(list); * diff --git a/src/main/java/com/avaje/ebean/Model.java b/src/main/java/com/avaje/ebean/Model.java index 600778c2c..79366e8c6 100644 --- a/src/main/java/com/avaje/ebean/Model.java +++ b/src/main/java/com/avaje/ebean/Model.java @@ -836,10 +836,10 @@ public abstract class Model { } /** - * Create a query with explicit 'Autofetch' use. + * Create a query with explicit 'AutoTune' use. */ - public Query setAutofetch(boolean autofetch) { - return query().setAutofetch(autofetch); + public Query setAutoTune(boolean autoTune) { + return query().setAutoTune(autoTune); } /** diff --git a/src/main/java/com/avaje/ebean/Query.java b/src/main/java/com/avaje/ebean/Query.java index ce8ce3b1c..4fcf88a37 100644 --- a/src/main/java/com/avaje/ebean/Query.java +++ b/src/main/java/com/avaje/ebean/Query.java @@ -67,9 +67,9 @@ import java.util.Set; * ... * } * - *

Autofetch

+ *

AutoTune

*

- * Ebean has built in support for "Autofetch". This is a mechanism where a query + * Ebean has built in support for "AutoTune". This is a mechanism where a query * can be automatically tuned based on profiling information that is collected. *

*

@@ -78,7 +78,7 @@ import java.util.Set; * more. *

*

- * It is expected that Autofetch will be the default approach for many queries + * It is expected that AutoTune will be the default approach for many queries * in a system. It is possibly not as useful where the result of a query is sent * to a remote client or where there is some requirement for "Read Consistency" * guarantees. @@ -338,23 +338,23 @@ public interface Query extends Serializable { ExpressionFactory getExpressionFactory(); /** - * Returns true if this query was tuned by autoFetch. + * Returns true if this query was tuned by autoTune. */ - boolean isAutofetchTuned(); + boolean isAutoTuned(); /** - * Explicitly specify whether to use Autofetch for this query. + * Explicitly specify whether to use AutoTune for this query. *

- * If you do not call this method on a query the "Implicit Autofetch mode" is - * used to determine if Autofetch should be used for a given query. + * If you do not call this method on a query the "Implicit AutoTune mode" is + * used to determine if AutoTune should be used for a given query. *

*

- * Autofetch can add additional fetch paths to the query and specify which + * AutoTune can add additional fetch paths to the query and specify which * properties are included for each path. If you have explicitly defined some - * fetch paths Autofetch will not remove. + * fetch paths AutoTune will not remove them. *

*/ - Query setAutofetch(boolean autofetch); + Query setAutoTune(boolean autoTune); /** * Set the default lazy loading batch size to use. diff --git a/src/main/java/com/avaje/ebean/bean/CallStack.java b/src/main/java/com/avaje/ebean/bean/CallStack.java index f283ea591..229809e97 100644 --- a/src/main/java/com/avaje/ebean/bean/CallStack.java +++ b/src/main/java/com/avaje/ebean/bean/CallStack.java @@ -6,7 +6,7 @@ import java.util.Arrays; /** * Represent the call stack (stack trace elements). *

- * Used with a query to identify a CallStackQuery for AutoFetch automatic query + * Used with a query to identify a CallStackQuery for AutoTune automatic query * tuning. *

*

diff --git a/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java b/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java index 594f38b98..405b36e9f 100644 --- a/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java +++ b/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java @@ -5,10 +5,9 @@ import java.util.LinkedHashSet; import java.util.Set; /** - * Collects profile information for a bean (or reference/proxy bean) at a given - * AutoFetchNode. + * Collects profile information for a bean (or reference/proxy bean) at a given node. *

- * The AutoFetchNode identifies the location of the bean in the object graph. + * The node identifies the location of the bean in the object graph. *

*

* It has to use a weak reference so as to ensure that it does not stop the diff --git a/src/main/java/com/avaje/ebean/bean/NodeUsageListener.java b/src/main/java/com/avaje/ebean/bean/NodeUsageListener.java index dafdf28c1..682a99629 100644 --- a/src/main/java/com/avaje/ebean/bean/NodeUsageListener.java +++ b/src/main/java/com/avaje/ebean/bean/NodeUsageListener.java @@ -9,7 +9,7 @@ public interface NodeUsageListener { * Collect node usage "profiling" information. *

* This is the properties that are used for a given bean in the object graph. - * This information is used by autoFetch to tune queries. + * This information is used by autoTune to tune queries. *

*/ void collectNodeUsage(NodeUsageCollector collector); diff --git a/src/main/java/com/avaje/ebean/bean/ObjectGraphOrigin.java b/src/main/java/com/avaje/ebean/bean/ObjectGraphOrigin.java index 8b62c56ca..1ed7710fb 100644 --- a/src/main/java/com/avaje/ebean/bean/ObjectGraphOrigin.java +++ b/src/main/java/com/avaje/ebean/bean/ObjectGraphOrigin.java @@ -9,7 +9,7 @@ import java.io.Serializable; * The call stack is included so that the query can have different tuned fetches * for each unique call stack. For example, a query to fetch a customer could be * called by three different methods and each can be treated as a separate - * origin point (and autoFetch can tune each one separately). + * origin point (and autoTune can tune each one separately). *

*/ public final class ObjectGraphOrigin implements Serializable { diff --git a/src/main/java/com/avaje/ebean/config/AutoTuneConfig.java b/src/main/java/com/avaje/ebean/config/AutoTuneConfig.java index 6eab25e8c..40e2ee59b 100644 --- a/src/main/java/com/avaje/ebean/config/AutoTuneConfig.java +++ b/src/main/java/com/avaje/ebean/config/AutoTuneConfig.java @@ -79,7 +79,7 @@ public class AutoTuneConfig { } /** - * Set to true if the queries should be tuned by autofetch. + * Set to true if the queries should be tuned by autoTune. */ public void setQueryTuning(boolean queryTuning) { this.queryTuning = queryTuning; @@ -123,7 +123,7 @@ public class AutoTuneConfig { * Set to true if profiling information should be collected. *

* The profiling information is collected and then used to generate the tuned - * queries for autofetch. + * queries for autoTune. *

*/ public void setProfiling(boolean profiling) { diff --git a/src/main/java/com/avaje/ebean/config/AutoTuneMode.java b/src/main/java/com/avaje/ebean/config/AutoTuneMode.java index b255421ff..071b7fe42 100644 --- a/src/main/java/com/avaje/ebean/config/AutoTuneMode.java +++ b/src/main/java/com/avaje/ebean/config/AutoTuneMode.java @@ -3,10 +3,10 @@ package com.avaje.ebean.config; import com.avaje.ebean.Query; /** - * The mode for determining if Autofetch will be used for a given query when - * {@link Query#setAutofetch(boolean)} has not been explicitly set on a query. + * The mode for determining if AutoTune will be used for a given query when + * {@link Query#setAutoTune(boolean)} has not been explicitly set on a query. *

- * The explicit control of {@link Query#setAutofetch(boolean)} will always take + * The explicit control of {@link Query#setAutoTune(boolean)} will always take * precedence. This mode is used when this has not been explicitly set on a * query. *

@@ -14,17 +14,17 @@ import com.avaje.ebean.Query; public enum AutoTuneMode { /** - * Don't implicitly use Autofetch. Must explicitly turn it on. + * Don't implicitly use AutoTune. Must explicitly turn it on. */ DEFAULT_OFF, /** - * Use Autofetch implicitly. Must explicitly turn it off. + * Use AutoTune implicitly. Must explicitly turn it off. */ DEFAULT_ON, /** - * Implicitly use Autofetch if the query has not got either select() or join() + * Implicitly use AutoTune if the query has not got either select() or join() * defined. */ DEFAULT_ONIFEMPTY diff --git a/src/main/java/com/avaje/ebean/config/ServerConfig.java b/src/main/java/com/avaje/ebean/config/ServerConfig.java index 927caa954..eeb0a9afe 100644 --- a/src/main/java/com/avaje/ebean/config/ServerConfig.java +++ b/src/main/java/com/avaje/ebean/config/ServerConfig.java @@ -130,7 +130,7 @@ public class ServerConfig { private CurrentUserProvider currentUserProvider; /** - * Config controlling the autofetch behaviour. + * Config controlling the AutoTune behaviour. */ private AutoTuneConfig autoTuneConfig = new AutoTuneConfig(); diff --git a/src/main/java/com/avaje/ebean/meta/MetaQueryPlanStatistic.java b/src/main/java/com/avaje/ebean/meta/MetaQueryPlanStatistic.java index 777cbec54..371ba6a28 100644 --- a/src/main/java/com/avaje/ebean/meta/MetaQueryPlanStatistic.java +++ b/src/main/java/com/avaje/ebean/meta/MetaQueryPlanStatistic.java @@ -15,9 +15,9 @@ public interface MetaQueryPlanStatistic { Class getBeanType(); /** - * Return true if this query plan was tuned by Autofetch. + * Return true if this query plan was tuned by AutoTune. */ - boolean isAutofetchTuned(); + boolean isAutoTuned(); /** * Return a string representation of the query plan hash. diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadContext.java b/src/main/java/com/avaje/ebeaninternal/api/LoadContext.java index a1b2aa254..3a29927e2 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadContext.java +++ b/src/main/java/com/avaje/ebeaninternal/api/LoadContext.java @@ -33,7 +33,7 @@ public interface LoadContext { void registerSecondaryQueries(SpiQuery query); /** - * Return the node for a given path which is used by autofetch profiling. + * Return the node for a given path which is used by AutoTune profiling. */ ObjectGraphNode getObjectGraphNode(String path); diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java index fc85650f9..a7522f2ce 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java @@ -55,7 +55,7 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL /** * Create an object to represent the current CallStack. *

- * Typically used to identify the origin of queries for Autofetch and object + * Typically used to identify the origin of queries for AutoTune and object * graph costing. *

*/ diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiExpression.java b/src/main/java/com/avaje/ebeaninternal/api/SpiExpression.java index ca64b37b9..152890772 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiExpression.java @@ -19,13 +19,13 @@ public interface SpiExpression extends Expression { void containsMany(BeanDescriptor desc, ManyWhereJoins whereManyJoins); /** - * Calculate a hash value used to identify a query for AutoFetch tuning. + * Calculate a hash value used to identify a query for AutoTune tuning. *

* That is, if the hash changes then the query will be considered different - * from an AutoFetch perspective and get different tuning. + * from an AutoTune perspective and get different tuning. *

*/ - void queryAutoFetchHash(HashQueryPlanBuilder builder); + void queryAutoTuneHash(HashQueryPlanBuilder builder); /** * Calculate a hash value for the expression. diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java b/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java index ea9f0fccb..34d3a9e8c 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java @@ -11,7 +11,7 @@ import com.avaje.ebean.bean.ObjectGraphNode; import com.avaje.ebean.bean.PersistenceContext; import com.avaje.ebean.event.BeanQueryRequest; import com.avaje.ebean.event.readaudit.ReadEvent; -import com.avaje.ebeaninternal.server.autofetch.ProfilingListener; +import com.avaje.ebeaninternal.server.autotune.ProfilingListener; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; import com.avaje.ebeaninternal.server.deploy.TableJoin; @@ -345,10 +345,10 @@ public interface SpiQuery extends Query { boolean isDetailEmpty(); /** - * Return explicit autoFetch setting or null. If null then not explicitly + * Return explicit AutoTune setting or null. If null then not explicitly * set so we use the default behaviour. */ - Boolean isAutofetch(); + Boolean isAutoTune(); /** * Set to true if you want to capture executed secondary queries. @@ -423,14 +423,14 @@ public interface SpiQuery extends Query { /** * Return false when this is a lazy load or refresh query for a bean. *

- * We just take/copy the data from those beans and don't collect autoFetch + * We just take/copy the data from those beans and don't collect AutoTune * usage profiling on those lazy load or refresh beans. *

*/ boolean isUsageProfiling(); /** - * Set to false if this query should not be included in the autoFetch usage + * Set to false if this query should not be included in the AutoTune usage * profiling information. */ void setUsageProfiling(boolean usageProfiling); @@ -441,19 +441,19 @@ public interface SpiQuery extends Query { String getName(); /** - * Calculate a hash used by AutoFetch to identify when a query has changed + * Calculate a hash used by AutoTune to identify when a query has changed * (and hence potentially needs a new tuned query plan to be developed). *

- * Excludes bind values and occurs prior to AutoFetch potentially + * Excludes bind values and occurs prior to AutoTune potentially * tuning/modifying the query. *

*/ - HashQueryPlan queryAutofetchHash(HashQueryPlanBuilder builder); + HashQueryPlan queryAutoTuneHash(HashQueryPlanBuilder builder); /** * Identifies queries that are the same bar the bind variables. *

- * This is used AFTER AutoFetch has potentially tuned the query. This is + * This is used AFTER AutoTune has potentially tuned the query. This is * used to identify and reused query plans (the final SQL string and * associated SqlTree object). *

@@ -558,7 +558,7 @@ public interface SpiQuery extends Query { String getQuery(); /** - * Replace the query detail. This is used by the autoFetch feature to as a + * Replace the query detail. This is used by the AutoTune feature to as a * fast way to set the query properties and joins. *

* Note care must be taken to keep the where, orderBy, firstRows and maxRows @@ -568,15 +568,15 @@ public interface SpiQuery extends Query { void setDetail(OrmQueryDetail detail); /** - * Autofetch tune the detail specifying properties to select on already defined joins + * AutoTune tune the detail specifying properties to select on already defined joins * and adding extra joins where they are missing. */ boolean tuneFetchProperties(OrmQueryDetail detail); /** - * Set to true if this query has been tuned by autoFetch. + * Set to true if this query has been tuned by autoTune. */ - void setAutoFetchTuned(boolean autoFetchTuned); + void setAutoTuned(boolean autoTuned); /** * Return the query detail. diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneCollection.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneCollection.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java index 98285d9d3..0f90d116b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneCollection.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autofetch; +package com.avaje.ebeaninternal.server.autotune; import com.avaje.ebean.bean.ObjectGraphOrigin; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneService.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneService.java similarity index 75% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneService.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneService.java index 2e8258697..19295518b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneService.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneService.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autofetch; +package com.avaje.ebeaninternal.server.autotune; import com.avaje.ebean.AutoTune; import com.avaje.ebeaninternal.api.SpiQuery; @@ -7,7 +7,7 @@ import com.avaje.ebeaninternal.api.SpiQuery; * Collects and manages the the profile information. *

* The profile information is periodically converted into "tuned query details" - - * which is used to automatically tune the queries that use autoFetch. + * which is used to automatically tune the queries that use AutoTune. *

*

* The "tuned query details" effectively are part of the query that has the @@ -23,14 +23,9 @@ public interface AutoTuneService extends AutoTune { void startup(); /** - * Called when a query thinks it should be automatically tuned by autoFetch. + * Called when a query thinks it should be automatically tuned by AutoTune. *

- * This internally checks that autoFetch is enabled, there is a "tuned query - * detail" to tune the query with and that the autoFetchMinThreshold has - * been reached. - *

- *

- * This will also determine if the query should be profiled. + * Returns true if the query was tuned. *

*/ boolean tuneQuery(SpiQuery query); diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneStorage.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneStorage.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneStorage.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneStorage.java index 831cdeee2..07c7872a9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoTuneStorage.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneStorage.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autofetch; +package com.avaje.ebeaninternal.server.autotune; /** * diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/ProfilingListener.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/ProfilingListener.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/ProfilingListener.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/ProfilingListener.java index f24300b91..b01e73148 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/ProfilingListener.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/ProfilingListener.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autofetch; +package com.avaje.ebeaninternal.server.autotune; import com.avaje.ebean.bean.NodeUsageListener; import com.avaje.ebean.bean.ObjectGraphNode; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/Autotune.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/model/Autotune.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java index 4be03eb68..80f648fcd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/Autotune.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java @@ -1,5 +1,5 @@ -package com.avaje.ebeaninternal.server.autofetch.model; +package com.avaje.ebeaninternal.server.autotune.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ObjectFactory.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ObjectFactory.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java index a6fc83ab8..0c72b0a81 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ObjectFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java @@ -1,5 +1,5 @@ -package com.avaje.ebeaninternal.server.autofetch.model; +package com.avaje.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlRegistry; @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the com.avaje.ebeaninternal.server.autofetch.model package. + * generated in the com.avaje.ebeaninternal.server.autotune.model package. *

An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -23,7 +23,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.server.autofetch.model + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.server.autotune.model * */ public ObjectFactory() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/Origin.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/model/Origin.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java index eb2203c92..04c9af034 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/Origin.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java @@ -1,5 +1,5 @@ -package com.avaje.ebeaninternal.server.autofetch.model; +package com.avaje.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ProfileDiff.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ProfileDiff.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java index a1bc1c91b..4bdf73c57 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ProfileDiff.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java @@ -1,5 +1,5 @@ -package com.avaje.ebeaninternal.server.autofetch.model; +package com.avaje.ebeaninternal.server.autotune.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ProfileNew.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ProfileNew.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java index 0a058fb29..80fdf48ae 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/ProfileNew.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java @@ -1,5 +1,5 @@ -package com.avaje.ebeaninternal.server.autofetch.model; +package com.avaje.ebeaninternal.server.autotune.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/package-info.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/package-info.java similarity index 74% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/model/package-info.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/model/package-info.java index 7204153e4..d43f79f2b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/model/package-info.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/package-info.java @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package com.avaje.ebeaninternal.server.autofetch.model; +package com.avaje.ebeaninternal.server.autotune.model; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneServiceFactory.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java similarity index 70% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneServiceFactory.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java index f730a3b31..8da0a6ffb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneServiceFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; import com.avaje.ebean.config.ServerConfig; import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.autofetch.AutoTuneService; +import com.avaje.ebeaninternal.server.autotune.AutoTuneService; public class AutoTuneServiceFactory { diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneXmlReader.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneXmlReader.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java index 8ff62af16..47293b419 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneXmlReader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; -import com.avaje.ebeaninternal.server.autofetch.model.Autotune; +import com.avaje.ebeaninternal.server.autotune.model.Autotune; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneXmlWriter.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneXmlWriter.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java index 7770bafb1..de0b341c6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/AutoTuneXmlWriter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; -import com.avaje.ebeaninternal.server.autofetch.model.Autotune; +import com.avaje.ebeaninternal.server.autotune.model.Autotune; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/BaseQueryTuner.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/BaseQueryTuner.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java index 2e349dc29..340058a92 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/BaseQueryTuner.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; import com.avaje.ebean.bean.CallStack; import com.avaje.ebean.bean.ObjectGraphNode; @@ -6,7 +6,7 @@ import com.avaje.ebean.config.AutoTuneConfig; import com.avaje.ebean.config.AutoTuneMode; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autofetch.ProfilingListener; +import com.avaje.ebeaninternal.server.autotune.ProfilingListener; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; import javax.persistence.PersistenceException; @@ -145,10 +145,10 @@ public class BaseQueryTuner { */ private boolean useTuning(SpiQuery query) { - Boolean autoFetch = query.isAutofetch(); - if (autoFetch != null) { + Boolean autoTune = query.isAutoTune(); + if (autoTune != null) { // explicitly set... - return autoFetch; + return autoTune; } else { // determine using implicit mode... @@ -163,7 +163,7 @@ public class BaseQueryTuner { return query.isDetailEmpty(); default: - throw new PersistenceException("Invalid autoFetchMode " + mode); + throw new PersistenceException("Invalid AutoTuneMode " + mode); } } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/DefaultAutoTuneService.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/DefaultAutoTuneService.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java index 12600ad6d..b93fbe44a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/DefaultAutoTuneService.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java @@ -1,16 +1,16 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; import com.avaje.ebean.bean.ObjectGraphOrigin; import com.avaje.ebean.config.AutoTuneConfig; import com.avaje.ebean.config.ServerConfig; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autofetch.AutoTuneCollection; -import com.avaje.ebeaninternal.server.autofetch.AutoTuneService; -import com.avaje.ebeaninternal.server.autofetch.model.Autotune; -import com.avaje.ebeaninternal.server.autofetch.model.Origin; -import com.avaje.ebeaninternal.server.autofetch.model.ProfileDiff; -import com.avaje.ebeaninternal.server.autofetch.model.ProfileNew; +import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; +import com.avaje.ebeaninternal.server.autotune.AutoTuneService; +import com.avaje.ebeaninternal.server.autotune.model.Autotune; +import com.avaje.ebeaninternal.server.autotune.model.Origin; +import com.avaje.ebeaninternal.server.autotune.model.ProfileDiff; +import com.avaje.ebeaninternal.server.autotune.model.ProfileNew; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetailParser; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileManager.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileManager.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java index b079ed6b8..f5a7d4e38 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; import com.avaje.ebean.bean.NodeUsageCollector; import com.avaje.ebean.bean.ObjectGraphNode; @@ -6,8 +6,8 @@ import com.avaje.ebean.bean.ObjectGraphOrigin; import com.avaje.ebean.config.AutoTuneConfig; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autofetch.AutoTuneCollection; -import com.avaje.ebeaninternal.server.autofetch.ProfilingListener; +import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; +import com.avaje.ebeaninternal.server.autotune.ProfilingListener; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOrigin.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOrigin.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java index d83c163d9..626285149 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOrigin.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; import com.avaje.ebean.bean.NodeUsageCollector; import com.avaje.ebean.bean.ObjectGraphNode; import com.avaje.ebean.bean.ObjectGraphOrigin; import com.avaje.ebean.text.PathProperties; import com.avaje.ebean.text.PathProperties.Props; -import com.avaje.ebeaninternal.server.autofetch.AutoTuneCollection; +import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; @@ -16,8 +16,6 @@ import java.util.concurrent.atomic.AtomicLong; public class ProfileOrigin { - //private static final Logger logger = LoggerFactory.getLogger(ProfileOrigin.class); - private static final long RESET_COUNT = -1000000000L; private final ObjectGraphOrigin origin; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOriginNodeUsage.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOriginNodeUsage.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index 4ce069ae0..2292cc31f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOriginNodeUsage.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; import com.avaje.ebean.bean.NodeUsageCollector; import com.avaje.ebean.text.PathProperties; @@ -70,7 +70,7 @@ public class ProfileOriginNodeUsage { } else { //noinspection StatementWithEmptyBody if (beanProp.isLob() && !beanProp.isFetchEager()) { - // AutoFetch will not include Lob's marked FetchLazy + // AutoTune will not include Lob's marked FetchLazy // (which is the default for Lob's so typical). } else { pathProps.addToPath(path, beanProp.getName()); diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOriginQuery.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOriginQuery.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java index 344d040dc..4c1c2044e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/ProfileOriginQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; -import com.avaje.ebeaninternal.server.autofetch.AutoTuneCollection; +import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; import com.avaje.ebeaninternal.server.util.LongAdder; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/TunedQueryInfo.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/autofetch/service/TunedQueryInfo.java rename to src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java index 7f8a06853..d15563945 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/service/TunedQueryInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autofetch.service; +package com.avaje.ebeaninternal.server.autotune.service; import com.avaje.ebeaninternal.api.SpiQuery; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; @@ -44,7 +44,7 @@ public class TunedQueryInfo implements Serializable { tuned = query.tuneFetchProperties(tunedDetail); } if (tuned) { - query.setAutoFetchTuned(true); + query.setAutoTuned(true); } return tuned; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java index 140800e2c..3482f61ec 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java @@ -421,7 +421,7 @@ public class DefaultBeanLoader { query.select("id," + embeddedBeanPropertyName); } - // don't collect autoFetch usage profiling information + // don't collect AutoTune usage profiling information // as we just copy the data out of these fetched beans // and put the data into the original bean query.setUsageProfiling(false); diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java index ca2fbe9a1..09fdc5be0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -36,7 +36,7 @@ import com.avaje.ebeaninternal.api.SpiQuery.Type; import com.avaje.ebeaninternal.api.SpiSqlQuery; import com.avaje.ebeaninternal.api.SpiTransaction; import com.avaje.ebeaninternal.api.TransactionEventTable; -import com.avaje.ebeaninternal.server.autofetch.AutoTuneService; +import com.avaje.ebeaninternal.server.autotune.AutoTuneService; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; import com.avaje.ebeaninternal.server.deploy.BeanProperty; @@ -222,7 +222,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { this.queryEngine = config.createOrmQueryEngine(); this.relationalQueryEngine = config.createRelationalQueryEngine(); - this.autoTuneService = config.createAutoFetchManager(this); + this.autoTuneService = config.createAutoTuneService(this); this.readAuditPrepare = config.getReadAuditPrepare(); this.readAuditLogger = config.getReadAuditLogger(); @@ -402,7 +402,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } shutdownPlugins(); - // shutdown autofetch profile collection autoTuneService.shutdown(); // shutdown background threads backgroundExecutor.shutdown(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java index a3daf21ca..23e010f8c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java @@ -15,8 +15,8 @@ import com.avaje.ebean.plugin.SpiServerPlugin; import com.avaje.ebean.text.json.JsonContext; import com.avaje.ebeaninternal.api.SpiBackgroundExecutor; import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.autofetch.AutoTuneService; -import com.avaje.ebeaninternal.server.autofetch.service.AutoTuneServiceFactory; +import com.avaje.ebeaninternal.server.autotune.AutoTuneService; +import com.avaje.ebeaninternal.server.autotune.service.AutoTuneServiceFactory; import com.avaje.ebeaninternal.server.changelog.DefaultChangeLogListener; import com.avaje.ebeaninternal.server.changelog.DefaultChangeLogPrepare; import com.avaje.ebeaninternal.server.changelog.DefaultChangeLogRegister; @@ -248,7 +248,7 @@ public class InternalConfiguration { return xmlConfig; } - public AutoTuneService createAutoFetchManager(SpiEbeanServer server) { + public AutoTuneService createAutoTuneService(SpiEbeanServer server) { return AutoTuneServiceFactory.create(server, serverConfig); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java index 37d6baa58..aa946cbbc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java @@ -118,7 +118,7 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe } /** - * Calculate the query plan hash AFTER any potential AutoFetch tuning. + * Calculate the query plan hash AFTER any potential AutoTune tuning. */ public void calculateQueryPlanHash() { this.queryPlanHash = query.queryPlanHash(this); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DbReadContext.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DbReadContext.java index 68f7b8404..f4085c646 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DbReadContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DbReadContext.java @@ -42,10 +42,10 @@ public interface DbReadContext { /** * Return true if we are profiling this query. */ - boolean isAutoFetchProfiling(); + boolean isAutoTuneProfiling(); /** - * Add autoFetch profiling for a loaded entity bean. + * Add AutoTune profiling for a loaded entity bean. */ void profileBean(EntityBeanIntercept ebi, String prefix); diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java index 383526c47..5098f94c9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java @@ -84,7 +84,7 @@ class AllEqualsExpression implements SpiExpression { * The null check is required due to the "is null" sql being generated. *

*/ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(AllEqualsExpression.class); @@ -97,7 +97,7 @@ class AllEqualsExpression implements SpiExpression { } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java index 3f9ce2554..d47c4f594 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java @@ -31,13 +31,13 @@ class BetweenExpression extends AbstractExpression { request.append(getPropertyName()).append(BETWEEN).append(" ? and ? "); } - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(BetweenExpression.class).add(propName); builder.bind(2); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java index b4562bc51..5102cbcc9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java @@ -53,13 +53,13 @@ class BetweenPropertyExpression implements SpiExpression { request.append(" ? ").append(BETWEEN).append(name(lowProperty)).append(" and ").append(name(highProperty)); } - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(BetweenPropertyExpression.class).add(lowProperty).add(highProperty); builder.bind(1); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java index e0d03fbe9..17963793d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java @@ -41,13 +41,13 @@ class CaseInsensitiveEqualExpression extends AbstractExpression { request.append("lower(").append(pname).append(") =? "); } - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(CaseInsensitiveEqualExpression.class).add(propName); builder.bind(1); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java index b6c1c3e77..ee2ffadf7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -153,9 +153,9 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio } /** - * Return a hash for autoFetch query identification. + * Return a hash for AutoTune query identification. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { // we have not yet built the list of expressions // so just based on the class name builder.add(DefaultExampleExpression.class); diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsExpression.java index c942b2e4d..026f78306 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsExpression.java @@ -27,10 +27,10 @@ public class ExistsExpression implements SpiExpression { this.not = not; } - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(ExistsExpression.class).add(not); - subQuery.queryAutofetchHash(builder); + subQuery.queryAutoTuneHash(builder); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { @@ -39,7 +39,7 @@ public class ExistsExpression implements SpiExpression { // ... so compiledQuery will exist compiledSubQuery = compileSubQuery(request); - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/IdExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/IdExpression.java index a30579894..af62ed471 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/IdExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/IdExpression.java @@ -50,13 +50,13 @@ class IdExpression implements SpiExpression { /** * No properties so this is just a unique static number. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(IdExpression.class); builder.bind(1); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/IdInExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/IdInExpression.java index 9d6d327b3..4d965cd7c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/IdInExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/IdInExpression.java @@ -68,13 +68,13 @@ public class IdInExpression implements SpiExpression { /** * Incorporates the number of Id values to bind. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(IdInExpression.class).add(idList.size()); builder.bind(idList.size()); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java index 335e734cd..9dc22158a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java @@ -90,13 +90,13 @@ class InExpression extends AbstractExpression { /** * Based on the number of values in the in clause. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(InExpression.class).add(propName).add(values.length).add(not); builder.bind(values.length); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/InQueryExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/InQueryExpression.java index 07f773746..2781d0897 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/InQueryExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/InQueryExpression.java @@ -28,9 +28,9 @@ class InQueryExpression extends AbstractExpression { this.not = not; } - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(InQueryExpression.class).add(propName).add(not); - subQuery.queryAutofetchHash(builder); + subQuery.queryAutoTuneHash(builder); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { @@ -39,7 +39,7 @@ class InQueryExpression extends AbstractExpression { // ... so compiledQuery will exist compiledSubQuery = compileSubQuery(request); - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java index f9be76092..d4a6ee80b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java @@ -129,11 +129,11 @@ abstract class JunctionExpression implements Junction, SpiExpression, Expr * Based on Junction type and all the expression contained. */ @Override - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(JunctionExpression.class).add(joinType); List list = exprList.internalList(); for (int i = 0; i < list.size(); i++) { - list.get(i).queryAutoFetchHash(builder); + list.get(i).queryAutoTuneHash(builder); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/LikeExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/LikeExpression.java index 658dd29c8..827d90af8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/LikeExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/LikeExpression.java @@ -61,13 +61,13 @@ class LikeExpression extends AbstractExpression { /** * Based on caseInsensitive and the property name. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(LikeExpression.class).add(caseInsensitive).add(propName); builder.bind(1); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/LogicExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/LogicExpression.java index 9c5c7adaa..782af06ba 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/LogicExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/LogicExpression.java @@ -70,10 +70,10 @@ abstract class LogicExpression implements SpiExpression { /** * Based on the joinType plus the two expressions. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(LogicExpression.class).add(joinType); - expOne.queryAutoFetchHash(builder); - expTwo.queryAutoFetchHash(builder); + expOne.queryAutoTuneHash(builder); + expTwo.queryAutoTuneHash(builder); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NoopExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/NoopExpression.java index 64dd12f8d..789f470d1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NoopExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/NoopExpression.java @@ -20,13 +20,13 @@ class NoopExpression implements SpiExpression { } @Override - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(NoopExpression.class); } @Override public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NotExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/NotExpression.java index 6dbaf73f3..122ff6658 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NotExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/NotExpression.java @@ -37,9 +37,9 @@ final class NotExpression implements SpiExpression { /** * Based on the expression. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(NotExpression.class); - exp.queryAutoFetchHash(builder); + exp.queryAutoTuneHash(builder); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NullExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/NullExpression.java index 91b905ffb..bcbab597d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NullExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/NullExpression.java @@ -42,12 +42,12 @@ class NullExpression extends AbstractExpression { /** * Based on notNull flag and the propertyName. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(NullExpression.class).add(notNull).add(propName); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/RawExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/RawExpression.java index 3f76082de..754e07586 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/RawExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/RawExpression.java @@ -39,12 +39,12 @@ class RawExpression implements SpiExpression { /** * Based on the sql. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(RawExpression.class).add(sql); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java index 80a495f1f..daf90920d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java @@ -86,13 +86,13 @@ public class SimpleExpression extends AbstractExpression { /** * Based on the type and propertyName. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(SimpleExpression.class).add(propName).add(type.name()); builder.bind(1); } public void queryPlanHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { - queryAutoFetchHash(builder); + queryAutoTuneHash(builder); } public int queryBindHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java index 1794bac80..3e16cadf2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -62,7 +62,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex queryProps.configureBeanQuery(query); } if (parent.isUseAutoTune()) { - query.setAutofetch(true); + query.setAutoTune(true); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java index 6bd24e234..c6d286e78 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java @@ -74,7 +74,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex } if (parent.isUseAutoTune()) { - query.setAutofetch(true); + query.setAutoTune(true); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java index 79109d42e..24b63b52f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java @@ -491,7 +491,7 @@ public final class DefaultPersister implements Persister { for (int i = 0; i < propImportDelete.length; i++) { sb.append(propImportDelete[i].getName()).append(","); } - q.setAutofetch(false); + q.setAutoTune(false); q.select(sb.toString()); return q; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java index fc6640bf2..0a5735344 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java @@ -65,7 +65,7 @@ public class DeleteUnloadedForeignKeys { // run query in a separate persistence context q.setPersistenceContext(new DefaultPersistenceContext()); q.setPersistenceContextScope(PersistenceContextScope.QUERY); - q.setAutofetch(false); + q.setAutoTune(false); q.select(sb.toString()); q.where().idEq(id); diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java index 1f1f07a7a..3f3231c08 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java @@ -13,7 +13,7 @@ import com.avaje.ebean.event.readaudit.ReadEvent; import com.avaje.ebeaninternal.api.SpiQuery; import com.avaje.ebeaninternal.api.SpiQuery.Mode; import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.autofetch.ProfilingListener; +import com.avaje.ebeaninternal.server.autotune.ProfilingListener; import com.avaje.ebeaninternal.server.core.Message; import com.avaje.ebeaninternal.server.core.OrmQueryRequest; import com.avaje.ebeaninternal.server.core.SpiOrmQueryRequest; @@ -673,7 +673,7 @@ public class CQuery implements DbReadContext, CancelableQuery { * This is true for all queries except lazy load bean queries. *

*/ - public boolean isAutoFetchProfiling() { + public boolean isAutoTuneProfiling() { // need query.isProfiling() because we just take the data // from the lazy loaded or refreshed beans and put it into the already // existing beans which are already collecting usage information diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java index 831d7442b..5a309180b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java @@ -404,7 +404,7 @@ public class CQueryEngine { msg.append("mode[").append(loadMode).append("] "); } msg.append("type[").append(q.getBeanName()).append("] "); - if (query.isAutofetchTuned()) { + if (query.isAutoTuned()) { msg.append("tuned[true] "); } if (originKey != null) { @@ -447,7 +447,7 @@ public class CQueryEngine { msg.append("mode[").append(loadMode).append("] "); } msg.append("type[").append(q.getBeanName()).append("] "); - if (query.isAutofetchTuned()) { + if (query.isAutoTuned()) { msg.append("tuned[true] "); } if (originKey != null) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchIds.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchIds.java index 5c14fbdb6..e359cb3b2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchIds.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchIds.java @@ -250,7 +250,7 @@ public class CQueryFetchIds { return null; } - public boolean isAutoFetchProfiling() { + public boolean isAutoTuneProfiling() { return false; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java index f1e3c8d45..0a54ce7b8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java @@ -43,7 +43,7 @@ public class CQueryPlan { private final SpiEbeanServer server; - private final boolean autofetchTuned; + private final boolean autoTuned; private final HashQueryPlan hash; @@ -80,7 +80,7 @@ public class CQueryPlan { this.beanType = request.getBeanDescriptor().getBeanType(); this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins()); this.hash = request.getQueryPlanHash(); - this.autofetchTuned = request.getQuery().isAutofetchTuned(); + this.autoTuned = request.getQuery().isAutoTuned(); if (sqlRes != null) { this.sql = sqlRes.getSql(); this.rowNumberIncluded = sqlRes.isIncludesRowNumberColumn(); @@ -104,7 +104,7 @@ public class CQueryPlan { this.beanType = request.getBeanDescriptor().getBeanType(); this.stats = new CQueryPlanStats(this, server.isCollectQueryOrigins()); this.hash = buildHash(sql, rawSql, rowNumberIncluded, logWhereSql); - this.autofetchTuned = false; + this.autoTuned = false; this.sql = sql; this.sqlTree = sqlTree; this.rawSql = rawSql; @@ -143,8 +143,8 @@ public class CQueryPlan { } } - public boolean isAutofetchTuned() { - return autofetchTuned; + public boolean isAutoTuned() { + return autoTuned; } public HashQueryPlan getHash() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java index c31769942..31636a05e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java @@ -226,8 +226,8 @@ public final class CQueryPlanStats { } @Override - public boolean isAutofetchTuned() { - return queryPlan.isAutofetchTuned(); + public boolean isAutoTuned() { + return queryPlan.isAutoTuned(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java index b4876cf14..3f68e5f63 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -326,8 +326,8 @@ public class SqlTreeNodeBean implements SqlTreeNode { ebi.setFullyLoadedBean(true); } - if (ctx.isAutoFetchProfiling() && !disableLazyLoad) { - // collect autofetch profiling for this bean... + if (ctx.isAutoTuneProfiling() && !disableLazyLoad) { + // collect autoTune profiling for this bean... ctx.profileBean(ebi, prefix); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 0085f56e0..2170a6def 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -18,7 +18,7 @@ import com.avaje.ebeaninternal.api.ManyWhereJoins; import com.avaje.ebeaninternal.api.SpiExpression; import com.avaje.ebeaninternal.api.SpiExpressionList; import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autofetch.ProfilingListener; +import com.avaje.ebeaninternal.server.autotune.ProfilingListener; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; import com.avaje.ebeaninternal.server.deploy.DRawSqlSelect; @@ -199,7 +199,7 @@ public class DefaultOrmQuery implements SpiQuery { /** * Allow for explicit on off or null for default. */ - private Boolean autoFetch; + private Boolean autoTune; /** * Allow to fetch a record "for update" which should lock it on read @@ -207,9 +207,9 @@ public class DefaultOrmQuery implements SpiQuery { private boolean forUpdate; /** - * Set to true if this query has been tuned by autoFetch. + * Set to true if this query has been tuned by autoTune. */ - private boolean autoFetchTuned; + private boolean autoTuned; private boolean logSecondaryQuery; @@ -228,7 +228,7 @@ public class DefaultOrmQuery implements SpiQuery { private BeanPropertyAssocMany lazyLoadForParentsProperty; /** - * Hash of final query after AutoFetch tuning. + * Hash of final query after AutoTune tuning. */ private HashQueryPlan queryPlanHash; @@ -477,13 +477,6 @@ public class DefaultOrmQuery implements SpiQuery { } public DefaultOrmQuery copy(EbeanServer server) { - // Not including these in the copy: - // contextAdditions - // queryListener - // transactionContext - // autoFetchTuned - // autoFetchQueryPlanHash - // copy.generatedSql DefaultOrmQuery copy = new DefaultOrmQuery(beanType, server, expressionFactory, (String) null); copy.name = name; @@ -524,7 +517,7 @@ public class DefaultOrmQuery implements SpiQuery { } copy.persistenceContextScope = persistenceContextScope; copy.usageProfiling = usageProfiling; - copy.autoFetch = autoFetch; + copy.autoTune = autoTune; copy.parentNode = parentNode; copy.forUpdate = forUpdate; copy.rawSql = rawSql; @@ -602,24 +595,24 @@ public class DefaultOrmQuery implements SpiQuery { return detail.isEmpty(); } - public boolean isAutofetchTuned() { - return autoFetchTuned; + public boolean isAutoTuned() { + return autoTuned; } - public void setAutoFetchTuned(boolean autoFetchTuned) { - this.autoFetchTuned = autoFetchTuned; + public void setAutoTuned(boolean autoTuned) { + this.autoTuned = autoTuned; } - public Boolean isAutofetch() { - return sqlSelect ? Boolean.FALSE : autoFetch; + public Boolean isAutoTune() { + return sqlSelect ? Boolean.FALSE : autoTune; } public boolean isForUpdate() { return forUpdate; } - public DefaultOrmQuery setAutofetch(boolean autoFetch) { - this.autoFetch = autoFetch; + public DefaultOrmQuery setAutoTune(boolean autoTune) { + this.autoTune = autoTune; return this; } @@ -721,7 +714,7 @@ public class DefaultOrmQuery implements SpiQuery { } /** - * Calculate the query hash for either AutoFetch query tuning or Query Plan caching. + * Calculate the query hash for either AutoTune query tuning or Query Plan caching. */ private HashQueryPlan calculateHash(BeanQueryRequest request, HashQueryPlanBuilder builder) { @@ -732,7 +725,7 @@ public class DefaultOrmQuery implements SpiQuery { } builder.add((type == null ? 0 : type.ordinal() + 1)); - builder.add(autoFetchTuned).add(distinct).add(sqlDistinct).add(query); + builder.add(autoTuned).add(distinct).add(sqlDistinct).add(query); builder.add(firstRow).add(maxRows).add(orderBy).add(forUpdate); builder.add(rawWhereClause).add(additionalWhere).add(additionalHaving); builder.add(mapKey); @@ -752,13 +745,13 @@ public class DefaultOrmQuery implements SpiQuery { } if (request == null) { - // for AutoFetch... + // for AutoTune... builder.add(true); if (whereExpressions != null) { - whereExpressions.queryAutoFetchHash(builder); + whereExpressions.queryAutoTuneHash(builder); } if (havingExpressions != null) { - havingExpressions.queryAutoFetchHash(builder); + havingExpressions.queryAutoTuneHash(builder); } } else { @@ -776,10 +769,10 @@ public class DefaultOrmQuery implements SpiQuery { } /** - * Calculate a hash used by AutoFetch to identify when a query has changed (and hence potentially + * Calculate a hash used by AutoTune to identify when a query has changed (and hence potentially * needs a new tuned query plan to be developed). */ - public HashQueryPlan queryAutofetchHash(HashQueryPlanBuilder builder) { + public HashQueryPlan queryAutoTuneHash(HashQueryPlanBuilder builder) { return calculateHash(null, builder); } @@ -790,7 +783,7 @@ public class DefaultOrmQuery implements SpiQuery { * This can used to enable the caching and reuse of a 'query plan'. *

*

- * This is calculated AFTER AutoFetch query tuning has occurred. + * This is calculated AFTER AutoTune query tuning has occurred. *

*/ public HashQueryPlan queryPlanHash(BeanQueryRequest request) { @@ -824,7 +817,7 @@ public class DefaultOrmQuery implements SpiQuery { *

*/ public HashQuery queryHash() { - // calculateQueryPlanHash is called just after potential AutoFetch tuning + // calculateQueryPlanHash is called just after potential AutoTune tuning // so queryPlanHash is calculated well before this method is called int hc = queryBindHash(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java index 0f4ab5f46..e8d0cc46b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -28,7 +28,7 @@ import com.avaje.ebeaninternal.server.query.SplitName; * Holds the select() and join() details of a ORM query. *

*

- * It is worth noting that for autoFetch a "tuned fetch info" builds an instance of OrmQueryDetail. + * It is worth noting that for AutoTune a "tuned fetch info" builds an instance of OrmQueryDetail. * Tuning a query is a matter of replacing an instance of this class with one that has been tuned * with select() and join() set. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java index 9a5026693..186e0ad90 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java @@ -5,7 +5,7 @@ import javax.persistence.PersistenceException; /** * Parses a Object relational query statement into a OrmQueryDetail and OrmQueryAttributes. *

- * The reason they are split into detail and attributes is that the autoFetch feature is used to + * The reason they are split into detail and attributes is that the AutoTune feature is used to * replace the OrmQueryDetail leaving the attributes unchanged. *

*/ diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java index 21f2e566b..21dba9a65 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java @@ -212,7 +212,7 @@ public class OrmQueryProperties implements Serializable { } /** - * Set the properties from a matching autofetch tuned properties. + * Set the properties from a matching AutoTune tuned properties. */ public void setTunedProperties(OrmQueryProperties tunedProperties) { if (tunedProperties.hasProperties()) { @@ -318,7 +318,7 @@ public class OrmQueryProperties implements Serializable { secondaryChildren.add(child); } - public int autofetchPlanHash() { + public int autoTunePlanHash() { int hc = (path != null ? path.hashCode() : 1); if (properties != null) { diff --git a/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java b/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java index 97e39be31..1581948db 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java +++ b/src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java @@ -330,11 +330,11 @@ public class DefaultExpressionList implements SpiExpressionList { * Calculate a hash based on the expressions but excluding the actual bind * values. */ - public void queryAutoFetchHash(HashQueryPlanBuilder builder) { + public void queryAutoTuneHash(HashQueryPlanBuilder builder) { builder.add(DefaultExpressionList.class); for (int i = 0, size = list.size(); i < size; i++) { SpiExpression expression = list.get(i); - expression.queryAutoFetchHash(builder); + expression.queryAutoTuneHash(builder); } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index ede7a01d3..4f666e78e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -22,7 +22,7 @@ public class DefaultOrmQueryTest { .fetch("details.product", "sku, name"); HashQueryPlanBuilder b1 = new HashQueryPlanBuilder(); - query1.queryAutofetchHash(b1); + query1.queryAutoTuneHash(b1); HashQueryPlan hash1 = b1.build(); SpiQuery query2 = (SpiQuery)Ebean.find(Order.class) @@ -31,7 +31,7 @@ public class DefaultOrmQueryTest { .fetch("details.product", "sku, name"); HashQueryPlanBuilder b2 = new HashQueryPlanBuilder(); - query2.queryAutofetchHash(b2); + query2.queryAutoTuneHash(b2); HashQueryPlan hash2 = b2.build(); assertThat(hash1).isNotEqualTo(hash2); diff --git a/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java b/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java index c6de0cd29..ab24df13c 100644 --- a/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java +++ b/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java @@ -50,7 +50,7 @@ public class AutofetchEmbeddedTest extends BaseTestCase { // for (int i = 0; i < 5; i++) { // Ebean.beginTransaction(); // try { -// List result = Ebean.find(EMain.class).setAutofetch(true).findList(); +// List result = Ebean.find(EMain.class).setAutoTune(true).findList(); // for (EMain e : result) { // e.getEmbeddable().setDescription("Test" + i); // Ebean.save(e); diff --git a/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java b/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java index af04e957f..e53931b16 100644 --- a/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java +++ b/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java @@ -17,7 +17,7 @@ public class MainAutoFetchExcludeLazyLobs { Ebean.save(a); List list = Ebean.find(EBasicClob.class) - .setAutofetch(true) + .setAutoTune(true) .findList(); for (EBasicClob bean : list) { diff --git a/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java b/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java index a42df5d69..674490eb0 100644 --- a/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java +++ b/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java @@ -18,7 +18,7 @@ public class MainAutoQueryTune1 { private void tuneJoin() { List list = Ebean.find(Order.class) - .setAutofetch(true) + .setAutoTune(true) .fetch("customer") .where() .eq("status", Order.Status.NEW) diff --git a/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java b/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java index fcd1990b7..ba907024d 100644 --- a/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java +++ b/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java @@ -15,7 +15,7 @@ import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.bean.EntityBeanIntercept; import com.avaje.ebean.cache.ServerCacheManager; import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autofetch.service.TunedQueryInfo; +import com.avaje.ebeaninternal.server.autotune.service.TunedQueryInfo; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; diff --git a/src/test/java/com/avaje/tests/basic/MainDbBoolean.java b/src/test/java/com/avaje/tests/basic/MainDbBoolean.java index 57ca2674d..712616eff 100644 --- a/src/test/java/com/avaje/tests/basic/MainDbBoolean.java +++ b/src/test/java/com/avaje/tests/basic/MainDbBoolean.java @@ -120,7 +120,7 @@ public class MainDbBoolean { List list = server.find(TOne.class) - .setAutofetch(false) + .setAutoTune(false) .order("id") .findList(); @@ -140,7 +140,7 @@ public class MainDbBoolean { Query query = server.find(TOne.class) - .setAutofetch(false) + .setAutoTune(false) .order("id"); int rc = query.findRowCount(); diff --git a/src/test/java/com/avaje/tests/basic/TestFetchId.java b/src/test/java/com/avaje/tests/basic/TestFetchId.java index 471b15fc4..7ac097517 100644 --- a/src/test/java/com/avaje/tests/basic/TestFetchId.java +++ b/src/test/java/com/avaje/tests/basic/TestFetchId.java @@ -21,7 +21,7 @@ public class TestFetchId extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("details") .where().gt("id", 1) .gt("details.id", 0) diff --git a/src/test/java/com/avaje/tests/basic/TestInheritRef.java b/src/test/java/com/avaje/tests/basic/TestInheritRef.java index 368d7c2c8..96b1e262e 100644 --- a/src/test/java/com/avaje/tests/basic/TestInheritRef.java +++ b/src/test/java/com/avaje/tests/basic/TestInheritRef.java @@ -31,7 +31,7 @@ public class TestInheritRef extends BaseTestCase { Ebean.save(t); List list = Ebean.find(Vehicle.class) - .setAutofetch(false) + .setAutoTune(false) .findList(); Assert.assertTrue(list.size() > 0); diff --git a/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java b/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java index df7a77dbc..45b58a749 100644 --- a/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java +++ b/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java @@ -24,7 +24,7 @@ public class TestLazyLoadEmptyOneToMany extends BaseTestCase { Ebean.save(c); Customer c1 = Ebean.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) .select("id") .fetch("contacts", "id") .where().idEq(c.getId()) diff --git a/src/test/java/com/avaje/tests/basic/TestLimitQuery.java b/src/test/java/com/avaje/tests/basic/TestLimitQuery.java index ad3689b2d..52a6c84c0 100644 --- a/src/test/java/com/avaje/tests/basic/TestLimitQuery.java +++ b/src/test/java/com/avaje/tests/basic/TestLimitQuery.java @@ -30,7 +30,7 @@ public class TestLimitQuery extends BaseTestCase { boolean h2Db = "h2".equals(server.getDatabasePlatform().getName()); Query query = Ebean.find(Order.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("details") .where().gt("details.id", 0) .setMaxRows(0) @@ -57,7 +57,7 @@ public class TestLimitQuery extends BaseTestCase { boolean h2Db = "h2".equals(server.getDatabasePlatform().getName()); Query query = Ebean.find(Order.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("details") .where().gt("details.id", 0) .setMaxRows(3) @@ -83,7 +83,7 @@ public class TestLimitQuery extends BaseTestCase { boolean h2Db = "h2".equals(server.getDatabasePlatform().getName()); Query query = Ebean.find(Order.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("details") .where().gt("details.id", 0) .query(); @@ -107,7 +107,7 @@ public class TestLimitQuery extends BaseTestCase { boolean h2Db = "h2".equals(server.getDatabasePlatform().getName()); Query query = Ebean.find(Order.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("details") .where().gt("details.id", 0) .setMaxRows(10); @@ -131,7 +131,7 @@ public class TestLimitQuery extends BaseTestCase { } query = Ebean.find(Order.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("details") .setMaxRows(10); diff --git a/src/test/java/com/avaje/tests/basic/TestQuery.java b/src/test/java/com/avaje/tests/basic/TestQuery.java index 26ce50d41..257262ae5 100644 --- a/src/test/java/com/avaje/tests/basic/TestQuery.java +++ b/src/test/java/com/avaje/tests/basic/TestQuery.java @@ -16,7 +16,7 @@ public class TestQuery extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class).setAutofetch(false).order().asc("orderDate") + Query query = Ebean.find(Order.class).setAutoTune(false).order().asc("orderDate") .order().desc("id"); // .orderBy("orderDate"); @@ -31,14 +31,14 @@ public class TestQuery extends BaseTestCase { public void testForUpdate() { ResetBasicData.reset(); - Query query = Ebean.find(Order.class).setAutofetch(false).setForUpdate(false) + Query query = Ebean.find(Order.class).setAutoTune(false).setForUpdate(false) .setMaxRows(1).order().asc("orderDate").order().desc("id"); int rc = query.findList().size(); Assert.assertTrue(rc > 0); Assert.assertTrue(!query.getGeneratedSql().toLowerCase().contains("for update")); - query = Ebean.find(Order.class).setAutofetch(false).setForUpdate(true).setMaxRows(1).order() + query = Ebean.find(Order.class).setAutoTune(false).setForUpdate(true).setMaxRows(1).order() .asc("orderDate").order().desc("id"); rc = query.findList().size(); diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java b/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java index 872d687d3..ed782b45c 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java +++ b/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java @@ -20,7 +20,7 @@ public class TestQueryWhereBetween extends BaseTestCase { Timestamp t = new Timestamp(System.currentTimeMillis()); - Query query = Ebean.find(Order.class).setAutofetch(false).where() + Query query = Ebean.find(Order.class).setAutoTune(false).where() .betweenProperties("cretime", "updtime", t).order().asc("orderDate").order().desc("id"); query.findList(); diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java b/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java index d12f0cb24..51251cb29 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java +++ b/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java @@ -22,7 +22,7 @@ public class TestQueryWithCache extends BaseTestCase { // Ebean.getServer(null).runCacheWarming(); // // Query query = Ebean.createQuery(Order.class) - // .setAutofetch(false) + // .setAutoTune(false) // .fetch("customer","+cache +readonly") // .setId(1); // @@ -107,7 +107,7 @@ public class TestQueryWithCache extends BaseTestCase { Country nz3 = Ebean.find(Country.class, "NZ"); - Country nz4 = Ebean.find(Country.class).setId("NZ").setAutofetch(false).setUseCache(false) + Country nz4 = Ebean.find(Country.class).setId("NZ").setAutoTune(false).setUseCache(false) .findUnique(); Assert.assertTrue(nz2 == nz2b); diff --git a/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java b/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java index 11d5e05aa..727be66e1 100644 --- a/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java +++ b/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java @@ -24,7 +24,7 @@ public class TestReadOnlyPropagation extends BaseTestCase { ResetBasicData.reset(); Order order = Ebean.find(Order.class) - .setAutofetch(false) + .setAutoTune(false) .setUseCache(false) .setReadOnly(true) .setId(1) diff --git a/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java b/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java index bae674110..b6ac4adab 100644 --- a/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java +++ b/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java @@ -27,7 +27,7 @@ public class TestSharedInstancePropagation extends BaseTestCase { Ebean.getServerCacheManager().clearAll(); Order order = Ebean.find(Order.class) - .setAutofetch(false) + .setAutoTune(false) .setUseCache(true) .setReadOnly(true) .setId(1) diff --git a/src/test/java/com/avaje/tests/basic/TestTransient.java b/src/test/java/com/avaje/tests/basic/TestTransient.java index 6ce8cfa61..aa5df2e95 100644 --- a/src/test/java/com/avaje/tests/basic/TestTransient.java +++ b/src/test/java/com/avaje/tests/basic/TestTransient.java @@ -19,7 +19,7 @@ public class TestTransient extends BaseTestCase { Ebean.save(cnew); Integer custId = cnew.getId(); - Customer c = Ebean.find(Customer.class).setAutofetch(false).setId(custId).findUnique(); + Customer c = Ebean.find(Customer.class).setAutoTune(false).setId(custId).findUnique(); Assert.assertNotNull(c); diff --git a/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java b/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java index 0065845f3..d29750b0e 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java +++ b/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java @@ -30,14 +30,14 @@ public class TestExtraScalarTypes extends BaseTestCase { Ebean.save(e); - ESomeType e2 = Ebean.find(ESomeType.class).setAutofetch(false).setId(e.getId()).findUnique(); + ESomeType e2 = Ebean.find(ESomeType.class).setAutoTune(false).setId(e.getId()).findUnique(); Assert.assertNotNull(e2.getCurrency()); Assert.assertNotNull(e2.getLocale()); Assert.assertNotNull(e2.getTimeZone()); List list = Ebean.find(ESomeType.class) - .setAutofetch(false).where() + .setAutoTune(false).where() .eq("locale", locale) .eq("timeZone", tz.getID()) .eq("currency", currency) diff --git a/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java b/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java index 4f2177615..1c76187e8 100644 --- a/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java +++ b/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java @@ -20,7 +20,7 @@ public class TestSecondQueryNoRows extends BaseTestCase { Ebean.save(cnew); Customer c = Ebean.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) .setId(cnew.getId()) .fetch("contacts", new FetchConfig().query()) .findUnique(); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java b/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java index cec5ba8bf..fe56914e0 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java @@ -35,7 +35,7 @@ public class TestCacheCollectionIds extends BaseTestCase { custCache.clear(); custManyIdsCache.clear(); - List list = Ebean.find(Customer.class).setAutofetch(false).setLoadBeanCache(true) + List list = Ebean.find(Customer.class).setAutoTune(false).setLoadBeanCache(true) .order().asc("id").findList(); Assert.assertTrue(list.size() > 1); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java b/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java index 494fe39a7..39c776f7d 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java @@ -19,7 +19,7 @@ public class TestCacheCustomer extends BaseTestCase { ResetBasicData.reset(); - List list = Ebean.find(Customer.class).setAutofetch(false).setLoadBeanCache(true) + List list = Ebean.find(Customer.class).setAutoTune(false).setLoadBeanCache(true) .findList(); Assert.assertTrue(list.size() > 1); diff --git a/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java b/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java index 53d597056..6d6a31df4 100644 --- a/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java +++ b/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java @@ -8,7 +8,7 @@ import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.ebean.cache.ServerCache; import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autofetch.service.TunedQueryInfo; +import com.avaje.ebeaninternal.server.autotune.service.TunedQueryInfo; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; import com.avaje.tests.model.basic.FeatureDescription; diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java.orig b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java.orig deleted file mode 100644 index 79d894181..000000000 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java.orig +++ /dev/null @@ -1,70 +0,0 @@ -package com.avaje.tests.ddd.iud; - -<<<<<<< HEAD -import junit.framework.TestCase; - -import com.avaje.ebean.config.GlobalProperties; -======= -import java.util.Currency; - -import junit.framework.TestCase; - -import org.junit.Assert; - -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.config.GlobalProperties; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; ->>>>>>> json-refactor -import com.avaje.tests.model.ddd.DPerson; - -public class TestDPersonEl extends TestCase { - - public void test() { - - GlobalProperties.put("classes", DPerson.class.toString()); - - Currency NZD = Currency.getInstance("NZD"); - - DPerson p = new DPerson(); - p.setFirstName("first"); - p.setLastName("last"); - p.setSalary(new Money("12200")); - p.setCmoney(new CMoney(new Money("12"), NZD)); - - SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); - - BeanDescriptor descriptor = server.getBeanDescriptor(DPerson.class); - - ElPropertyValue elCmoney = descriptor.getElGetValue("cmoney"); -// ElPropertyValue elCmoneyAmt = descriptor.getElGetValue("cmoney.amount"); -// ElPropertyValue elCmoneyCur = descriptor.getElGetValue("cmoney.currency"); - - JsonContext jsonContext = server.createJsonContext(); - String json = jsonContext.toJsonString(p); - - DPerson bean = jsonContext.toBean(DPerson.class, json); - Assert.assertEquals("first", bean.getFirstName()); - Assert.assertEquals(new Money("12200"), bean.getSalary()); - Assert.assertEquals(new Money("12"), bean.getCmoney().getAmount()); - Assert.assertEquals(NZD, bean.getCmoney().getCurrency()); - - - EntityBean entityBean = (EntityBean)p; - - Object cmoney = elCmoney.elGetValue(entityBean); -// Object amt = elCmoneyAmt.elGetValue(entityBean); -// Object cur = elCmoneyCur.elGetValue(entityBean); - - Assert.assertNotNull(cmoney); -// Assert.assertEquals(new Money("12"), amt); -// Assert.assertEquals(NZD, cur); - - p.setCmoney(null); - Assert.assertNull(p.getCmoney()); - } - -} diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java index d17ab1e7b..1b128dd46 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java +++ b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java @@ -25,7 +25,7 @@ public class TestDPersonIUD extends TestCase { // Assert.assertNotNull(id); // // DPerson p2 = Ebean.find(DPerson.class) -// .setAutofetch(false) +// .setAutoTune(false) // .where().idEq(id) // .findUnique(); // @@ -38,7 +38,7 @@ public class TestDPersonIUD extends TestCase { // // // Query query = Ebean.find(DPerson.class) -// .setAutofetch(false) +// .setAutoTune(false) // .where().gt("cmoney.amount",1) // .query(); // diff --git a/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java b/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java index d82fbfe6a..e000471c9 100644 --- a/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java +++ b/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java @@ -27,7 +27,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { ResetBasicData.reset(); Query q = Ebean.find(Order.class) - .setAutofetch(true) + .setAutoTune(true) //.fetch("customer") //.fetch("customer.contacts") .where().lt("id", 3).query(); @@ -65,7 +65,7 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { // System.out.println(queryStats); // } - if (q.isAutofetchTuned()) { + if (q.isAutoTuned()) { System.out.println("TUNED..."); } } diff --git a/src/test/java/com/avaje/tests/query/TestLimitQuery.java b/src/test/java/com/avaje/tests/query/TestLimitQuery.java index faa42f580..b8e84590b 100644 --- a/src/test/java/com/avaje/tests/query/TestLimitQuery.java +++ b/src/test/java/com/avaje/tests/query/TestLimitQuery.java @@ -17,7 +17,7 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); List customers = Ebean.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) .setFirstRow(0) .setMaxRows(10) .where().like("name", "%A%") diff --git a/src/test/java/com/avaje/tests/query/TestQueryAlias.java b/src/test/java/com/avaje/tests/query/TestQueryAlias.java index b764cd059..69225e3ea 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryAlias.java +++ b/src/test/java/com/avaje/tests/query/TestQueryAlias.java @@ -18,7 +18,7 @@ public class TestQueryAlias extends BaseTestCase { Query sq = Ebean.createQuery(CKeyParent.class) .select("id.oneKey").alias("st0") - .setAutofetch(false).where().query(); + .setAutoTune(false).where().query(); Query pq = Ebean.find(CKeyParent.class).alias("myt0").where().in("id.oneKey", sq).query(); @@ -44,7 +44,7 @@ public class TestQueryAlias extends BaseTestCase { Query sq = Ebean.createQuery(CKeyParent.class) .select("id.oneKey").alias("st0") - .setAutofetch(false).where().query(); + .setAutoTune(false).where().query(); Query pq = Ebean.find(CKeyParent.class).alias("myt0").where().notIn("id.oneKey", sq).query(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java b/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java index 1c64e7824..fd5dba58f 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java @@ -23,7 +23,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { // test that join to order.details is not included in the initial query (included in query join) Query query = Ebean.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("orders") .fetch("orders.details"); @@ -66,7 +66,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { // test that join to order.details is not included Query shipQuery = Ebean.find(OrderShipment.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("order") .fetch("order.details"); @@ -107,7 +107,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { // test that join to order.details is not included Query query = Ebean.find(Contact.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("customer") .fetch("customer.orders"); @@ -138,7 +138,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { // test that join to order.details is not included Query query = Ebean.find(Contact.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("customer") .where().ilike("customer.name", "Rob%") .query(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java b/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java index 9743fc7cd..a6d1c1ab8 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java @@ -21,8 +21,8 @@ public class TestQueryFetchSkipPath extends BaseTestCase { List list = Ebean.find(Order.class) - // .setAutofetch(true) - .setAutofetch(false).select("status") + // .setAutoTune(true) + .setAutoTune(false).select("status") // .fetch("customer","id") // .fetch("customer.contacts","id") .fetch("customer.contacts.notes", "title").findList(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindEach.java b/src/test/java/com/avaje/tests/query/TestQueryFindEach.java index 113e37218..08ed70f21 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindEach.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindEach.java @@ -19,7 +19,7 @@ public class TestQueryFindEach extends BaseTestCase { Query query = server.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") .setMaxRows(2); @@ -46,7 +46,7 @@ public class TestQueryFindEach extends BaseTestCase { EbeanServer server = Ebean.getServer(null); - Query query = server.find(Customer.class).setAutofetch(false) + Query query = server.find(Customer.class).setAutoTune(false) .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") .setMaxRows(2); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java b/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java index a305fc974..dddff3155 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java @@ -19,7 +19,7 @@ public class TestQueryFindEachWhile extends BaseTestCase { Query query = server.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") .setMaxRows(2); @@ -47,7 +47,7 @@ public class TestQueryFindEachWhile extends BaseTestCase { EbeanServer server = Ebean.getServer(null); - Query query = server.find(Customer.class).setAutofetch(false) + Query query = server.find(Customer.class).setAutoTune(false) .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") .setMaxRows(2); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java index 4be118dc0..19fbb7f66 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java @@ -26,7 +26,7 @@ public class TestQueryFindIterate extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) //.fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") .setMaxRows(2); @@ -154,7 +154,7 @@ public class TestQueryFindIterate extends BaseTestCase { // intentionally a query with incorrect type binding Query query = server.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) .where().gt("id","JUNK_NOT_A_LONG") .setMaxRows(2); @@ -178,7 +178,7 @@ public class TestQueryFindIterate extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class) - .setAutofetch(false) + .setAutoTune(false) .where().gt("id", 0) .setMaxRows(2); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java b/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java index 110e6cd2f..238e48427 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java @@ -22,7 +22,7 @@ public class TestQueryFindVisit extends BaseTestCase { EbeanServer server = Ebean.getServer(null); - Query query = server.find(Customer.class).setAutofetch(false) + Query query = server.find(Customer.class).setAutoTune(false) .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") .setMaxRows(2); @@ -47,7 +47,7 @@ public class TestQueryFindVisit extends BaseTestCase { EbeanServer server = Ebean.getServer(null); - Query query = server.find(Customer.class).setAutofetch(false) + Query query = server.find(Customer.class).setAutoTune(false) .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") .setMaxRows(2); diff --git a/src/test/java/com/avaje/tests/query/TestSubQuery.java b/src/test/java/com/avaje/tests/query/TestSubQuery.java index 9658f6d91..0bfe31884 100644 --- a/src/test/java/com/avaje/tests/query/TestSubQuery.java +++ b/src/test/java/com/avaje/tests/query/TestSubQuery.java @@ -49,7 +49,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(CKeyParent.class).select("id.oneKey") - .setAutofetch(false).where().query(); + .setAutoTune(false).where().query(); Query pq = Ebean.find(CKeyParent.class).where().in("id.oneKey", sq).query(); @@ -71,7 +71,7 @@ public class TestSubQuery extends BaseTestCase { * public void testInheritance1() { ResetBasicData.reset(); * * Query sq = Ebean.createQuery(Vehicle.class) .select("id") - * .setAutofetch(false) .where() .query(); + * .setAutoTune(false) .where() .query(); * * Query pq = Ebean.find(VehicleDriver.class) * .where().in("vehicle.id", sq) .query(); @@ -95,7 +95,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(VehicleDriver.class).select("vehicle") - .setAutofetch(false).where().query(); + .setAutoTune(false).where().query(); Query pq = Ebean.find(Vehicle.class).where().in("id", sq).query(); @@ -124,7 +124,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(VehicleDriver.class).select("vehicle") - .setAutofetch(false).where().eq("vehicle.licenseNumber", "abc").query(); + .setAutoTune(false).where().eq("vehicle.licenseNumber", "abc").query(); Query pq = Ebean.find(Vehicle.class).where().in("id", sq).query(); @@ -150,7 +150,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(VehicleDriver.class).select("vehicle.id") - .setAutofetch(false).where().query(); + .setAutoTune(false).where().query(); Query pq = Ebean.find(Vehicle.class).where().in("id", sq).query(); diff --git a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java b/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java index 3783e9050..45faeefab 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -47,7 +47,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { // String oq = // "find order join customer join customer.contacts join details (+query(4),+lazy(5))"; // Query q = Ebean.createQuery(Order.class, oq); - // q.setAutofetch(false); + // q.setAutoTune(false); // List list2 = q.findList(); // // Assert.assertTrue(list2.size() > 0); diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java index d441e3494..cb03fd16e 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java @@ -73,7 +73,7 @@ public class TestOrderByWithDistinct extends BaseTestCase { // still need them to be present for purpose of order by // so here I'm "simulating" a scenario where autofetch has dropped userType.name query = Ebean.find(MUser.class) - .setAutofetch(false) + .setAutoTune(false) .select("userName") .fetch("userType","name") .where() diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryPlanHash.java b/src/test/java/com/avaje/tests/query/other/TestQueryPlanHash.java index 34e7b6827..8e57deb97 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryPlanHash.java +++ b/src/test/java/com/avaje/tests/query/other/TestQueryPlanHash.java @@ -17,12 +17,12 @@ public class TestQueryPlanHash { HashQueryPlanBuilder builder1 = new HashQueryPlanBuilder(); SpiQuery squery = (SpiQuery)Ebean.find(Order.class); - squery.queryAutofetchHash(builder1); + squery.queryAutoTuneHash(builder1); squery.where().in("id", 1,2,3); HashQueryPlanBuilder builder2 = new HashQueryPlanBuilder(); - squery.queryAutofetchHash(builder2); + squery.queryAutoTuneHash(builder2); int q1BindHash = squery.queryBindHash(); Assert.assertNotSame(builder1.build(), builder2.build()); @@ -31,7 +31,7 @@ public class TestQueryPlanHash { SpiQuery squery2 = (SpiQuery)Ebean.find(Order.class); squery2.where().in("id", 2,2,3); - squery2.queryAutofetchHash(builder3); + squery2.queryAutoTuneHash(builder3); int q2BindHash = squery2.queryBindHash(); Assert.assertEquals(builder3.build(), builder2.build()); @@ -42,7 +42,7 @@ public class TestQueryPlanHash { SpiQuery squery4 = (SpiQuery)Ebean.find(Order.class); squery4.where().in("name", 2,2,3); - squery4.queryAutofetchHash(builder4); + squery4.queryAutoTuneHash(builder4); int q4BindHash = squery4.queryBindHash(); //different query plan diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java index 8a0516cfd..2a0999f0b 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java @@ -22,7 +22,7 @@ public class TestTextJsonInheritance extends BaseTestCase { setupData(); - List list = Ebean.find(Vehicle.class).setAutofetch(false).findList(); + List list = Ebean.find(Vehicle.class).setAutoTune(false).findList(); Assert.assertEquals(2, list.size()); diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 21dc15f99..3fadff078 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -72,7 +72,7 @@ - +