MONDRIAN: Get solve_order working.

[git-p4: depot-paths = "//open/mondrian/": change = 3253]

src/main/mondrian/olap/Formula.java

@@ -243,7 +243,7 @@ public Exp getExpression() {
         return exp;
     }
 
-    Exp getMemberProperty(String name) {
+    private Exp getMemberProperty(String name) {
         return MemberProperty.get(memberProperties, name);
     }
 
@@ -257,6 +257,20 @@ public Member getMdxMember() {
         return mdxMember;
     }
 
+    /**
+     * Returns the solve order. (Not valid if this formula defines a set.)
+     *
+     * @pre isMember()
+     * @post return != null
+     */
+    public int getSolveOrder() {
+        Exp exp = getMemberProperty(Property.PROPERTY_SOLVE_ORDER);
+        if (exp != null && exp.getType() == Category.Numeric)
+            return ((Literal)exp).getIntValue();
+        else
+            return 0;
+    }
+
     /**
      * Deduces a formatting expression for this calculated member. First it
      * looks for properties called "format", "format_string", etc. Then it looks

src/main/mondrian/olap/Property.java

@@ -48,6 +48,8 @@ public abstract class Property {
     public static final String PROPERTY_FORMATTED_VALUE = "FORMATTED_VALUE";
     /** Cell property for XML/A. */
     public static final String PROPERTY_FORMAT_STRING = "FORMAT_STRING";
+    /** Calculated member property */
+    public static final String PROPERTY_SOLVE_ORDER = "SOLVE_ORDER";
     /**
      * Name of the system property which determines whether to show a member
      * (especially a measure or calculated member) in a user interface such as

src/main/mondrian/rolap/RolapCalculatedMember.java

@@ -38,7 +38,7 @@ class RolapCalculatedMember extends RolapMember {
 
     // override RolapMember
     int getSolveOrder() {
-        return 0;
+        return formula.getSolveOrder();
     }
 
     public Object getPropertyValue(String name) {

src/main/mondrian/rolap/RolapEvaluator.java

@@ -152,42 +152,42 @@ public Member getContext(Dimension dimension)
     }
     public Object evaluateCurrent()
     {
-        RolapMember minSolveMember = getMinSolveMember();
-        if (minSolveMember != null) {
+        RolapMember maxSolveMember = getMaxSolveMember();
+        if (maxSolveMember != null) {
             // There is at least one calculated member. Expand the first one
-            // with the lowest solve order.
+            // with the highest solve order.
             RolapMember defaultMember = (RolapMember)
-                    minSolveMember.getHierarchy().getDefaultMember();
+                    maxSolveMember.getHierarchy().getDefaultMember();
             Util.assertTrue(
-                    defaultMember != minSolveMember,
+                    defaultMember != maxSolveMember,
                     "default member must not be calculated");
             RolapEvaluator evaluator = (RolapEvaluator) push(defaultMember);
-            evaluator.setExpanding(minSolveMember);
+            evaluator.setExpanding(maxSolveMember);
             //((RolapEvaluator) evaluator).cellReader = new CachingCellReader(cellReader);
-            return minSolveMember.getExpression().evaluateScalar(evaluator);
+            return maxSolveMember.getExpression().evaluateScalar(evaluator);
         }
         return cellReader.get(this);
     }
 
     /**
      * Returns the member in the current context which is (a) calculated, and
-     * (b) has the lowest solve order; returns null if there are no calculated
+     * (b) has the highest solve order; returns null if there are no calculated
      * members.
      */
-    private RolapMember getMinSolveMember() {
-        int minSolve = Integer.MAX_VALUE;
-        RolapMember minSolveMember = null;
+    private RolapMember getMaxSolveMember() {
+        int maxSolve = Integer.MIN_VALUE;
+        RolapMember maxSolveMember = null;
         for (int i = 0, count = currentMembers.length; i < count; i++) {
             final RolapMember currentMember = currentMembers[i];
             if (currentMember.isCalculated()) {
                 int solve = currentMember.getSolveOrder();
-                if (solve < minSolve) {
-                    minSolve = solve;
-                    minSolveMember = currentMember;
+                if (solve > maxSolve) {
+                    maxSolve = solve;
+                    maxSolveMember = currentMember;
                 }
             }
         }
-        return minSolveMember;
+        return maxSolveMember;
     }
 
     private void setExpanding(Member member)

testsrc/main/mondrian/test/BasicQueryTest.java

@@ -751,6 +751,45 @@ public void testSolveOrder() {
                 "Row #3: 60.07%" + nl);
     }
 
+    public void testSolveOrderNonMeasure() {
+        runQueryCheckResult(
+                "WITH" + nl +
+                "   MEMBER [Product].[ProdCalc] as '1', SOLVE_ORDER=1" + nl +
+                "   MEMBER [Measures].[MeasuresCalc] as '2', SOLVE_ORDER=2" + nl +
+                "   MEMBER [Time].[TimeCalc] as '3', SOLVE_ORDER=3" + nl +
+                "SELECT" + nl +
+                "   { [Product].[ProdCalc] } ON columns," + nl +
+                "   {( [Time].[TimeCalc], [Measures].[MeasuresCalc] )} ON rows" + nl +
+                "FROM Sales",
+
+                "Axis #0:" + nl +
+                "{}" + nl +
+                "Axis #1:" + nl +
+                "{[Product].[ProdCalc]}" + nl +
+                "Axis #2:" + nl +
+                "{[Time].[TimeCalc], [Measures].[MeasuresCalc]}" + nl +
+                "Row #0: 3" + nl);
+    }
+
+    public void testSolveOrderNonMeasure2() {
+        runQueryCheckResult(
+                "WITH" + nl +
+                "   MEMBER [Store].[StoreCalc] as '0', SOLVE_ORDER=0" + nl +
+                "   MEMBER [Product].[ProdCalc] as '1', SOLVE_ORDER=1" + nl +
+                "SELECT" + nl +
+                "   { [Product].[ProdCalc] } ON columns," + nl +
+                "   { [Store].[StoreCalc] } ON rows" + nl +
+                "FROM Sales",
+
+                "Axis #0:" + nl +
+                "{}" + nl +
+                "Axis #1:" + nl +
+                "{[Product].[ProdCalc]}" + nl +
+                "Axis #2:" + nl +
+                "{[Store].[StoreCalc]}" + nl +
+                "Row #0: 1" + nl);
+    }
+
     public void testCalculatedMemberWhichIsNotAMeasure() {
         String query = "WITH MEMBER [Product].[BigSeller] AS" + nl +
                 "  'IIf([Product].[Drink].[Alcoholic Beverages].[Beer and Wine] > 100, \"Yes\",\"No\")'" + nl +