MONDRIAN: Fix bug 804903: ArrayIndexOutOfBoundsException when using '…

…count distinct' measure and no others. [git-p4: depot-paths = "//open/mondrian/": change = 769]
pentaho · Sep 12, 2003 · 6c7f6cb · 6c7f6cb
1 parent 2bab626
commit 6c7f6cb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/main/mondrian/rolap/agg/AggregationManager.java b/src/main/mondrian/rolap/agg/AggregationManager.java
@@ -118,9 +118,12 @@ public void loadAggregations(ArrayList batches, Collection pinnedSegments) {
                         distinctMeasuresList.toArray(new RolapStar.Measure[0]);
                 loadAggregation(measures, columns, constraintses, pinnedSegments);
             }
-			RolapStar.Measure[] measures = (RolapStar.Measure[])
-					measuresList.toArray(new RolapStar.Measure[0]);
-			loadAggregation(measures, columns, constraintses, pinnedSegments);
+            final int measureCount = measuresList.size();
+            if (measureCount > 0) {
+                RolapStar.Measure[] measures = (RolapStar.Measure[])
+                        measuresList.toArray(new RolapStar.Measure[measureCount]);
+                loadAggregation(measures, columns, constraintses, pinnedSegments);
+            }
 		}
 	}
 

diff --git a/src/main/mondrian/test/BasicQueryTest.java b/src/main/mondrian/test/BasicQueryTest.java
@@ -1861,6 +1861,25 @@ public void testBug761952() {
                 "{[Gender].[All Gender].[M]}" + nl +
                 "Row #0: 131,558" + nl +
                 "Row #1: 135,215" + nl);
+    }
+    /**
+     * Query with distinct-count measure and no other measures gives
+     * {@link ArrayIndexOutOfBoundsException}
+     */
+    public void testBug804903() {
+        CachePool.instance().flush();
+        runQueryCheckResult(
+                "select {[Measures].[Customer Count]} ON columns," + nl +
+                "  {([Promotion Media].[All Media], [Product].[All Products])} ON rows" + nl +
+                "from [Sales]" + nl +
+                "where [Time].[1997]",
+                "Axis #0:" + nl +
+                "{[Time].[1997]}" + nl +
+                "Axis #1:" + nl +
+                "{[Measures].[Customer Count]}" + nl +
+                "Axis #2:" + nl +
+                "{[Promotion Media].[All Media], [Product].[All Products]}" + nl +
+                "Row #0: 5,581" + nl);
     }
 	/** Make sure that the "Store" cube is working. **/
 	public void testStoreCube() {