Fix sort on aggregation

eclipse-birt · Jul 22, 2014 · d3ddb59 · d3ddb59
1 parent fb358c7
commit d3ddb59
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/...eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/query/view/QueryExecutorUtil.java b/...eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/query/view/QueryExecutorUtil.java
@@ -171,8 +171,15 @@ public static void populateAggregationSort( CubeQueryExecutor executor,
 							measureName = OlapExpressionUtil.getMeasure( referBinding.getExpression( ) );
 							bindingName = referBinding.getBindingName( );
 							aggrOns = referBinding.getAggregatOns( );
+
+							if ( referBinding.getAggrFunction( ) == null
+									&& ( aggrOns == null || aggrOns.size( )==0 ) )
+							{
+								aggrOns =  CubeQueryDefinitionUtil.populateMeasureAggrOns( queryDefn );
+							}
 						}
 					}
+
 					if ( aggrOns != null && aggrOns.size( ) > 0 )
 					{
 						aggrOnLevels = new DimLevel[aggrOns.size( )];
@@ -182,15 +189,6 @@ public static void populateAggregationSort( CubeQueryExecutor executor,
 									.toString( ) );
 						}
 					}
-					else if ( measureName != null )
-					{
-						List measureAggrOns = CubeQueryDefinitionUtil.populateMeasureAggrOns( queryDefn );
-						aggrOnLevels = new DimLevel[measureAggrOns.size( )];
-						for ( int k = 0; k < measureAggrOns.size( ); k++ )
-						{
-							aggrOnLevels[k] = (DimLevel) measureAggrOns.get( k );
-						}
-					}
 				}
 				else
 				{