[carbondata] branch master updated: [CARBONDATA-3419] Desc Formatted not showing Range Column

[ku...@apache.org]

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

kunalkapoor 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 8c7e22f  [CARBONDATA-3419] Desc Formatted not showing Range Column
8c7e22f is described below

commit 8c7e22f4f82fe8d893a1db644640b1d396b2700d
Author: manishnalla1994 <ma...@gmail.com>
AuthorDate: Fri Jun 7 11:13:16 2019 +0530

    [CARBONDATA-3419] Desc Formatted not showing Range Column
    
    Desc Formatted not showing Range Column
    
    This closes #3265
---
 .../testsuite/dataload/TestRangeColumnDataLoad.scala      | 15 +++++++++++++++
 .../command/table/CarbonDescribeFormattedCommand.scala    |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestRangeColumnDataLoad.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestRangeColumnDataLoad.scala
index 165e4f8..30d508d 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestRangeColumnDataLoad.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestRangeColumnDataLoad.scala
@@ -142,6 +142,21 @@ class TestRangeColumnDataLoad extends QueryTest with BeforeAndAfterEach with Bef
     checkAnswer(sql("SELECT COUNT(*) FROM carbon_range_column4"), Seq(Row(20)))
   }
 
+  test("Describe formatted for Range Column") {
+    sql("DROP TABLE IF EXISTS carbon_range_column1")
+    sql(
+      """
+        | CREATE TABLE carbon_range_column1(id INT, name STRING, city STRING, age SHORT)
+        | STORED BY 'org.apache.carbondata.format'
+        | TBLPROPERTIES('SORT_SCOPE'='GLOBAL_SORT', 'SORT_COLUMNS'='age, city',
+        | 'range_column'='age')
+      """.stripMargin)
+    val desc = sql("Desc formatted carbon_range_column1").collect()
+    assert(desc.exists(_.toString().contains("RANGE COLUMN")))
+    assert(desc.exists(_.toString().contains("age")))
+    sql("DROP TABLE IF EXISTS carbon_range_column1")
+  }
+
   test("Test compaction for range_column - SHORT Datatype") {
     sql("DROP TABLE IF EXISTS carbon_range_column1")
     sql(
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDescribeFormattedCommand.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDescribeFormattedCommand.scala
index ad8ad2b..d795d63 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDescribeFormattedCommand.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDescribeFormattedCommand.scala
@@ -133,7 +133,9 @@ private[sql] case class CarbonDescribeFormattedCommand(
           CarbonCommonConstants.CACHE_LEVEL_DEFAULT_VALUE), ""),
       ("Table page size in mb", pageSizeInMb, "")
     )
-
+    if (carbonTable.getRangeColumn != null) {
+      results ++= Seq(("RANGE COLUMN", carbonTable.getRangeColumn.getColName, ""))
+    }
     //////////////////////////////////////////////////////////////////////////////
     //  Encoding Information
     //////////////////////////////////////////////////////////////////////////////