MONDRIAN: verified that bug #1735827, Shared Tables and native NonEmp…

…tyCrossJoin, is fixed with the latest RolapCubeMember rearchitecture. Enabled SchemaTest.testDimensionsShareTableNativeNonEmptyCrossJoin() [git-p4: depot-paths = "//open/mondrian/": change = 10368]
pentaho · Dec 31, 2007 · 176515c · 176515c
1 parent b9190ab
commit 176515c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/src/main/mondrian/util/Bug.java b/src/main/mondrian/util/Bug.java
@@ -53,13 +53,6 @@ public class Bug {
      */
     public static final boolean Bug1722959Fixed = false;
 
-    /**
-     * Whether
-     * <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1735827&group_id=35302&atid=414613">bug 1735827, "Shared Tables and native NonEmptyCrossJoin"</a>
-     * is fixed.
-     */
-    public static final boolean Bug1735827Fixed = false;
-
     /**
      * Whether
      * <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1767775&group_id=35302&atid=414613">bug 1767775, "Predicate references RolapStar.Column when used in AggStar"</a>

diff --git a/testsrc/main/mondrian/test/SchemaTest.java b/testsrc/main/mondrian/test/SchemaTest.java
@@ -356,28 +356,26 @@ public void testDimensionsShareTable() {
      * note that this works when native cross join is disabled
      */
     public void testDimensionsShareTableNativeNonEmptyCrossJoin() {
-        if (Bug.Bug1735827Fixed) {
-            final TestContext testContext = TestContext.createSubstitutingCube(
-                "Sales",
-                "<Dimension name=\"Yearly Income2\" foreignKey=\"product_id\">\n" +
-                    "  <Hierarchy hasAll=\"true\" primaryKey=\"customer_id\">\n" +
-                    "    <Table name=\"customer\" alias=\"customerx\" />\n" +
-                    "    <Level name=\"Yearly Income\" column=\"yearly_income\" uniqueMembers=\"true\"/>\n" +
-                    "  </Hierarchy>\n" +
-                    "</Dimension>");
+        final TestContext testContext = TestContext.createSubstitutingCube(
+            "Sales",
+            "<Dimension name=\"Yearly Income2\" foreignKey=\"product_id\">\n" +
+                "  <Hierarchy hasAll=\"true\" primaryKey=\"customer_id\">\n" +
+                "    <Table name=\"customer\" alias=\"customerx\" />\n" +
+                "    <Level name=\"Yearly Income\" column=\"yearly_income\" uniqueMembers=\"true\"/>\n" +
+                "  </Hierarchy>\n" +
+                "</Dimension>");
 
-            testContext.assertQueryReturns(
-                    "select NonEmptyCrossJoin({[Yearly Income2].[All Yearly Income2s]},{[Customers].[All Customers]}) on rows," +
-                    "NON EMPTY {[Measures].[Unit Sales]} on columns" +
-                    " from [Sales]",
-                    fold("Axis #0:\n" +
-                         "{}\n" +
-                         "Axis #1:\n" +
-                         "{[Measures].[Unit Sales]}\n" +
-                         "Axis #2:\n" +
-                         "{[Yearly Income2].[All Yearly Income2s], [Customers].[All Customers]}\n" +
-                         "Row #0: 266,773\n"));
-        }
+        testContext.assertQueryReturns(
+                "select NonEmptyCrossJoin({[Yearly Income2].[All Yearly Income2s]},{[Customers].[All Customers]}) on rows," +
+                "NON EMPTY {[Measures].[Unit Sales]} on columns" +
+                " from [Sales]",
+                fold("Axis #0:\n" +
+                     "{}\n" +
+                     "Axis #1:\n" +
+                     "{[Measures].[Unit Sales]}\n" +
+                     "Axis #2:\n" +
+                     "{[Yearly Income2].[All Yearly Income2s], [Customers].[All Customers]}\n" +
+                     "Row #0: 266,773\n"));
     }
 
     /**