#1202 - Automatically remove old query plans from Ebean's internal query plan cache

This commit is contained in:
Rob Bygrave committed 2017-11-06 22:59:42 +13:00
1 parent fcf730ec39
commit 2b94487573
7 files changed
+72 -4

No files matched your search

@@ -252,7 +252,7 @@ class CQueryBuilder {
// skip building the SqlTree and Sql string
predicates.prepare(false);
String sql = queryPlan.getSql();
return new CQueryRowCount(request, predicates, sql);
return new CQueryRowCount(queryPlan, request, predicates, sql);
}
predicates.prepare(true);
@@ -283,7 +283,7 @@ class CQueryBuilder {
queryPlan = new CQueryPlan(request, sql, sqlTree, false, s.isIncludesRowNumberColumn(), predicates.getLogWhereSql());
request.putQueryPlan(queryPlan);
return new CQueryRowCount(request, predicates, sql);
return new CQueryRowCount(queryPlan, request, predicates, sql);
}
/**
@@ -16,6 +16,8 @@ import java.sql.SQLException;
*/
class CQueryRowCount {
private final CQueryPlan queryPlan;
/**
* The overall find request wrapper object.
*/
@@ -54,7 +56,8 @@ class CQueryRowCount {
/**
* Create the Sql select based on the request.
*/
CQueryRowCount(OrmQueryRequest<?> request, CQueryPredicates predicates, String sql) {
CQueryRowCount(CQueryPlan queryPlan, OrmQueryRequest<?> request, CQueryPredicates predicates, String sql) {
this.queryPlan = queryPlan;
this.request = request;
this.query = request.getQuery();
this.sql = sql;
@@ -116,6 +119,7 @@ class CQueryRowCount {
rowCount = rset.getInt(1);
executionTimeMicros = (System.nanoTime() - startNano) / 1000L;
queryPlan.executionTime(rowCount, executionTimeMicros, query.getParentNode());
request.slowQueryCheck(executionTimeMicros, rowCount);
return rowCount;