MONDRIAN: Return calculated measures among Level.getMembers() and Hie…

…rarchy.getRootMembers() calls. Fix olap4j driver to ensure that members of Measures dimension always implement org.olap4j.metadata.Measure interface. [git-p4: depot-paths = "//open/mondrian/": change = 10906]
pentaho · Apr 17, 2008 · 1fb6eff · 1fb6eff
1 parent 2059494
commit 1fb6eff
Show file tree

Hide file tree

Showing 25 changed files with 281 additions and 166 deletions.
diff --git a/demo/FoodMart.xml b/demo/FoodMart.xml
@@ -315,6 +315,7 @@ Iif("sales_fact_1997"."promotion_id" = 0, 0, "sales_fact_1997"."store_sales")
       formula="COALESCEEMPTY((Measures.[Profit], [Time].PREVMEMBER),    Measures.[Profit])"
       visible="false">
     <CalculatedMemberProperty name="FORMAT_STRING" value="$#,##0.00"/>
+    <CalculatedMemberProperty name="MEMBER_ORDINAL" value="18"/>
   </CalculatedMember>
   <CalculatedMember
       name="Profit Growth"

diff --git a/src/main/mondrian/olap/MemberBase.java b/src/main/mondrian/olap/MemberBase.java
@@ -85,7 +85,7 @@ protected MemberBase(
         this.flags = memberType.ordinal()
             | (memberType == MemberType.ALL ? FLAG_ALL : 0)
             | (memberType == MemberType.NULL ? FLAG_NULL : 0)
-            | (computeCalculated() ? FLAG_CALCULATED : 0)
+            | (computeCalculated(memberType) ? FLAG_CALCULATED : 0)
             | (level.getHierarchy().getDimension().isMeasures() ? FLAG_MEASURE : 0);
     }
 
