MONDRIAN: <harun/ashwin/ajit>fixed grouping sets for distinct count r…

…elated unit tests and added more and fix for bug 1883611 [git-p4: depot-paths = "//open/mondrian/": change = 10510]
pentaho · Feb 4, 2008 · 40b333e · 40b333e
1 parent a5d6b97
commit 40b333e
Show file tree

Hide file tree

Showing 7 changed files with 840 additions and 329 deletions.
diff --git a/src/main/mondrian/olap/type/MemberType.java b/src/main/mondrian/olap/type/MemberType.java
@@ -167,7 +167,7 @@ public Type computeCommonType(Type type, int[] conversionCount) {
                 return new TupleType(new Type[] {type}).computeCommonType(tupleType,
                     conversionCount);
             } else {
-                return null;
+                return computeCommonType(tupleType.getValueType(), conversionCount);
             }
         }
         if (!(type instanceof MemberType)) {

diff --git a/src/main/mondrian/olap/type/SetType.java b/src/main/mondrian/olap/type/SetType.java
@@ -32,7 +32,8 @@ public class SetType implements Type {
     public SetType(Type elementType) {
         if (elementType != null) {
             assert elementType instanceof MemberType ||
-                    elementType instanceof TupleType;
+                    elementType instanceof TupleType ||
+                    elementType instanceof ScalarType;
         }
         this.elementType = elementType;
         this.digest = "SetType<" + elementType + ">";
@@ -65,7 +66,7 @@ public Type getElementType() {
     }
 
     public boolean usesDimension(Dimension dimension, boolean definitely) {
-        if (elementType == null) {
+        if (elementType == null || elementType instanceof ScalarType) {
             return definitely;
         }
         return elementType.usesDimension(dimension, definitely);

diff --git a/src/main/mondrian/olap/type/TupleType.java b/src/main/mondrian/olap/type/TupleType.java
@@ -101,6 +101,9 @@ public Type computeCommonType(Type type, int[] conversionCount) {
         if (type instanceof ScalarType) {
             return getValueType().computeCommonType(type, conversionCount);
         }
+        if (type instanceof MemberType) {
+            return getValueType().computeCommonType(type, conversionCount);
+        }
         if (!(type instanceof TupleType)) {
             return null;
         }