MONDRIAN: The second half of the fix for MONDRIAN-506. This allows qu…

…eries with Descendants using an integer value for the second argument to be natively evaluated. The first part of this defect was fixed in 12424, which allowed redundant set braces to be used with native eval.

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

src/main/mondrian/rolap/RolapNativeSet.java

@@ -627,10 +627,22 @@ protected CrossJoinArg checkDescendants(
         if (member.isCalculated()) {
             return null;
         }
-        if (!(args[1] instanceof LevelExpr)) {
+        RolapLevel level = null;
+        if ((args[1] instanceof LevelExpr)) {
+            level = (RolapLevel) ((LevelExpr) args[1]).getLevel();
+        } else if (args[1] instanceof Literal) {
+            RolapLevel[] levels = (RolapLevel[])
+                    member.getHierarchy().getLevels();
+            int currentDepth = member.getDepth();
+            Literal descendantsDepth = (Literal)args[1];
+            int newDepth = currentDepth + descendantsDepth.getIntValue();
+            if (newDepth < levels.length) {
+                level = levels[newDepth];
+            }
+        } else {
             return null;
         }
-        RolapLevel level = (RolapLevel) ((LevelExpr) args[1]).getLevel();
+
         if (!isSimpleLevel(level)) {
             return null;
         }

testsrc/main/mondrian/rolap/NonEmptyTest.java

@@ -1592,6 +1592,20 @@ public void testCjMembersDescendants() {
                         + "  [Time].[1997].[Q1].[1])");
     }
 
+    // testcase for bug MONDRIAN-506
+    public void testCjMembersDescendantsWithNumericArgument() {
+        checkNative(
+                67,
+                67,
+                "select {[Measures].[Store Sales]} on columns,"
+                        + " NON EMPTY Crossjoin("
+                        + "  {[Product].[Product Name].Members},"
+                        + "  {Descendants([Customers].[All Customers].[USA].[CA], 2)}) ON rows "
+                        + " from [Sales] where ("
+                        + "  [Store].[All Stores].[USA].[CA].[San Francisco].[Store 14],"
+                        + "  [Time].[1997].[Q1].[1])");
+    }
+
     public void testCjChildrenMembers() {
         checkNative(
                 67, 67, "select {[Measures].[Store Sales]} on columns,"