[CARBONDATA-3065]Correct the error message for inverted index columns…

… and update the docment Modified the error message when column present in Inverted index is not present in Schema Updated the table property in user document This closes #2924
apache · Nov 16, 2018 · 0c02e98 · 0c02e98
1 parent 851dd2c
commit 0c02e98
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/docs/ddl-of-carbondata.md b/docs/ddl-of-carbondata.md
@@ -86,6 +86,7 @@ CarbonData DDL statements are documented here,which includes:
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
 | [DICTIONARY_INCLUDE](#dictionary-encoding-configuration)     | Columns for which dictionary needs to be generated           |
 | [NO_INVERTED_INDEX](#inverted-index-configuration)           | Columns to exclude from inverted index generation            |
+| [INVERTED_INDEX](#inverted-index-configuration)              | Columns to include for inverted index generation             |
 | [SORT_COLUMNS](#sort-columns-configuration)                  | Columns to include in sort and its order of sort             |
 | [SORT_SCOPE](#sort-scope-configuration)                      | Sort scope of the load.Options include no sort, local sort ,batch sort and global sort |
 | [TABLE_BLOCKSIZE](#table-block-size-configuration)           | Size of blocks to write onto hdfs                            |

diff --git a/...src/test/scala/org/apache/spark/sql/carbondata/datasource/SparkCarbonDataSourceTest.scala b/...src/test/scala/org/apache/spark/sql/carbondata/datasource/SparkCarbonDataSourceTest.scala
@@ -1345,6 +1345,15 @@ class SparkCarbonDataSourceTest extends FunSuite with BeforeAndAfterAll {
     spark.sql("drop table if exists fileformat_drop_hive")
   }
 
+  test("validate the columns not present in schema") {
+    spark.sql("drop table if exists validate")
+    spark.sql("create table validate (name string, age int, address string) using carbon options('inverted_index'='abc')")
+    val ex = intercept[Exception] {
+      spark.sql("insert into validate select 'abc',4,'def'")
+    }
+    assert(ex.getMessage.contains("column: abc specified in inverted index columns does not exist in schema"))
+  }
+
   override protected def beforeAll(): Unit = {
     drop
     createParquetTable
@@ -1360,5 +1369,6 @@ class SparkCarbonDataSourceTest extends FunSuite with BeforeAndAfterAll {
     spark.sql("drop table if exists testparquet")
     spark.sql("drop table if exists par_table")
     spark.sql("drop table if exists sdkout")
+    spark.sql("drop table if exists validate")
   }
 }
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java
@@ -618,8 +618,8 @@ private void buildTableSchema(Field[] fields, TableSchemaBuilder tableSchemaBuil
         }
       }
       if (!exists) {
-        throw new RuntimeException(
-            "column: " + invertedIdxColumn + " specified in sort columns does not exist in schema");
+        throw new RuntimeException("column: " + invertedIdxColumn
+            + " specified in inverted index columns does not exist in schema");
       }
     }
     int i = 0;