MONDRIAN: Fix a couple of issues similar to bug 2150537.

[git-p4: depot-paths = "//open/mondrian/": change = 11680]
pentaho · Oct 7, 2008 · 0635649 · 0635649
1 parent 0bd34d7
commit 0635649
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/mondrian/olap/fun/OrderFunDef.java b/src/main/mondrian/olap/fun/OrderFunDef.java
@@ -50,8 +50,7 @@ public Calc compileCall(ResolvedFunCall call, ExpCompiler compiler) {
             final MemberCalc[] calcs = (MemberCalc[]) memberValueCalc.getCalcs();
             for (MemberCalc memberCalc : calcs) {
                 if (memberCalc instanceof ConstantCalc &&
-                    !listCalc.dependsOn(
-                        memberCalc.getType().getHierarchy().getDimension())) {
+                    !listCalc.dependsOn(memberCalc.getType().getDimension())) {
                     constantList.add(memberCalc);
                 } else {
                     variableList.add(memberCalc);

diff --git a/src/main/mondrian/olap/fun/ParallelPeriodFunDef.java b/src/main/mondrian/olap/fun/ParallelPeriodFunDef.java
@@ -64,8 +64,7 @@ public Calc compileCall(ResolvedFunCall call, ExpCompiler compiler) {
             memberCalc = compiler.compileMember(args[2]);
             break;
         case 1:
-            final Dimension dimension =
-                    args[0].getType().getHierarchy().getDimension();
+            final Dimension dimension = args[0].getType().getDimension();
             memberCalc = new DimensionCurrentMemberCalc(dimension);
             break;
         default:
@@ -76,8 +75,7 @@ public Calc compileCall(ResolvedFunCall call, ExpCompiler compiler) {
                 throw MondrianResource.instance().
                             NoTimeDimensionInCube.ex(getName());
             }
-            memberCalc = new DimensionCurrentMemberCalc(
-                    timeDimension);
+            memberCalc = new DimensionCurrentMemberCalc(timeDimension);
             break;
         }
 

diff --git a/testsrc/main/mondrian/olap/fun/FunctionTest.java b/testsrc/main/mondrian/olap/fun/FunctionTest.java
@@ -4523,6 +4523,9 @@ public void testLastPeriods() {
     }
 
     public void testParallelPeriod() {
+        getTestContext().assertSetExprDependsOn(
+            "parallelperiod([Time].CurrentMember)", "Xxx");
+
         assertAxisReturns("parallelperiod([Time].[Quarter], 1, [Time].[1998].[Q1])",
                 "[Time].[1997].[Q4]");