MONDRIAN Oops. (Edit after branch.)

[git-p4: depot-paths = "//open/mondrian/": change = 14425]
pentaho · Jul 4, 2011 · 2a02ece · 2a02ece
1 parent 3129dba
commit 2a02ece
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/src/main/mondrian/rolap/RolapProfilingEvaluator.java b/src/main/mondrian/rolap/RolapProfilingEvaluator.java
@@ -64,13 +64,18 @@ public class RolapProfilingEvaluator extends RolapEvaluator {
      */
     private RolapProfilingEvaluator(
         RolapEvaluatorRoot root,
-        RolapProfilingEvaluator evaluator)
+        RolapProfilingEvaluator evaluator,
+        List<List<Member>> aggregationList)
     {
-        super(root, evaluator);
+        super(
+            root,
+            evaluator,
+            aggregationList);
     }
 
-    public RolapEvaluator _push() {
-        return new RolapProfilingEvaluator(root, this);
+    @Override
+    protected RolapEvaluator _push(List<List<Member>> aggregationList) {
+        return new RolapProfilingEvaluator(root, this, aggregationList);
     }
 
     /**
@@ -137,6 +142,11 @@ public ResultStyle getResultStyle() {
             return calc.getResultStyle();
         }
 
+        @Override
+        public boolean dependsOn(Hierarchy hierarchy) {
+            return calc.dependsOn(hierarchy);
+        }
+
         public Object evaluate(Evaluator evaluator) {
             ++callCount;
             long start = System.currentTimeMillis();
@@ -200,6 +210,16 @@ public Type getType() {
             return calc.getType();
         }
 
+        @Override
+        public Calc[] getCalcs() {
+            return ((AbstractCalc) calc).getCalcs();
+        }
+
+        @Override
+        public boolean dependsOn(Hierarchy hierarchy) {
+            return calc.dependsOn(hierarchy);
+        }
+
         public Object evaluate(Evaluator evaluator) {
             ++callCount;
             long start = System.currentTimeMillis();