MONDRIAN: Head function working for high cardinality dimensions

[git-p4: depot-paths = "//open/mondrian/": change = 11199]
pentaho · Jun 19, 2008 · de162be · de162be
1 parent c57e114
commit de162be
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/mondrian/olap/fun/HeadTailFunDef.java b/src/main/mondrian/olap/fun/HeadTailFunDef.java
@@ -107,9 +107,6 @@ public Iterator<Object> iterator() {
 
     static List head(final int count, final List members) {
         assert members != null;
-        if (count >= members.size()) {
-            return members;
-        }
         if (count <= 0) {
             return Collections.EMPTY_LIST;
         }

diff --git a/testsrc/main/mondrian/rolap/HighDimensionsTest.java b/testsrc/main/mondrian/rolap/HighDimensionsTest.java
@@ -72,6 +72,22 @@ public void testPromotionsTwoDimensions() throws Exception {
                     + "from [Sales Ragged]", 1, "Promotions");
     }
 
+/*
+    public void testNonEmpty() throws Exception {
+        execHighCardTest("select {[Measures].[Unit Sales]} on columns,\n"
+                    + "non empty {[Promotions].[Promotion Name].Members} "
+                    + "on rows from [Sales Ragged]", 1, "Promotions");
+    }
+*/
+
+    public void testHead() throws Exception {
+        execHighCardTest("select {[Measures].[Unit Sales]} on columns,\n"
+                    + "head({[Promotions].[Promotion Name].Members},51) "
+                    + "on rows from [Sales Ragged]", 1, "Promotions");
+    }
+
+
+
 
     //
     // Private Stuff --------------------------------------------