MONDRIAN:

* Remove vestiges of the old expression interpretation infrastrcture: remove Exp.evaluate(Evaluator), FunDef.evaluate(Evaluator,Exp[]). * Change UserDefinedFunction SPI so it is not dependent upon Exp. [git-p4: depot-paths = "//open/mondrian/": change = 4961]
pentaho · Jan 6, 2006 · 130aa66 · 130aa66
1 parent a0441d0
commit 130aa66
Show file tree

Hide file tree

Showing 41 changed files with 71 additions and 1,808 deletions.
diff --git a/src/main/mondrian/calc/DummyExp.java b/src/main/mondrian/calc/DummyExp.java
@@ -53,13 +53,6 @@ public Calc accept(ExpCompiler compiler) {
         throw new UnsupportedOperationException();
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        throw new UnsupportedOperationException();
-    }
-
-    public Object evaluateScalar(Evaluator evaluator) {
-        throw new UnsupportedOperationException();
-    }
 }
 
 // End DummyExp.java
diff --git a/src/main/mondrian/mdx/DimensionExpr.java b/src/main/mondrian/mdx/DimensionExpr.java
@@ -65,11 +65,6 @@ public Exp accept(Validator validator) {
         return this;
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        Util.deprecated("remove Exp.evaluate");
-        return dimension;
-    }
-
     public Calc accept(ExpCompiler compiler) {
         return ConstantCalc.constantDimension(dimension);
     }

diff --git a/src/main/mondrian/mdx/HierarchyExpr.java b/src/main/mondrian/mdx/HierarchyExpr.java
@@ -65,10 +65,6 @@ public Exp accept(Validator validator) {
         return this;
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        return hierarchy;
-    }
-
     public Calc accept(ExpCompiler compiler) {
         return ConstantCalc.constantHierarchy(hierarchy);
     }

diff --git a/src/main/mondrian/mdx/LevelExpr.java b/src/main/mondrian/mdx/LevelExpr.java
@@ -65,11 +65,6 @@ public Exp accept(Validator validator) {
         return this;
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        Util.deprecated("remove Exp.evaluate");
-        return level;
-    }
-
     public Calc accept(ExpCompiler compiler) {
         return ConstantCalc.constantLevel(level);
     }

diff --git a/src/main/mondrian/mdx/MemberExpr.java b/src/main/mondrian/mdx/MemberExpr.java
@@ -65,11 +65,6 @@ public Exp accept(Validator validator) {
         return this;
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        Util.deprecated("remove Exp.evaluate");
-        return member;
-    }
-
     public Calc accept(ExpCompiler compiler) {
         return ConstantCalc.constantMember(member);
     }

diff --git a/src/main/mondrian/mdx/NamedSetExpr.java b/src/main/mondrian/mdx/NamedSetExpr.java
@@ -86,13 +86,6 @@ public boolean dependsOn(Dimension dimension) {
         };
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        Util.deprecated("remove Exp.evaluate");
-        final String name = namedSet.getName();
-        final Exp exp = namedSet.getExp();
-        return evaluator.evaluateNamedSet(name, exp);
-    }
-
     public Type getType() {
         return namedSet.getType();
     }

