MONDRIAN: Fix bug MONDRIAN-1047, "IllegalArgumentException when cube …

…has closure

    tables and many levels".

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

src/main/mondrian/rolap/RolapCube.java

@@ -150,10 +150,6 @@ private RolapCube(
             if (! isCache) {
                 star.setCacheAggregations(isCache);
             }
-            closureColumnBitKey =
-                BitKey.Factory.makeBitKey(star.getColumnCount());
-        } else {
-            closureColumnBitKey = null;
         }
 
         if (getLogger().isDebugEnabled()) {
@@ -210,6 +206,15 @@ private RolapCube(
             registerDimension(dimension);
         }
 
+        // Initialize closure bit key only when we know how many columns are in
+        // the star.
+        if (! isVirtual()) {
+            closureColumnBitKey =
+                BitKey.Factory.makeBitKey(star.getColumnCount());
+        } else {
+            closureColumnBitKey = null;
+        }
+
         schema.addCube(this);
     }
 

testsrc/main/mondrian/test/PerformanceTest.java

@@ -345,7 +345,14 @@ public void testBigResultsWithBigSchemaPerforms() {
         TestContext testContext =
             TestContext.instance().createSubstitutingCube(
                 "Sales",
-                extraGenders(1000),
+                TestContext.repeatString(
+                    1000,
+                    "<Dimension name=\"Gender%d \" foreignKey=\"customer_id\">"
+                    + "  <Hierarchy hasAll=\"true\" allMemberName=\"All Gender\" primaryKey=\"customer_id\">"
+                    + "    <Table name=\"customer\"/>"
+                    + "    <Level name=\"Gender\" column=\"gender\" uniqueMembers=\"true\"/>"
+                    + "  </Hierarchy>"
+                    + "</Dimension>"),
                 null);
         String mdx =
             "with "
@@ -371,21 +378,6 @@ public void testBigResultsWithBigSchemaPerforms() {
         printDuration("testBigResultsWithBigSchemaPerforms", start);
     }
 
-    private String extraGenders(final int numGenders) {
-        final StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < numGenders;i++) {
-            builder.append(
-                String.format(
-                    "<Dimension name=\"Gender%d \" foreignKey=\"customer_id\">"
-                    + "<Hierarchy hasAll=\"true\" allMemberName=\"All Gender\" primaryKey=\"customer_id\">"
-                    + "      <Table name=\"customer\"/>"
-                    + "      <Level name=\"Gender\" column=\"gender\" uniqueMembers=\"true\"/>"
-                    + "    </Hierarchy>"
-                    + "</Dimension>", i));
-        }
-        return builder.toString();
-    }
-
     /**
      * Runs a query that performs a lot of in-memory calculation.
      *

testsrc/main/mondrian/test/SchemaTest.java

@@ -4283,5 +4283,41 @@ public void testCollapsedError() throws Exception {
             "select {[Product].[Product Family].Members} on rows, {[Measures].[Unit Sales]} on columns from [Foo]",
             "Too many errors, '1', while loading/reloading aggregates.");
     }
+
+    /**
+     * Test case for bug
+     * <a href="http://jira.pentaho.com/browse/MONDRIAN-1047">MONDRIAN-1047,
+     * "IllegalArgumentException when cube has closure tables and many
+     * levels"</a>.
+     */
+    public void testBugMondrian1047() {
+        // Test case only works under MySQL, due to how columns are quoted.
+        switch (TestContext.instance().getDialect().getDatabaseProduct()) {
+        case MYSQL:
+            break;
+        default:
+            return;
+        }
+        TestContext testContext =
+            TestContext.instance().createSubstitutingCube(
+                "HR",
+                TestContext.repeatString(
+                    100,
+                    "<Dimension name='Position %1$d' foreignKey='employee_id'>\n"
+                    + "  <Hierarchy hasAll='true' allMemberName='All Position' primaryKey='employee_id'>\n"
+                    + "    <Table name='employee'/>\n"
+                    + "    <Level name='Position Title' uniqueMembers='false' ordinalColumn='position_id'>\n"
+                    + "      <KeyExpression><SQL dialect='generic'>`position_title` + %1$d</SQL></KeyExpression>\n"
+                    + "    </Level>\n"
+                    + "  </Hierarchy>\n"
+                    + "</Dimension>"),
+                null);
+        testContext.assertQueryReturns(
+            "select from [HR]",
+            "Axis #0:\n"
+            + "{}\n"
+            + "$39,431.67");
+    }
 }
+
 // End SchemaTest.java

testsrc/main/mondrian/test/TestContext.java

@@ -1979,6 +1979,25 @@ public static String levelName(
         return hierarchyName(dimension, hierarchy) + ".[" + level + "]";
     }
 
+    /**
+     * Returns count copies of a string. Format strings within string are
+     * substituted, per {@link String#format}.
+     *
+     * @param count Number of copies
+     * @param format String template
+     * @return Multiple copies of a string
+     */
+    public static String repeatString(
+        final int count,
+        String format)
+    {
+        final Formatter formatter = new Formatter();
+        for (int i = 0; i < count; i++) {
+            formatter.format(format, i);
+        }
+        return formatter.toString();
+    }
+
     //~ Inner classes ----------------------------------------------------------
 
     public static class SnoopingSchemaProcessor