@@ -229,13 +229,14 @@ public boolean isChildOrEqualTo(String uniqueName) {
      * Computes the value to be returned by {@link #isCalculated()}, so it can
      * be cached in a variable.
      *
+     * @param memberType Member type
      * @return Whether this member is calculated
      */
-    protected boolean computeCalculated() {
+    protected boolean computeCalculated(final MemberType memberType) {
         // If the member is not created from the "with member ..." MDX, the
         // calculated will be null. But it may be still a calculated measure
         // stored in the cube.
-        return isCalculatedInQuery() || getMemberType() == MemberType.FORMULA;
+        return isCalculatedInQuery() || memberType == MemberType.FORMULA;
     }
 
     public int getSolveOrder() {

diff --git a/src/main/mondrian/olap/fun/VisualTotalsFunDef.java b/src/main/mondrian/olap/fun/VisualTotalsFunDef.java
@@ -207,7 +207,7 @@ private static class VisualTotalMember extends RolapMember {
             this.exp = exp;
         }
 
-        protected boolean computeCalculated() {
+        protected boolean computeCalculated(final MemberType memberType) {
             return true;
         }
 

diff --git a/src/main/mondrian/olap4j/MondrianOlap4jCellSetAxis.java b/src/main/mondrian/olap4j/MondrianOlap4jCellSetAxis.java
@@ -134,13 +134,11 @@ public MondrianOlap4jPosition(
 
         public List<Member> getMembers() {
             return new AbstractList<Member>() {
-
                 public Member get(int index) {
                     final mondrian.olap.Member mondrianMember =
                         mondrianPosition.get(index);
-                    return new MondrianOlap4jMember(
-                        olap4jCellSet.olap4jStatement.olap4jConnection.olap4jSchema,
-                        mondrianMember);
+                    return olap4jCellSet.olap4jStatement.olap4jConnection
+                        .toOlap4j(mondrianMember);
                 }
 
                 public int size() {

diff --git a/src/main/mondrian/olap4j/MondrianOlap4jConnection.java b/src/main/mondrian/olap4j/MondrianOlap4jConnection.java
@@ -11,7 +11,7 @@
 
 import mondrian.mdx.*;
 import mondrian.olap.*;
-import mondrian.rolap.RolapStoredMeasure;
+import mondrian.rolap.RolapMeasure;
 import org.olap4j.Axis;
 import org.olap4j.Cell;
 import org.olap4j.*;
@@ -416,8 +416,8 @@ MondrianOlap4jMember toOlap4j(mondrian.olap.Member member) {
         if (member == null) {
             return null;
         }
-        if (member instanceof RolapStoredMeasure) {
-            RolapStoredMeasure measure = (RolapStoredMeasure) member;
+        if (member instanceof RolapMeasure) {
+            RolapMeasure measure = (RolapMeasure) member;
             return new MondrianOlap4jMeasure(
                 toOlap4j(member.getDimension().getSchema()),
                 measure);
@@ -427,8 +427,6 @@ MondrianOlap4jMember toOlap4j(mondrian.olap.Member member) {
             member);
     }
 
-
-
     MondrianOlap4jLevel toOlap4j(mondrian.olap.Level level) {
         if (level == null) {
             return null;

diff --git a/src/main/mondrian/olap4j/MondrianOlap4jHierarchy.java b/src/main/mondrian/olap4j/MondrianOlap4jHierarchy.java
@@ -12,7 +12,7 @@
 import org.olap4j.metadata.*;
 import org.olap4j.impl.*;
 
-import java.util.Locale;
+import java.util.*;
 
 /**
  * Implementation of {@link org.olap4j.metadata.Hierarchy}
@@ -74,18 +74,21 @@ public NamedList<Member> getRootMembers() {
             olap4jSchema.olap4jCatalog.olap4jDatabaseMetaData.olap4jConnection;
         final mondrian.olap.Member[] levelMembers =
             olap4jConnection.connection.getSchemaReader().getLevelMembers(
-                hierarchy.getLevels()[0], false);
+                hierarchy.getLevels()[0], true);
+
+        final List<mondrian.olap.Member> levelMemberList =
+            new ArrayList<mondrian.olap.Member>(Arrays.asList(levelMembers));
         return new AbstractNamedList<Member>() {
             protected String getName(Member member) {
                 return member.getName();
             }
 
             public Member get(int index) {
-                return olap4jConnection.toOlap4j(levelMembers[index]);
+                return olap4jConnection.toOlap4j(levelMemberList.get(index));
             }
 
             public int size() {
-                return levelMembers.length;
+                return levelMemberList.size();
             }
         };
     }

diff --git a/src/main/mondrian/olap4j/MondrianOlap4jMeasure.java b/src/main/mondrian/olap4j/MondrianOlap4jMeasure.java
@@ -9,8 +9,7 @@
 package mondrian.olap4j;
 
 import mondrian.olap.Property;
-import mondrian.rolap.RolapAggregator;
-import mondrian.rolap.RolapStoredMeasure;
+import mondrian.rolap.*;
 import org.olap4j.metadata.Datatype;
 import org.olap4j.metadata.Measure;
 
@@ -30,12 +29,19 @@ public class MondrianOlap4jMeasure
 {
     MondrianOlap4jMeasure(
         MondrianOlap4jSchema olap4jSchema,
-        RolapStoredMeasure measure)
+        RolapMeasure measure)
     {
         super(olap4jSchema, measure);
     }
 
+    public String toString() {
+        return getUniqueName();
+    }
+
     public Aggregator getAggregator() {
+        if (!(member instanceof RolapStoredMeasure)) {
+            return Aggregator.UNKNOWN;
+        }
         final RolapAggregator aggregator =
             ((RolapStoredMeasure) member).getAggregator();
         if (aggregator == RolapAggregator.Avg) {

diff --git a/src/main/mondrian/olap4j/MondrianOlap4jMember.java b/src/main/mondrian/olap4j/MondrianOlap4jMember.java
@@ -18,6 +18,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import mondrian.rolap.RolapMeasure;
+
 /**
  * Implementation of {@link Member}
  * for the Mondrian OLAP engine,
@@ -37,6 +39,8 @@ class MondrianOlap4jMember implements Member, Named {
         mondrian.olap.Member mondrianMember)
     {
         assert mondrianMember != null;
+        assert mondrianMember instanceof RolapMeasure
+            == this instanceof MondrianOlap4jMeasure;
         this.olap4jSchema = olap4jSchema;
         this.member = mondrianMember;
     }
@@ -108,7 +112,7 @@ public boolean isChildOrEqualTo(Member member) {
     }
 
     public boolean isCalculated() {
-        throw new UnsupportedOperationException();
+        return getMemberType() == Type.FORMULA;
     }
 
     public int getSolveOrder() {

diff --git a/src/main/mondrian/rolap/MeasureMemberSource.java b/src/main/mondrian/rolap/MeasureMemberSource.java
@@ -13,6 +13,8 @@
 
 package mondrian.rolap;
 
+import java.util.List;
+
 /**
  * A <code>MeasureMemberSource</code> implements the {@link MemberReader}
  * interface for the special Measures dimension.
@@ -26,8 +28,13 @@
  * @version $Id$
  */
 class MeasureMemberSource extends ArrayMemberSource {
-    MeasureMemberSource(RolapHierarchy hierarchy, RolapMember[] members) {
-        super(hierarchy, members);
+    MeasureMemberSource(
+        RolapHierarchy hierarchy,
+        List<RolapMember> memberList)
+    {
+        super(
+            hierarchy,
+            memberList.toArray(new RolapMember[memberList.size()]));
     }
 }
 

diff --git a/src/main/mondrian/rolap/RolapBaseCubeMeasure.java b/src/main/mondrian/rolap/RolapBaseCubeMeasure.java
@@ -61,7 +61,7 @@ class RolapBaseCubeMeasure extends RolapMember implements RolapStoredMeasure {
             MondrianDef.Expression expression,
             String aggregatorName,
             String datatype) {
-        super(parentMember, level, name);
+        super(parentMember, level, name, null, MemberType.MEASURE);
         this.cube = cube;
         this.expression = expression;
         if (formatString == null) {

diff --git a/src/main/mondrian/rolap/RolapCalculatedMember.java b/src/main/mondrian/rolap/RolapCalculatedMember.java
@@ -30,9 +30,12 @@ public class RolapCalculatedMember extends RolapMember {
     private final Formula formula;
 
     RolapCalculatedMember(
-            RolapMember parentMember, RolapLevel level, String name,
-            Formula formula) {
-        super(parentMember, level, name);
+        RolapMember parentMember, RolapLevel level, String name,
+        Formula formula)
+    {
+        // A calculated measure has MemberType.FORMULA because FORMULA
+        // overrides MEASURE.
+        super(parentMember, level, name, null, MemberType.FORMULA);
         this.formula = formula;
     }
 
@@ -54,7 +57,7 @@ public Object getPropertyValue(String propertyName, boolean matchCase) {
         }
     }
 
-    protected boolean computeCalculated() {
+    protected boolean computeCalculated(final MemberType memberType) {
         return true;
     }