Repository: carbondata Updated Branches: refs/heads/master 0da0a4f61 -> e2a79eebb
http://git-wip-us.apache.org/repos/asf/carbondata/blob/e2a79eeb/integration/spark2/src/main/spark2.1/CarbonSessionState.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/spark2.1/CarbonSessionState.scala b/integration/spark2/src/main/spark2.1/CarbonSessionState.scala index 8900847..c198613 100644 --- a/integration/spark2/src/main/spark2.1/CarbonSessionState.scala +++ b/integration/spark2/src/main/spark2.1/CarbonSessionState.scala @@ -169,7 +169,6 @@ class CarbonSessionState(sparkSession: SparkSession) extends HiveSessionState(sp catalog.ParquetConversions :: catalog.OrcConversions :: CarbonPreInsertionCasts(sparkSession) :: - CarbonPreAggregateDataLoadingRules :: CarbonIUDAnalysisRule(sparkSession) :: AnalyzeCreateTable(sparkSession) :: PreprocessTableInsertion(conf) :: @@ -213,7 +212,8 @@ class CarbonAnalyzer(catalog: SessionCatalog, sparkSession: SparkSession, analyzer: Analyzer) extends Analyzer(catalog, conf) { override def execute(plan: LogicalPlan): LogicalPlan = { - val logicalPlan = analyzer.execute(plan) + var logicalPlan = analyzer.execute(plan) + logicalPlan = CarbonPreAggregateDataLoadingRules(logicalPlan) CarbonPreAggregateQueryRules(sparkSession).apply(logicalPlan) } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/e2a79eeb/integration/spark2/src/main/spark2.2/CarbonSessionState.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/spark2.2/CarbonSessionState.scala b/integration/spark2/src/main/spark2.2/CarbonSessionState.scala index 2ba6d09..8acddfa 100644 --- a/integration/spark2/src/main/spark2.2/CarbonSessionState.scala +++ b/integration/spark2/src/main/spark2.2/CarbonSessionState.scala @@ -148,7 +148,8 @@ class CarbonAnalyzer(catalog: SessionCatalog, sparkSession: SparkSession, analyzer: Analyzer) extends Analyzer(catalog, conf) { override def execute(plan: LogicalPlan): LogicalPlan = { - val logicalPlan = analyzer.execute(plan) + var logicalPlan = analyzer.execute(plan) + logicalPlan = CarbonPreAggregateDataLoadingRules(logicalPlan) CarbonPreAggregateQueryRules(sparkSession).apply(logicalPlan) } } @@ -215,7 +216,6 @@ class CarbonSessionStateBuilder(sparkSession: SparkSession, new FindDataSourceTable(session) +: new ResolveSQLOnFile(session) +: new CarbonIUDAnalysisRule(sparkSession) +: - CarbonPreAggregateDataLoadingRules +: new CarbonPreInsertionCasts(sparkSession) +: customResolutionRules override val extendedCheckRules: Seq[LogicalPlan => Unit] =
