mondrian: optimize named set caching

[git-p4: depot-paths = "//open/mondrian/": change = 9336]
pentaho · May 26, 2007 · 26f11f1 · 26f11f1
1 parent 4a14bee
commit 26f11f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/src/main/mondrian/rolap/RolapEvaluator.java b/src/main/mondrian/rolap/RolapEvaluator.java
@@ -180,12 +180,6 @@ protected Object evaluateNamedSet(String name, Exp exp) {
             throw new UnsupportedOperationException();
         }
 
-        /**
-         * Clears cached values for all named sets.
-         */
-        protected void clearNamedSets() {
-        }
-
         /**
          * First evaluator calls this method on construction.
          */
@@ -672,14 +666,6 @@ public Object getCachedResult(ExpCacheDescriptor cacheDescriptor) {
 
     public void clearExpResultCache() {
         root.expResultCache.clear();
-
-        // Clear cached named sets at the same time we clear other cached
-        // expressions.  This may be overconservative in some cases, but
-        // without this, there can be bugs when incorrect results get cached
-        // for named sets which depend on measures which haven't been loaded
-        // yet.  See mondrian.test.clearview.CVBasicTest.testLer4260 for an
-        // example.
-        root.clearNamedSets();
     }
 
     public boolean isNonEmpty() {

diff --git a/src/main/mondrian/rolap/RolapResult.java b/src/main/mondrian/rolap/RolapResult.java
@@ -809,6 +809,8 @@ private Object evaluateExp(Calc calc, Evaluator evaluator) {
             ev.setCellReader(batchingReader);
             Object preliminaryValue = calc.evaluate(ev);
             Util.discard(preliminaryValue);
+            ev.clearExpResultCache();
+
             if (!batchingReader.loadAggregations(evaluator.getQuery())) {
                 break;
             }
@@ -1248,10 +1250,6 @@ protected Object evaluateNamedSet(String name, Exp exp) {
             return value;
         }
 
-        protected void clearNamedSets() {
-            namedSetValues.clear();
-        }
-
         public Object getParameterValue(ParameterSlot slot) {
             Object value = slot.getParameterValue();
             if (value != null) {