diff --git a/src/main/mondrian/mdx/UnresolvedFunCall.java b/src/main/mondrian/mdx/UnresolvedFunCall.java
@@ -90,14 +90,6 @@ public Calc accept(ExpCompiler compiler) {
         throw new UnsupportedOperationException();
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        throw new UnsupportedOperationException();
-    }
-
-    public Object evaluateScalar(Evaluator evaluator) {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Returns the function name.
      *

diff --git a/src/main/mondrian/olap/Evaluator.java b/src/main/mondrian/olap/Evaluator.java
@@ -71,39 +71,9 @@ public interface Evaluator {
     Member getContext(Dimension dimension);
 
     /**
-     * @see Util#deprecated(String)
-     */ 
-    Object evaluateCurrent();
-
-    /**
-     * Visits a literal and returns its value.
-     *
-     * @see Util#deprecated(String)
-     */
-    Object visit(Literal literal);
-
-    /**
-     * Visits a function call and returns its value.
-     *
-     * @see Util#deprecated(String)
-     */
-    Object visit(FunCall funCall);
-
-    /**
-     * Visits an identifier and returns its value.
-     */
-    Object visit(Id id);
-
-    /**
-     * Visits a catalog element, such as a dimension or member, and returns its
-     * value.
+     * Calculates and returns the value of the cell at the current context.
      */
-    Object visit(OlapElement mdxElement);
-
-    /**
-     * Visits a parameter and returns its value.
-     */
-    Object visit(Parameter parameter);
+    Object evaluateCurrent();
 
     /**
      * Formats a value as a string according to the current context's

diff --git a/src/main/mondrian/olap/Exp.java b/src/main/mondrian/olap/Exp.java
@@ -31,8 +31,9 @@ public interface Exp {
 
     /**
      * Returns the {@link Category} of the expression.
+     *
      * @post Category.instance().isValid(return)
-     **/
+     */
     int getCategory();
 
     /**
@@ -69,10 +70,6 @@ public interface Exp {
      * @return A compiled expression
      */
     Calc accept(ExpCompiler compiler);
-
-    Object evaluate(Evaluator evaluator);
-
-    Object evaluateScalar(Evaluator evaluator);
 }
 
 // End Exp.java
diff --git a/src/main/mondrian/olap/ExpBase.java b/src/main/mondrian/olap/ExpBase.java
@@ -11,7 +11,6 @@
 */
 
 package mondrian.olap;
-import mondrian.olap.type.*;
 import mondrian.calc.Calc;
 import mondrian.calc.ExpCompiler;
 import mondrian.mdx.MemberExpr;
@@ -69,23 +68,6 @@ public final Member[] isConstantTuple()
         return members;
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        throw new Error("unsupported");
-    }
-
-    public Object evaluateScalar(Evaluator evaluator) {
-        Object o = evaluate(evaluator);
-        if (o instanceof Member) {
-            evaluator = evaluator.push((Member) o);
-            return evaluator.evaluateCurrent();
-        } else if (o instanceof Member[]) {
-            evaluator = evaluator.push((Member[]) o);
-            return evaluator.evaluateCurrent();
-        } else {
-            return o;
-        }
-    }
-
     public static void unparseList(PrintWriter pw, Exp[] exps, String start,
             String mid, String end) {
         pw.print(start);

diff --git a/src/main/mondrian/olap/FunCall.java b/src/main/mondrian/olap/FunCall.java
@@ -123,10 +123,6 @@ public void unparse(PrintWriter pw) {
         funDef.unparse(args, pw);
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        return evaluator.visit(this);
-    }
-
     public Calc accept(ExpCompiler compiler) {
         return funDef.compileCall(this, compiler);
     }

diff --git a/src/main/mondrian/olap/FunDef.java b/src/main/mondrian/olap/FunDef.java
@@ -78,11 +78,6 @@ public interface FunDef {
      */
     Calc compileCall(FunCall call, ExpCompiler compiler);
 
-    /**
-     * Applies this function to a set of arguments in the context provided
-     * by an evaluator, and returns the result.
-     */
-    Object evaluate(Evaluator evaluator, Exp[] args);
 }
 
 // End FunDef.java
diff --git a/src/main/mondrian/olap/Id.java b/src/main/mondrian/olap/Id.java
@@ -107,11 +107,6 @@ public void unparse(PrintWriter pw) {
         }
     }
 
-    // implement Exp
-    public Object evaluate(Evaluator evaluator) {
-        return evaluator.visit(this);
-    }
-
 }
 
 // End Id.java
diff --git a/src/main/mondrian/olap/Literal.java b/src/main/mondrian/olap/Literal.java
@@ -134,14 +134,6 @@ public Exp accept(Validator validator) {
         return this;
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        return evaluator.visit(this);
-    }
-
-    public Object evaluateScalar(Evaluator evaluator) {
-        return o;
-    }
-
     public Calc accept(ExpCompiler compiler) {
         return new ConstantCalc(getType(), o);
     }

diff --git a/src/main/mondrian/olap/Parameter.java b/src/main/mondrian/olap/Parameter.java
@@ -257,9 +257,6 @@ public boolean equals(Object other) {
             that.exp.equals(this.exp);
     }
 
-    public Object evaluate(Evaluator evaluator) {
-        return evaluator.visit(this);
-    }
 }