MONDRIAN: NativizeSet, turning off all native evaluation when below t…

…he high cardinality threshold. Fixing ClassCastException when using the .levels() function.

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

src/main/mondrian/olap/Evaluator.java

@@ -290,6 +290,17 @@ public interface Evaluator {
      */
     boolean needToReturnNullForUnrelatedDimension(Member[] members);
 
+     /**
+     * @param enabled indicates if native evaluation should be used
+     */
+    void setNativeEnabled(Boolean enabled);
+
+    /**
+     * indicates whether native evaluation is enabled in this context
+     * @return boolean
+     */
+    boolean nativeEnabled();
+
     /**
      * Interface for evaluating a particular named set.
      */

src/main/mondrian/olap/fun/NativizeSetFunDef.java

@@ -177,6 +177,7 @@ public List<Member[]> computeTuples(Evaluator evaluator) {
                     new TransformFromFormulasVisitor(query, compiler));
                 query.resolve();
                 ListCalc calc = compiler.compileList(resolved);
+                evaluator.setNativeEnabled(false);
                 return calc.evaluateList(evaluator);
             }
 
@@ -331,9 +332,11 @@ public FindLevelsVisitor(
         @Override
         public Object visitResolvedFunCall(ResolvedFunCall call) {
             if (call.getFunDef() instanceof LevelMembersFunDef) {
-                Level level = ((LevelExpr) call.getArg(0)).getLevel();
-                substitutionMap.put(createMemberId(level), level);
-                dimensions.add(level.getDimension());
+                if (call.getArg(0) instanceof LevelExpr) {
+                    Level level = ((LevelExpr) call.getArg(0)).getLevel();
+                    substitutionMap.put(createMemberId(level), level);
+                    dimensions.add(level.getDimension());
+                }
             } else if (
                 functionWhitelist.contains(call.getFunDef().getClass()))
             {
@@ -1400,4 +1403,4 @@ private static String getLevelNameFromMemberName(String memberName) {
 
 }
 
-// End NativizeSetFunDef.java
+// End NativizeSetFunDef.java

src/main/mondrian/rolap/RolapEvaluator.java

@@ -75,6 +75,7 @@ public class RolapEvaluator implements Evaluator {
     protected List<List<Member[]>> aggregationLists;
 
     private final List<Member> slicerMembers;
+    private Boolean nativeEnabled;
 
     /**
      * States of the finite state machine for determining the max solve order
@@ -130,6 +131,8 @@ protected RolapEvaluator(
             }
             expandingMember = parent.expandingMember;
         }
+        nativeEnabled =
+            MondrianProperties.instance().EnableNativeNonEmpty.get();
     }
 
     /**
@@ -226,6 +229,14 @@ public boolean needToReturnNullForUnrelatedDimension(Member[] members) {
         return false;
     }
 
+    public boolean nativeEnabled() {
+        return nativeEnabled;
+    }
+
+    public void setNativeEnabled(final Boolean nativeEnabled) {
+        this.nativeEnabled = nativeEnabled;
+    }
+
     protected final Logger getLogger() {
         return LOGGER;
     }
@@ -609,6 +620,12 @@ public final Object getProperty(String name, Object defaultValue) {
                 continue;
             }
 
+            // Don’t call member.getPropertyValue unless this member’s
+            // solve order is greater than one we’ve already seen.
+            // The getSolveOrder call is cheap call compared to the
+            // getPropertyValue call, and when we’re evaluating millions
+            // of members, this has proven to make a significant performance
+            // difference.
             final int solve = member.getSolveOrder();
             if (solve > maxSolve) {
                 final Object p = member.getPropertyValue(name);

src/main/mondrian/rolap/SqlConstraintFactory.java

@@ -8,15 +8,15 @@
 */
 package mondrian.rolap;
 
-import java.util.List;
-
-import mondrian.olap.Id;
 import mondrian.olap.Evaluator;
+import mondrian.olap.Id;
 import mondrian.olap.Level;
 import mondrian.olap.MondrianProperties;
 import mondrian.rolap.sql.MemberChildrenConstraint;
 import mondrian.rolap.sql.TupleConstraint;
 
+import java.util.List;
+
 /**
  * Creates the right constraint for common tasks.
  *
@@ -36,6 +36,13 @@ public class SqlConstraintFactory {
     private SqlConstraintFactory() {
     }
 
+    private boolean enabled(final Evaluator context) {
+        if (context != null) {
+            return enabled && context.nativeEnabled();
+        }
+        return enabled;
+    }
+
     public static SqlConstraintFactory instance() {
         setNativeNonEmptyValue();
         return instance;
@@ -48,7 +55,9 @@ public static void setNativeNonEmptyValue() {
     public MemberChildrenConstraint getMemberChildrenConstraint(
         Evaluator context)
     {
-        if (!enabled || !SqlContextConstraint.isValidContext(context, false)) {
+        if (!enabled(context)
+            || !SqlContextConstraint.isValidContext(context, false))
+        {
             return DefaultMemberChildrenConstraint.instance();
         }
         return new SqlContextConstraint((RolapEvaluator) context, false);
@@ -74,7 +83,7 @@ public TupleConstraint getLevelMembersConstraint(
         if (context == null) {
             return DefaultTupleConstraint.instance();
         }
-        if (!enabled) {
+        if (!enabled(context)) {
             return DefaultTupleConstraint.instance();
         }
         if (!SqlContextConstraint.isValidContext(

testsrc/main/mondrian/olap/fun/NativizeSetFunDefTest.java

@@ -5,10 +5,13 @@
 import mondrian.olap.Result;
 import mondrian.olap.Util;
 import mondrian.rolap.NonEmptyTest;
+import mondrian.rolap.BatchTestCase;
 import mondrian.test.FoodMartTestCase;
 import mondrian.test.PropertySaver;
+import mondrian.test.SqlPattern;
+import mondrian.spi.Dialect;
 
-public class NativizeSetFunDefTest extends FoodMartTestCase {
+public class NativizeSetFunDefTest extends BatchTestCase {
     private final PropertySaver propSaver = new PropertySaver();
     private long highCardThreshold;
     private long nativeResultLimit;
@@ -1208,6 +1211,39 @@ public void testCrossjoinWithFilter() {
                 + "Row #0: 131,558\n");
     }
 
+    public void testEvaluationIsNonNativeWhenBelowHighcardThreshoold() {
+        NativizeSetFunDef.setHighCardinalityThreshold(10000L);
+        SqlPattern[] patterns = {
+            new SqlPattern(
+                Dialect.DatabaseProduct.ACCESS,
+                "select `customer`.`gender` as `c0` "
+                    + "from `customer` as `customer`, `sales_fact_1997` as `sales_fact_1997` "
+                    + "where `sales_fact_1997`.`customer_id` = `customer`.`customer_id` "
+                    + "and `customer`.`marital_status` = 'S' "
+                    + "group by `customer`.`gender` order by 1 ASC", 251)
+        };
+        String mdxQuery =
+            "select non empty NativizeSet("
+                + "Crossjoin([Gender].[Gender].members,{[Time].[1997]})) on 0 "
+                + "from [Warehouse and Sales] "
+                + "where [Marital Status].[Marital Status].[S]";
+        assertQuerySqlOrNot(
+            getTestContext(), mdxQuery, patterns, true, false, true);
+    }
+
+    public void testCalculatedLevelsDoNotCauseException() {
+        String mdx =
+            "SELECT \n"
+                + "  Nativizeset\n"
+                + "  (\n"
+                + "    {\n"
+                + "      [Store].Levels(0).MEMBERS\n"
+                + "    }\n"
+                + "  ) ON COLUMNS\n"
+                + "FROM [Sales]";
+        checkNotNative(mdx);
+    }
+
     private void checkNotNative(String mdx) {
         NonEmptyTest.checkNotNative(mdx, getResult(removeNativize(mdx)));
     }