#1172 - Refactor - remove internal unused DefaultOrmQuery logSecondaryQuery (as we use LoggedSqlCollector)

This commit is contained in:
Rob Bygrave
2017-10-16 23:49:23 +13:00
parent 94a857d345
commit 331f49824f
7 changed files with 60 additions and 131 deletions
@@ -26,16 +26,6 @@ public abstract class LoadRequest {
*/
public abstract Class<?> getBeanType();
/**
* Log the just executed secondary query with the 'root' query if 'logSecondaryQuery' is set to
* true. This is for testing purposes to confirm the secondary query executes etc.
*/
public void logSecondaryQuery(SpiQuery<?> query) {
if (parentRequest != null && parentRequest.isLogSecondaryQuery()) {
parentRequest.getQuery().logSecondaryQuery(query);
}
}
/**
* Return true if this is a lazy load and false if it is a secondary query.
*/
@@ -440,26 +440,6 @@ public interface SpiQuery<T> extends Query<T> {
*/
Boolean isAutoTune();
/**
* Set to true if you want to capture executed secondary queries.
*/
void setLogSecondaryQuery(boolean logSecondaryQuery);
/**
* Return true if executed secondary queries should be captured.
*/
boolean isLogSecondaryQuery();
/**
* Return the list of secondary queries that were executed.
*/
List<SpiQuery<?>> getLoggedSecondaryQueries();
/**
* Log an executed secondary query.
*/
void logSecondaryQuery(SpiQuery<?> query);
/**
* If return null then no profiling for this query. If a ProfilingListener is
* returned this implies that profiling is turned on for this query (and all
@@ -84,13 +84,9 @@ public class DefaultBeanLoader {
int batchSize = getBatchSize(batch.size());
SpiQuery<?> query = loadRequest.createQuery(server, batchSize);
executeQuery(loadRequest, query);
loadRequest.postLoad();
// log the query (for testing secondary queries)
loadRequest.logSecondaryQuery(query);
}
public void loadMany(BeanCollection<?> bc, boolean onlyIds) {
@@ -210,9 +206,6 @@ public class DefaultBeanLoader {
List<?> list = executeQuery(loadRequest, query);
loadRequest.postLoad(list);
// log the query (for testing secondary queries)
loadRequest.logSecondaryQuery(query);
}
/**
@@ -551,13 +551,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
transaction.logSql(sql);
}
/**
* Return true if the request wants to log the secondary queries (test purpose).
*/
public boolean isLogSecondaryQuery() {
return query.isLogSecondaryQuery();
}
/**
* Return the batch size for lazy loading on this bean query request.
*/
@@ -220,8 +220,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
*/
private boolean autoTuned;
private boolean logSecondaryQuery;
/**
* Root table alias. For {@link Query#alias(String)} command.
*/
@@ -895,31 +893,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
this.usageProfiling = usageProfiling;
}
@Override
public void setLogSecondaryQuery(boolean logSecondaryQuery) {
this.logSecondaryQuery = logSecondaryQuery;
}
@Override
public boolean isLogSecondaryQuery() {
return logSecondaryQuery;
}
private List<SpiQuery<?>> loggedSecondaryQueries;
@Override
public List<SpiQuery<?>> getLoggedSecondaryQueries() {
return loggedSecondaryQueries;
}
@Override
public void logSecondaryQuery(SpiQuery<?> query) {
if (loggedSecondaryQueries == null) {
loggedSecondaryQueries = new ArrayList<>();
}
loggedSecondaryQueries.add(query);
}
@Override
public void setParentNode(ObjectGraphNode parentNode) {
this.parentNode = parentNode;