Checkin: Filter defined in BRS Table Builder is not pushed down to the

database [45775]

1 files changed, 20 insertions, 35 deletions

diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java
index b82732f..693f0bc 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/impl/PreparedOdaDSQuery.java
@@ -304,43 +304,28 @@ public class PreparedOdaDSQuery extends PreparedDataSourceQuery
 			
 			if ( queryDefn.getQueryExecutionHints( ).enablePushDown( ) )
 			{
-				int cacheSize = 0;
-				if ( appContext.containsKey( DataEngine.MEMORY_DATA_SET_CACHE ) )
-				{
-					cacheSize = Integer.valueOf( appContext.get( DataEngine.MEMORY_DATA_SET_CACHE )
-							.toString( ) )
-							.intValue( );
-				}
-				if ( cacheSize <= 0
-						&& appContext.containsKey( DataEngine.DATA_SET_CACHE_ROW_LIMIT ) )
-				{
-					cacheSize = Integer.valueOf( appContext.get( DataEngine.DATA_SET_CACHE_ROW_LIMIT )
-							.toString( ) )
-							.intValue( );
-				}
-				if ( cacheSize <= 0 )
-				{
-					ValidationContext validationContext = ( (OdaDataSetRuntime) dataSet ).getValidationContext( );
+				ValidationContext validationContext = ( (OdaDataSetRuntime) dataSet ).getValidationContext();
 
-					if ( validationContext != null )
+				if ( validationContext != null )
+				{
+					validationContext.setQueryText(((IOdaDataSetDesign) dataSetDesign).getQueryText());
+					OptimizationRollbackHelper rollbackHelper = new OptimizationRollbackHelper(
+							queryDefn, (IOdaDataSetDesign) dataSetDesign);
+					rollbackHelper.collectOriginalInfo();
+					querySpec = OdaQueryOptimizationUtil.optimizeExecution(
+									((OdaDataSourceRuntime) dataEngine
+											.getDataSourceRuntime(dataSetDesign
+													.getDataSourceName()))
+											.getExtensionID(),
+									validationContext,
+									(IOdaDataSetDesign) dataSetDesign,
+									queryDefn, dataEngine.getSession(),
+									appContext, contextVisitor);
+					if ( querySpec == null )
 					{
-						validationContext.setQueryText( ( (IOdaDataSetDesign) dataSetDesign ).getQueryText( ) );
-						OptimizationRollbackHelper rollbackHelper = new OptimizationRollbackHelper(
-								queryDefn, (IOdaDataSetDesign) dataSetDesign );
-						rollbackHelper.collectOriginalInfo( );
-						querySpec = OdaQueryOptimizationUtil.optimizeExecution( ( (OdaDataSourceRuntime) dataEngine.getDataSourceRuntime( dataSetDesign.getDataSourceName( ) ) ).getExtensionID( ),
-								validationContext,
-								(IOdaDataSetDesign) dataSetDesign,
-								queryDefn,
-								dataEngine.getSession( ),
-								appContext,
-								contextVisitor );
-						if ( querySpec == null )
-						{
-							//roll back changes made in <code>dataSetDesign</code> and <code>queryDefn</code>
-						    rollbackHelper.rollback( );
-						}
-					}					
+						//roll back changes made in <code>dataSetDesign</code> and <code>queryDefn</code>
+						rollbackHelper.rollback( );
+					}
 				}
 			}