review comment fix

apache · Jul 9, 2019 · ad66fca · ad66fca
1 parent bf3ecf8
commit ad66fca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 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
@@ -697,18 +697,20 @@ class CarbonLateDecodeRule extends Rule[LogicalPlan] with PredicateHelper {
         marker.pushBinaryMarker(allAttrsNotDecode)
         u
       case p: Project if relations.nonEmpty =>
-        val prExps = if (p.projectList.toString().contains("substring")) {
-          // cannot update data type if substring present in plan.
-          // because if join is called, attribute in plan is tried to resolve on Integer datatype
-          // instead of String.
-          p.projectList
-        } else {
-          p.projectList.map { prExp =>
+        val prExps = p.projectList.map { prExp =>
+          var isSubstringPresent = false
+          prExp.transform {
+            case subStr: Substring =>
+              isSubstringPresent = true
+              subStr
+          }
+          if (!isSubstringPresent) {
             prExp.transform {
               case attr: AttributeReference =>
                 updateDataType(attr, attrMap, allAttrsNotDecode, aliasMap)
             }
-          }.asInstanceOf[Seq[NamedExpression]]
+          }
+          prExp
         }
         Project(prExps, p.child)
       case wd: Window if relations.nonEmpty =>

diff --git a/...ation/spark2/src/test/scala/org/apache/spark/carbondata/query/SubQueryJoinTestSuite.scala b/...ation/spark2/src/test/scala/org/apache/spark/carbondata/query/SubQueryJoinTestSuite.scala
@@ -23,7 +23,6 @@ import org.scalatest.BeforeAndAfterAll
 
 class SubQueryJoinTestSuite extends Spark2QueryTest with BeforeAndAfterAll {
 
-
   test("test to check if 2nd level subquery gives correct result") {
     sql("drop table if exists t1")
     sql("drop table if exists t2")
@@ -44,6 +43,4 @@ class SubQueryJoinTestSuite extends Spark2QueryTest with BeforeAndAfterAll {
     sql("drop table t2")
 
   }
-
-
 }