Create table will fail with exception: Invalid table properties sort_…

…columns, this is incorrect. Should throw correct exception like no schema is specified.
apache · Jun 11, 2019 · f4f33af · f4f33af
1 parent 9d02092
commit f4f33af
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/...r-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/SDKwriterTestCase.scala b/...r-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/SDKwriterTestCase.scala
@@ -333,7 +333,7 @@ class SDKwriterTestCase extends QueryTest with BeforeAndAfterEach {
            |'carbondata' LOCATION
            |'$writerPath' TBLPROPERTIES('sort_scope'='batch_sort') """.stripMargin)
     }
-    assert(ex.message.contains("table properties are not supported for external table"))
+    assert(ex.message.contains("Table properties are not supported for external table"))
   }
 
   test("Read sdk writer output file and test without carbondata and carbonindex files should fail")

diff --git a/.../scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableIfNotExists.scala b/.../scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableIfNotExists.scala
@@ -86,6 +86,12 @@ class TestCreateTableIfNotExists extends QueryTest with BeforeAndAfterAll {
     }
   }
 
+  test("test create table without column specified") {
+    val exception = intercept[MalformedCarbonCommandException] {
+      sql("create table TableWithoutColumn stored by 'carbondata' tblproperties('sort_columns'='')")
+    }
+    assert(exception.getMessage.contains("Creating table without column(s) is not supported"))
+  }
 
   override def afterAll {
     sql("use default")

diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
@@ -95,12 +95,14 @@ object CommonUtil {
 
   def validateTblProperties(tableProperties: Map[String, String], fields: Seq[Field]): Boolean = {
     var isValid: Boolean = true
-    tableProperties.foreach {
-      case (key, value) =>
-        if (!validateFields(key, fields)) {
-          isValid = false
-          throw new MalformedCarbonCommandException(s"Invalid table properties ${ key }")
-        }
+    if (fields.nonEmpty) {
+      tableProperties.foreach {
+        case (key, value) =>
+          if (!validateFields(key, fields)) {
+            isValid = false
+            throw new MalformedCarbonCommandException(s"Invalid table properties $key")
+          }
+      }
     }
     isValid
   }

diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSparkSqlParserUtil.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSparkSqlParserUtil.scala
@@ -17,7 +17,6 @@
 
 package org.apache.spark.sql.parser
 
-import scala.collection.JavaConverters._
 import scala.collection.mutable
 
 import org.antlr.v4.runtime.tree.TerminalNode
@@ -124,10 +123,13 @@ object CarbonSparkSqlParserUtil {
       operationNotAllowed("Streaming is not allowed on partitioned table", partitionColumns)
     }
 
+    if (!external && fields.isEmpty) {
+      throw new MalformedCarbonCommandException("Creating table without column(s) is not supported")
+    }
     if (external && fields.isEmpty && tableProperties.nonEmpty) {
       // as fields are always zero for external table, cannot validate table properties.
       operationNotAllowed(
-        "table properties are not supported for external table", tablePropertyList)
+        "Table properties are not supported for external table", tablePropertyList)
     }
 
     // validate tblProperties