提交 cec23b76 authored 作者: Noel Grandin's avatar Noel Grandin

cachedlookup not worth it after all

was deceived by the variability of the test
上级 81110c1c
...@@ -120,11 +120,6 @@ public class Select extends Query { ...@@ -120,11 +120,6 @@ public class Select extends Query {
* Key into groupByData that produces currentGroupByExprData. Not used in lazy mode. * Key into groupByData that produces currentGroupByExprData. Not used in lazy mode.
*/ */
private ValueArray currentGroupsKey; private ValueArray currentGroupsKey;
/**
* Cache the lookups into exprToIndexInGroupByData
*/
private Expression cachedLookup;
private Integer cachedLookupIndex;
private int havingIndex; private int havingIndex;
private boolean isGroupQuery, isGroupSortedQuery; private boolean isGroupQuery, isGroupSortedQuery;
...@@ -207,8 +202,6 @@ public class Select extends Query { ...@@ -207,8 +202,6 @@ public class Select extends Query {
if (index == null) { if (index == null) {
return null; return null;
} }
cachedLookup = expr;
cachedLookupIndex = index;
return currentGroupByExprData[index]; return currentGroupByExprData[index];
} }
...@@ -216,11 +209,6 @@ public class Select extends Query { ...@@ -216,11 +209,6 @@ public class Select extends Query {
* Set the group-by data for the current group and the passed in expression. * Set the group-by data for the current group and the passed in expression.
*/ */
public void setCurrentGroupExprData(Expression expr, Object obj) { public void setCurrentGroupExprData(Expression expr, Object obj) {
if (cachedLookup == expr) {
assert currentGroupByExprData[cachedLookupIndex] == null;
currentGroupByExprData[cachedLookupIndex] = obj;
return;
}
Integer index = exprToIndexInGroupByData.get(expr); Integer index = exprToIndexInGroupByData.get(expr);
if (index != null) { if (index != null) {
assert currentGroupByExprData[index] == null; assert currentGroupByExprData[index] == null;
...@@ -402,8 +390,6 @@ public class Select extends Query { ...@@ -402,8 +390,6 @@ public class Select extends Query {
currentGroupByExprData = null; currentGroupByExprData = null;
currentGroupsKey = null; currentGroupsKey = null;
exprToIndexInGroupByData.clear(); exprToIndexInGroupByData.clear();
cachedLookup = null;
cachedLookupIndex = null;
try { try {
int rowNumber = 0; int rowNumber = 0;
setCurrentRowNumber(0); setCurrentRowNumber(0);
...@@ -473,8 +459,6 @@ public class Select extends Query { ...@@ -473,8 +459,6 @@ public class Select extends Query {
currentGroupsKey = null; currentGroupsKey = null;
currentGroupByExprData = null; currentGroupByExprData = null;
exprToIndexInGroupByData.clear(); exprToIndexInGroupByData.clear();
cachedLookup = null;
cachedLookupIndex = null;
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论