SDK reader improper error removal

apache · Jul 26, 2018 · b3c22d5 · b3c22d5
1 parent 4158bcd
commit b3c22d5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapStoreManager.java b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapStoreManager.java
@@ -424,9 +424,19 @@ public void clearInvalidSegments(CarbonTable carbonTable, List<Segment> segments
    */
   public void clearDataMaps(AbsoluteTableIdentifier identifier) {
     CarbonTable carbonTable = getCarbonTable(identifier);
+    clearDataMaps(carbonTable);
+  }
+
+  /**
+   * Clear the datamap/datamaps of a table from memory
+   *
+   * @param carbonTable carbonTable
+   */
+  public void clearDataMaps(CarbonTable carbonTable) {
+    AbsoluteTableIdentifier identifier = carbonTable.getAbsoluteTableIdentifier();
     String tableUniqueName = identifier.getCarbonTableIdentifier().getTableUniqueName();
     List<TableDataMap> tableIndices = allDataMaps.get(tableUniqueName);
-    if (null != carbonTable && tableIndices != null) {
+    if (tableIndices != null) {
       try {
         DataMapUtil.executeDataMapJobForClearingDataMaps(carbonTable);
       } catch (IOException e) {

diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
@@ -130,8 +130,7 @@ public void initialize(InputSplit inputSplit, TaskAttemptContext context)
     }
     if (!skipClearDataMapAtClose) {
       // Clear the datamap cache
-      DataMapStoreManager.getInstance().clearDataMaps(
-          queryModel.getTable().getAbsoluteTableIdentifier());
+      DataMapStoreManager.getInstance().clearDataMaps(queryModel.getTable());
     }
     // close read support
     readSupport.close();

diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonTableReader.java b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonTableReader.java
@@ -175,7 +175,7 @@ public CarbonTableCacheModel getCarbonCache(SchemaTableName table) {
 
   private void removeTableFromCache(SchemaTableName table) {
     DataMapStoreManager.getInstance()
-        .clearDataMaps(carbonCache.get().get(table).carbonTable.getAbsoluteTableIdentifier());
+        .clearDataMaps(carbonCache.get().get(table).carbonTable);
     carbonCache.get().remove(table);
     tableList.remove(table);
 

diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java
@@ -225,7 +225,7 @@ public <T> CarbonReader<T> build() throws IOException, InterruptedException {
     } catch (Exception ex) {
       // Clear the datamap cache as it can get added in getSplits() method
       DataMapStoreManager.getInstance()
-          .clearDataMaps(table.getAbsoluteTableIdentifier());
+          .clearDataMaps(table);
       throw ex;
     }
   }