commit f2bb9f4eb39f0306cd83ecdad3e3dff34ec151e6
author ravipesala <ravi.pesala@gmail.com> Tue Apr 24 17:02:21 2018 +0530
committer Jacky Li <jacky.likun@qq.com> Wed Apr 25 00:14:42 2018 +0800
tree 6938478202e8561f2269adf084c1d47756502784
parent 84267dc7ab3a12c800df0da13740c9f5afae0922

[HOTFIX] Avoid adding status if there is no datamaps on table.

This closes #2222

core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatusManager.java

diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatusManager.java b/core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatusManager.java
index 10ed80c..31ab4e4 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatusManager.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/status/DataMapStatusManager.java
@@ -53,11 +53,11 @@
 
   public static void disableDataMap(String dataMapName) throws Exception {
     DataMapSchema dataMapSchema = getDataMapSchema(dataMapName);
-    List<DataMapSchema> list = new ArrayList<>();
     if (dataMapSchema != null) {
+      List<DataMapSchema> list = new ArrayList<>();
       list.add(dataMapSchema);
+      storageProvider.updateDataMapStatus(list, DataMapStatus.DISABLED);
     }
-    storageProvider.updateDataMapStatus(list, DataMapStatus.DISABLED);
   }
 
   public static void disableDataMapsOfTable(CarbonTable table) throws IOException {
@@ -68,11 +68,11 @@
 
   public static void enableDataMap(String dataMapName) throws IOException, NoSuchDataMapException {
     DataMapSchema dataMapSchema = getDataMapSchema(dataMapName);
-    List<DataMapSchema> list = new ArrayList<>();
     if (dataMapSchema != null) {
+      List<DataMapSchema> list = new ArrayList<>();
       list.add(dataMapSchema);
+      storageProvider.updateDataMapStatus(list, DataMapStatus.ENABLED);
     }
-    storageProvider.updateDataMapStatus(list, DataMapStatus.ENABLED);
   }
 
   public static void enableDataMapsOfTable(CarbonTable table) throws IOException {
@@ -83,11 +83,11 @@
 
   public static void dropDataMap(String dataMapName) throws IOException, NoSuchDataMapException {
     DataMapSchema dataMapSchema = getDataMapSchema(dataMapName);
-    List<DataMapSchema> list = new ArrayList<>();
     if (dataMapSchema != null) {
+      List<DataMapSchema> list = new ArrayList<>();
       list.add(dataMapSchema);
+      storageProvider.updateDataMapStatus(list, DataMapStatus.DROPPED);
     }
-    storageProvider.updateDataMapStatus(list, DataMapStatus.DROPPED);
   }
 
   private static DataMapSchema getDataMapSchema(String dataMapName)

core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java

diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java b/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java
index 001af2d..83e141d 100644
--- a/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java
+++ b/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java
@@ -98,6 +98,10 @@
   @Override
   public void updateDataMapStatus(List<DataMapSchema> dataMapSchemas, DataMapStatus dataMapStatus)
       throws IOException {
+    if (dataMapSchemas == null || dataMapSchemas.size() == 0) {
+      // There is nothing to update
+      return;
+    }
     ICarbonLock carbonTableStatusLock = getDataMapStatusLock();
     boolean locked = false;
     try {