Skip to content

Commit

Permalink
Refactor crosstab core code to create correct query if level contains
Browse files Browse the repository at this point in the history 
member value.
  • Loading branch information
ycheng committed Apr 12, 2013
1 parent 50132d5 commit 3c644a2
Showing 1 changed file with 63 additions and 32 deletions.
95 changes: 63 additions & 32 deletions ...em.crosstab.core/src/org/eclipse/birt/report/item/crosstab/core/re/CrosstabQueryUtil.java
View file
Expand Up @@ -151,7 +151,7 @@ public static ICubeQueryDefinition createCubeQuery(
List<String> columnLevelNameList = new ArrayList<String>( );

List<LevelViewHandle> levelViewList = new ArrayList<LevelViewHandle>( );
Map<LevelHandle, ILevelDefinition> levelMapping = new HashMap<LevelHandle, ILevelDefinition>( );
Map<String, ILevelDefinition> levelMapping = new HashMap<String, ILevelDefinition>( );

if ( needMeasure )
{
Expand Down Expand Up @@ -349,7 +349,7 @@ private static ILevelDefinition createLinkedDataModelLevelDefinition( IHierarchy
private static void addEdgeDefinition( ICubeQueryDefinition cubeQuery,
CrosstabReportItemHandle crosstabItem, int axis,
List<String> levelNameList, List<LevelViewHandle> levelViewList,
Map<LevelHandle, ILevelDefinition> levelMapping,
Map<String, ILevelDefinition> levelMapping,
IModelAdapter modelAdapter, boolean isBoundToLinkedDataSet ) throws BirtException
{
// TODO check visibility?
Expand Down Expand Up @@ -423,7 +423,7 @@ private static void addEdgeDefinition( ICubeQueryDefinition cubeQuery,
}

levelViewList.add( lv );
levelMapping.put( lv.getCubeLevel( ), levelDef );
levelMapping.put( lv.getCubeLevel( ).getFullName( ), levelDef );
}
}

Expand All @@ -439,24 +439,35 @@ private static void addEdgeDefinition( ICubeQueryDefinition cubeQuery,
for ( int i = 0; i < members.size( ); i++ )
{
MemberValueHandle mvh = (MemberValueHandle) members.get( i );

if ( mvh != null && mvh.getLevel( ) != null )
if( mvh == null )
{
continue;
}

LevelHandle lv = mvh.getLevel( );
if( lv == null )
{
lv = crosstabItem.findLevelHandle( mvh.getCubeLevelName( ) );
}

if ( lv != null )
{
addDrillDefinition( edge, mvh, levelMapping );
addDrillDefinition( crosstabItem, edge, mvh, levelMapping );
}
}

addEdgeMemberFilter( cubeQuery,
crosstabItem,
modelAdapter,
members,
levelMapping );
}
}
}

