[carbondata] branch master updated: [HOTFIX] Fix dictionary include issue with codegen failure

[ravipesala]

This is an automated email from the ASF dual-hosted git repository.

ravipesala pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git


The following commit(s) were added to refs/heads/master by this push:
     new 61a5bd3  [HOTFIX] Fix dictionary include issue with codegen failure
61a5bd3 is described below

commit 61a5bd3351cfeaa85528abeb70a8eae9c6521db6
Author: ajantha-bhat <ajanthab...@gmail.com>
AuthorDate: Fri Aug 9 17:33:34 2019 +0530

    [HOTFIX] Fix dictionary include issue with codegen failure
    
    problem: when whole codegen is false, query on dictionary include column 
fails.
    
    cause: This is because, the data type is not updated for dictionary include 
column.
    
    solution: return the updated expression when data type is changed for the 
dictionary include column
    
    This closes #3353
---
 .../scala/org/apache/spark/sql/optimizer/CarbonLateDecodeRule.scala  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonLateDecodeRule.scala
 
b/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonLateDecodeRule.scala
index 93773fc..961bf11 100644
--- 
a/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonLateDecodeRule.scala
+++ 
b/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonLateDecodeRule.scala
@@ -713,9 +713,10 @@ class CarbonLateDecodeRule extends Rule[LogicalPlan] with 
PredicateHelper {
             prExp.transform {
               case attr: AttributeReference =>
                 updateDataType(attr, attrMap, allAttrsNotDecode, aliasMap)
-            }
+            }.asInstanceOf[NamedExpression]
+          } else {
+            prExp
           }
-          prExp
         }
         Project(prExps, p.child)
       case wd: Window if relations.nonEmpty =>