From c13abfde0aecb6d96bd828d605924fe6b9038257 Mon Sep 17 00:00:00 2001 From: akashrn5 Date: Thu, 30 May 2019 14:15:44 +0530 Subject: [PATCH] check --- .../org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala | 2 +- .../org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala | 2 +- .../org/apache/carbondata/mv/plans/util/SQLBuilder.scala | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala b/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala index 315c66b3d92..69b750035e4 100644 --- a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala +++ b/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/datamap/MVAnalyzerRule.scala @@ -71,7 +71,7 @@ class MVAnalyzerRule(sparkSession: SparkSession) extends Rule[LogicalPlan] { DataMapClassProvider.MV.getShortName).asInstanceOf[SummaryDatasetCatalog] if (needAnalysis && catalog != null && isValidPlan(plan, catalog)) { val modularPlan = catalog.mvSession.sessionState.rewritePlan(plan).withMVTable - if (modularPlan.find (_.rewritten).isDefined) { + if (modularPlan.find(_.rewritten).isDefined) { val compactSQL = modularPlan.asCompactSQL val analyzed = sparkSession.sql(compactSQL).queryExecution.analyzed analyzed diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala b/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala index d2e4375a18f..105217978f1 100644 --- a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala +++ b/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala @@ -161,7 +161,7 @@ trait SQLBuildDSL { extractRewrittenOrNonRewrittenSelectGroupBySelect(s1, g, s2, alias) case g@modular.GroupBy(_, _, _, _, s2@modular.Select(_, _, _, _, _, _, _, _, _, _), _, _, _) - if (g.alias.isEmpty && !s2.rewritten) => + if (g.alias.isEmpty) => val fragmentList = s2.children.zipWithIndex .map { case (child, index) => fragmentExtract(child, s2.aliasMap.get(index)) } val fList = s2.joinEdges.map { diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuilder.scala b/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuilder.scala index 815fb58989d..b17eea2253a 100644 --- a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuilder.scala +++ b/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuilder.scala @@ -124,7 +124,11 @@ class SQLBuilder private( } } else { attrMap.get(ref) match { - case Some(alias) => Alias(alias.child, alias.name)(exprId = alias.exprId) + case Some(alias) => + AttributeReference( + alias.child.asInstanceOf[AttributeReference].name, + ref.dataType)(exprId = ref.exprId, + alias.child.asInstanceOf[AttributeReference].qualifier) case None => ref } }