private static void addEdgeMemberFilter( ICubeQueryDefinition cubeQuery,
private static void addEdgeMemberFilter( ICubeQueryDefinition cubeQuery, CrosstabReportItemHandle crosstabItem,
IModelAdapter modelAdapter, List<MemberValueHandle> members,
Map<LevelHandle, ILevelDefinition> levelMapping )
Map<String, ILevelDefinition> levelMapping )
throws BirtException
{
List<List<IScriptExpression>> allTargetLevels = new ArrayList<List<IScriptExpression>>( );
Expand All @@ -472,13 +483,25 @@ private static void addEdgeMemberFilter( ICubeQueryDefinition cubeQuery,

for ( MemberValueHandle mvh : members )
{
if ( mvh != null && mvh.getLevel( ) == null )
if( mvh == null )
{
continue;
}

LevelHandle lv = mvh.getLevel( );
if( lv == null )
{
lv = crosstabItem.findLevelHandle( mvh.getCubeLevelName( ) );
}

if ( lv == null )
{
List<IScriptExpression> targetLevels = new ArrayList<IScriptExpression>( );
List<List<IScriptExpression>> memberValues = new ArrayList<List<IScriptExpression>>( );
List<List<Boolean>> memberFlags = new ArrayList<List<Boolean>>( );

traverseMemberFilter( targetLevels,
traverseMemberFilter( crosstabItem,
targetLevels,
op,
updateAggFlag,
memberValues,
Expand Down Expand Up @@ -606,17 +629,21 @@ private static void addEdgeMemberFilter( ICubeQueryDefinition cubeQuery,
/**
* !!!Note depth and pos is 1-based for this method.
*/
private static void traverseMemberFilter(
private static void traverseMemberFilter(CrosstabReportItemHandle crosstabItem,
List<IScriptExpression> targetLevels, int[] op,
Boolean[] updateAggFlag,
List<List<IScriptExpression>> memberValues,
List<List<Boolean>> memberFlags, MemberValueHandle member,
Map<LevelHandle, ILevelDefinition> levelMapping,
Map<String, ILevelDefinition> levelMapping,
IModelAdapter modelAdapter, int depth, int[] pos )
throws BirtException
{
LevelHandle targetLevel = member.getLevel( );

if( targetLevel == null )
{
targetLevel = crosstabItem.findLevelHandle( member.getCubeLevelName( ) );
}

if ( targetLevel == null )
{
// this must be the pseudo root level, which only denotes a filter.
Expand All @@ -631,7 +658,7 @@ private static void traverseMemberFilter(

if ( depth > targetLevels.size( ) )
{
ILevelDefinition targetLevelDef = levelMapping.get( targetLevel );
ILevelDefinition targetLevelDef = levelMapping.get( targetLevel.getFullName( ) );

IDimensionDefinition targetDimDef = targetLevelDef.getHierarchy( )
.getDimension( );
Expand Down Expand Up @@ -725,7 +752,8 @@ else if ( op[0] != dop )

if ( child != null )
{
traverseMemberFilter( targetLevels,
traverseMemberFilter( crosstabItem,
targetLevels,
op,
updateAggFlag,
memberValues,
Expand Down Expand Up @@ -789,9 +817,9 @@ private static void matrixAdd( List<List<IScriptExpression>> values,
}
}

private static void addDrillDefinition( IEdgeDefinition edge,
private static void addDrillDefinition( CrosstabReportItemHandle crosstabItem, IEdgeDefinition edge,
MemberValueHandle member,
Map<LevelHandle, ILevelDefinition> levelMapping )
Map<String, ILevelDefinition> levelMapping )
{
IHierarchyDefinition targetHierarchy = null;
String targetLevelName = null;
Expand All @@ -802,7 +830,7 @@ private static void addDrillDefinition( IEdgeDefinition edge,
targetLevelName, targetHierarchy
};

traverseDrillMember( output, member, levelMapping, values, 0 );
traverseDrillMember( crosstabItem, output, member, levelMapping, values, 0 );

targetLevelName = (String) output[0];
targetHierarchy = (IHierarchyDefinition) output[1];
Expand Down Expand Up @@ -833,13 +861,17 @@ private static void addDrillDefinition( IEdgeDefinition edge,
/**
* !!!Note depth is 0-based for this method.
*/
private static void traverseDrillMember( Object[] output,
private static void traverseDrillMember( CrosstabReportItemHandle crosstabItem, Object[] output,
MemberValueHandle member,
Map<LevelHandle, ILevelDefinition> levelMapping,
Map<String, ILevelDefinition> levelMapping,
List<List<Object>> values, int depth )
{
LevelHandle targetLevel = member.getLevel( );

if( targetLevel == null )
{
targetLevel = crosstabItem.findLevelHandle( member.getCubeLevelName( ) );
}

if ( targetLevel == null )
{
return;
Expand All @@ -861,7 +893,7 @@ private static void traverseDrillMember( Object[] output,
vals.add( val );
}

ILevelDefinition targetLevelDef = levelMapping.get( targetLevel );
ILevelDefinition targetLevelDef = levelMapping.get( targetLevel.getFullName( ) );

// update the target level name
output[0] = targetLevel.getName( );
Expand All @@ -883,7 +915,8 @@ private static void traverseDrillMember( Object[] output,

if ( child != null )
{
traverseDrillMember( output,
traverseDrillMember( crosstabItem,
output,
child,
levelMapping,
values,
Expand All @@ -897,15 +930,13 @@ private static void traverseDrillMember( Object[] output,
* Recursively add all member values and associated levels to the given
* list.
*/
private static void addMembers(
Map<LevelHandle, ILevelDefinition> levelMapping,
private static void addMembers( Map<String, ILevelDefinition> levelMapping,
List<ILevelDefinition> levels, List<Object> values,
MemberValueHandle member )
{
if ( member != null )
{
ILevelDefinition levelDef = levelMapping.get( member.getLevel( ) );

{
ILevelDefinition levelDef = levelMapping.get( member.getCubeLevelName( ) );
if ( levelDef != null )
{
levels.add( levelDef );
Expand All @@ -925,7 +956,7 @@ private static void addMembers(
}

private static void addLevelSorting( List<LevelViewHandle> levelViews,
Map<LevelHandle, ILevelDefinition> levelMapping,
Map<String, ILevelDefinition> levelMapping,
ICubeQueryDefinition cubeQuery, IModelAdapter modelAdapter )
throws BirtException
{
Expand Down Expand Up @@ -965,7 +996,7 @@ private static void addLevelSorting( List<LevelViewHandle> levelViews,
ICubeSortDefinition sortDef = getCubeElementFactory( ).createCubeSortDefinition( modelAdapter.adaptExpression( (Expression) sortKey.getExpressionProperty( ISortElementModel.KEY_PROP )
.getValue( ),
ExpressionLocation.CUBE ),
levelMapping.get( lv.getCubeLevel( ) ),
levelMapping.get( lv.getCubeLevel( ).getFullName( ) ),
qualifyLevels,
qualifyValues,
DataAdapterUtil.adaptModelSortDirection( sortKey.getDirection( ) ) );
Expand All @@ -980,7 +1011,7 @@ private static void addLevelSorting( List<LevelViewHandle> levelViews,
}

private static void addLevelFilter( List<LevelViewHandle> levelViews,
Map<LevelHandle, ILevelDefinition> levelMapping,
Map<String, ILevelDefinition> levelMapping,
ICubeQueryDefinition cubeQuery, IModelAdapter modelAdapter )
throws BirtException
{
Expand Down Expand Up @@ -1067,7 +1098,7 @@ private static void addLevelFilter( List<LevelViewHandle> levelViews,
}

ICubeFilterDefinition filterDef = getCubeElementFactory( ).creatCubeFilterDefinition( filterCondExpr,
levelMapping.get( lv.getCubeLevel( ) ),
levelMapping.get( lv.getCubeLevel( ).getFullName( ) ),
qualifyLevels,
qualifyValues,
filterCon.updateAggregation( ) );
Expand Down

0 comments on commit 3c644a2

Please sign in to comment.