[carbondata] branch master updated: [CARBONDATA-3558] Clean up codes for property "autoRefreshDataMap"

[jackylk]

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

jackylk 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 af843b2  [CARBONDATA-3558] Clean up codes for property 
"autoRefreshDataMap"
af843b2 is described below

commit af843b2e3a46928f9a34c5aa5b73a57e4b70dccc
Author: Manhua <kevin...@qq.com>
AuthorDate: Mon Oct 28 15:21:18 2019 +0800

    [CARBONDATA-3558] Clean up codes for property "autoRefreshDataMap"
    
    Since PR #2255 support DEFERRED REBUILD when creating DataMap, 
autoRefreshDataMap property is not used any more.
    
    This closes #3422
---
 .../java/org/apache/carbondata/core/datamap/DataMapProvider.java  | 2 +-
 .../apache/carbondata/core/metadata/schema/table/CarbonTable.java | 8 --------
 .../carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala   | 6 +++---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git 
a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapProvider.java 
b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapProvider.java
index c320226..2a053ee 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapProvider.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapProvider.java
@@ -120,7 +120,7 @@ public abstract class DataMapProvider {
   /**
    * Rebuild the datamap by loading all existing data from mainTable
    * This is called when refreshing the datamap when
-   * 1. after datamap creation and if `autoRefreshDataMap` is set to true
+   * 1. after datamap creation and no "WITH DEFERRED REBUILD" defined
    * 2. user manually trigger REBUILD DATAMAP command
    */
   public boolean rebuild() throws IOException, NoSuchDataMapException {
diff --git 
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java
 
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java
index f70d6fe..b36a60b 100644
--- 
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java
+++ 
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java
@@ -1048,14 +1048,6 @@ public class CarbonTable implements Serializable, 
Writable {
   }
 
   /**
-   * Return true if 'autoRefreshDataMap' is enabled, by default it is enabled
-   */
-  public boolean isAutoRefreshDataMap() {
-    String refresh = 
getTableInfo().getFactTable().getTableProperties().get("autorefreshdatamap");
-    return refresh == null || refresh.equalsIgnoreCase("true");
-  }
-
-  /**
    * whether this table has aggregation DataMap or not
    */
   public boolean hasAggregationDataMap() {
diff --git 
a/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala
 
b/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala
index d9678be..9c0ab89 100644
--- 
a/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala
+++ 
b/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala
@@ -167,7 +167,7 @@ class LuceneFineGrainDataMapSuite extends QueryTest with 
BeforeAndAfterAll {
       """
         | CREATE TABLE datamap_test4(id INT, name STRING, city STRING, age INT)
         | STORED BY 'carbondata'
-        | TBLPROPERTIES('SORT_COLUMNS'='city,name', 'SORT_SCOPE'='LOCAL_SORT', 
'autorefreshdatamap' = 'false')
+        | TBLPROPERTIES('SORT_COLUMNS'='city,name', 'SORT_SCOPE'='LOCAL_SORT')
       """.stripMargin)
     sql(s"LOAD DATA LOCAL INPATH '$file2' INTO TABLE datamap_test4 
OPTIONS('header'='false')")
 
@@ -829,14 +829,14 @@ class LuceneFineGrainDataMapSuite extends QueryTest with 
BeforeAndAfterAll {
         | CREATE TABLE datamap_test4(id INT, name STRING, city STRING, age INT)
         | STORED BY 'carbondata'
         | TBLPROPERTIES('SORT_COLUMNS'='city,name', 'SORT_SCOPE'='LOCAL_SORT',
-        | 'autorefreshdatamap' = 'false', 'CACHE_LEVEL'='BLOCKLET')
+        | 'CACHE_LEVEL'='BLOCKLET')
       """.stripMargin)
     sql(
       """
         | CREATE TABLE datamap_copy(id INT, name STRING, city STRING, age INT)
         | STORED BY 'carbondata'
         | TBLPROPERTIES('SORT_COLUMNS'='city,name', 'SORT_SCOPE'='LOCAL_SORT',
-        | 'autorefreshdatamap' = 'false', 'CACHE_LEVEL'='BLOCKLET')
+        | 'CACHE_LEVEL'='BLOCKLET')
       """.stripMargin)
     sql("insert into datamap_test4 select 1,'name','city',20")
     sql("insert into datamap_test4 select 2,'name1','city1',20")