fix 48052

Summary:In some case, drill down don't work in DA
Description:
When add filter in drill, it should be re-execute the query, improve the
logic in filter incremental.

1 files changed, 5 insertions, 5 deletions

diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java
index 2bfd5ac..c4773c1 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java
@@ -20,7 +20,6 @@ import org.eclipse.birt.data.engine.api.timefunction.ITimeFunction;
 import org.eclipse.birt.data.engine.api.timefunction.ITimePeriod;

 import org.eclipse.birt.data.engine.api.timefunction.TimePeriodType;

 import org.eclipse.birt.data.engine.core.DataException;

-import org.eclipse.birt.data.engine.expression.ExpressionCompilerUtil;

 import org.eclipse.birt.data.engine.impl.document.ExprUtil;

 import org.eclipse.birt.data.engine.olap.api.query.IComputedMeasureDefinition;

 import org.eclipse.birt.data.engine.olap.api.query.ICubeFilterDefinition;

@@ -33,7 +32,6 @@ import org.eclipse.birt.data.engine.olap.api.query.IEdgeDrillFilter;
 import org.eclipse.birt.data.engine.olap.api.query.IHierarchyDefinition;

 import org.eclipse.birt.data.engine.olap.api.query.ILevelDefinition;

 import org.eclipse.birt.data.engine.olap.api.query.IMeasureDefinition;

-import org.eclipse.birt.data.engine.script.ScriptConstants;

 

 import com.ibm.icu.util.ULocale;

 

@@ -175,10 +173,12 @@ public class CubeQueryDefinitionUtil
 			}

 			if( !find )

 			{

-				if (!filter.updateAggregation()) 

+				if ( !filter.updateAggregation( )

+						&& newQuery.getFilters( ).size( ) > basedQuery.getFilters( )

+								.size( ) )

 				{

-					resultFilters.add(filter);

-				} 

+					resultFilters.add( filter );

+				}

 				else

 					return null;

 			}