[carbondata] branch master updated: [CARBONDATA-3427] Beautify DAG by showing less text

[ku...@apache.org]

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

kumarvishal09 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 ce2dde8  [CARBONDATA-3427] Beautify DAG by showing less text
ce2dde8 is described below

commit ce2dde84a09fb640058ad74b5257550fd370bb3a
Author: manhua <ke...@qq.com>
AuthorDate: Wed Jun 12 09:47:17 2019 +0800

    [CARBONDATA-3427] Beautify DAG by showing less text
    
    beautify DAG by showing less text
    
    This closes #3278
---
 .../scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala    | 3 +--
 .../apache/spark/sql/execution/strategy/CarbonLateDecodeStrategy.scala | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
index 09763fd..cfb6e6e 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
@@ -195,8 +195,7 @@ case class CarbonDatasourceHadoopRelation(
   override def unhandledFilters(filters: Array[Filter]): Array[Filter] = new Array[Filter](0)
 
   override def toString: String = {
-    "CarbonDatasourceHadoopRelation [ " + "Database name :" + identifier.getDatabaseName +
-    ", " + "Table name :" + identifier.getTableName + ", Schema :" + tableSchema + " ]"
+    "CarbonDatasourceHadoopRelation"
   }
 
   override def sizeInBytes: Long = carbonRelation.sizeInBytes
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/strategy/CarbonLateDecodeStrategy.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/strategy/CarbonLateDecodeStrategy.scala
index 0f706af..5d238de 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/strategy/CarbonLateDecodeStrategy.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/strategy/CarbonLateDecodeStrategy.scala
@@ -55,6 +55,7 @@ import org.apache.carbondata.spark.rdd.CarbonScanRDD
  */
 private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
   val PUSHED_FILTERS = "PushedFilters"
+  val READ_SCHEMA = "ReadSchema"
 
   /*
   Spark 2.3.1 plan there can be case of multiple projections like below
@@ -274,6 +275,7 @@ private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
       if (pushedFilters.nonEmpty) {
         pairs += (PUSHED_FILTERS -> pushedFilters.mkString("[", ", ", "]"))
       }
+      pairs += (READ_SCHEMA -> projectSet.++(filterSet).toSeq.toStructType.catalogString)
       pairs.toMap
     }