summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpshi2012-04-11 05:05:42 (EDT)
committer mwu2012-04-11 05:05:42 (EDT)
commita37df78fc129276ab5dea4c8e7437193c094f0d5 (patch)
tree77c76ada837173198ac877e66eb3798a252d5891
parentb144211bcd855a8696ec0e1cd886a237ce3c583d (diff)
downloadorg.eclipse.birt-a37df78fc129276ab5dea4c8e7437193c094f0d5.zip
org.eclipse.birt-a37df78fc129276ab5dea4c8e7437193c094f0d5.tar.gz
org.eclipse.birt-a37df78fc129276ab5dea4c8e7437193c094f0d5.tar.bz2
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.
-rw-r--r--data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/CubeQueryDefinitionUtil.java10
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;
}