MONDRIAN: [MONDRIAN-992]

Fixes a problem with SQL query generation. When both aggregate tables and grouping sets were used, the column types were not infered correctly, causing an assertion error deep in the code. [git-p4: depot-paths = "//open/mondrian/": change = 14618]
pentaho · Sep 23, 2011 · f0e5598 · f0e5598
1 parent dd031bc
commit f0e5598
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/main/mondrian/rolap/agg/AggQuerySpec.java b/src/main/mondrian/rolap/agg/AggQuerySpec.java
@@ -14,8 +14,10 @@
 
 import mondrian.rolap.RolapStar;
 import mondrian.rolap.StarColumnPredicate;
+import mondrian.rolap.SqlStatement.Type;
 import mondrian.rolap.aggmatcher.AggStar;
 import mondrian.rolap.sql.SqlQuery;
+import mondrian.util.Pair;
 
 import org.apache.log4j.Logger;
 
@@ -107,10 +109,10 @@ public StarColumnPredicate getPredicate(int i) {
         return segment0.axes[i].getPredicate();
     }
 
-    public String generateSqlQuery() {
+    public Pair<String, List<Type>> generateSqlQuery() {
         SqlQuery sqlQuery = newSqlQuery();
         generateSql(sqlQuery);
-        return sqlQuery.toString();
+        return sqlQuery.toSqlAndTypes();
     }
 
     private void addGroupingSets(SqlQuery sqlQuery) {

diff --git a/src/main/mondrian/rolap/agg/AggregationManager.java b/src/main/mondrian/rolap/agg/AggregationManager.java
@@ -15,6 +15,7 @@
 
 import mondrian.olap.*;
 import mondrian.rolap.*;
+import mondrian.rolap.SqlStatement.Type;
 import mondrian.rolap.aggmatcher.AggStar;
 
 import mondrian.util.Pair;
@@ -158,14 +159,6 @@ public Pair<String, List<SqlStatement.Type>> generateSql(
         BitKey levelBitKey = groupingSetsList.getDefaultLevelBitKey();
         BitKey measureBitKey = groupingSetsList.getDefaultMeasureBitKey();
 
-        List<SqlStatement.Type> types = new ArrayList<SqlStatement.Type>();
-        for (int levelId : levelBitKey) {
-            types.add(star.getColumn(levelId).getInternalType());
-        }
-        for (int measureId : measureBitKey) {
-            types.add(star.getColumn(measureId).getInternalType());
-        }
-
         // Check if using aggregates is enabled.
         boolean hasCompoundPredicates = false;
         if (compoundPredicateList != null && compoundPredicateList.size() > 0) {
@@ -211,15 +204,15 @@ public Pair<String, List<SqlStatement.Type>> generateSql(
                 AggQuerySpec aggQuerySpec =
                     new AggQuerySpec(
                         aggStar, rollup[0], groupingSetsList);
-                String sql = aggQuerySpec.generateSqlQuery();
+                Pair<String, List<Type>> sql = aggQuerySpec.generateSqlQuery();
 
                 if (getLogger().isDebugEnabled()) {
                     getLogger().debug(
                         "generateSqlQuery: sql="
-                        + sql);
+                        + sql.left);
                 }
 
-                return Pair.of(sql, types);
+                return sql;
             }
 
             // No match, fall through and use fact table.