You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2017/12/29 14:11:49 UTC

carbondata git commit: [CARBONDATA-1834] when running insert overwrite task and parallely executing select query task throwing FileNotFoundException so we modify the log message

Repository: carbondata
Updated Branches:
  refs/heads/master 73d516c21 -> c5e72a4c9


[CARBONDATA-1834] when running insert overwrite task and parallely executing select query task throwing FileNotFoundException so we modify the log message

This closes #1739


Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/c5e72a4c
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/c5e72a4c
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/c5e72a4c

Branch: refs/heads/master
Commit: c5e72a4c9d1304283cea6b68a10173dea3a8102c
Parents: 73d516c
Author: kushalsaha <ku...@gmail.com>
Authored: Fri Dec 29 11:29:17 2017 +0530
Committer: Jacky Li <ja...@qq.com>
Committed: Fri Dec 29 22:11:23 2017 +0800

----------------------------------------------------------------------
 .../VectorizedCarbonRecordReader.java             | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/c5e72a4c/integration/spark2/src/main/java/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/java/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java b/integration/spark2/src/main/java/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
index eba0787..5d927df 100644
--- a/integration/spark2/src/main/java/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
+++ b/integration/spark2/src/main/java/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.carbondata.common.logging.LogService;
+import org.apache.carbondata.common.logging.LogServiceFactory;
 import org.apache.carbondata.core.cache.dictionary.Dictionary;
 import org.apache.carbondata.core.datastore.block.TableBlockInfo;
 import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryGenerator;
@@ -60,6 +62,9 @@ import org.apache.spark.sql.types.StructType;
  */
 class VectorizedCarbonRecordReader extends AbstractRecordReader<Object> {
 
+  private static final LogService LOGGER =
+      LogServiceFactory.getLogService(VectorizedCarbonRecordReader.class.getName());
+
   private int batchIdx = 0;
 
   private int numBatched = 0;
@@ -121,11 +126,22 @@ class VectorizedCarbonRecordReader extends AbstractRecordReader<Object> {
       while (ext != null) {
         if (ext instanceof FileNotFoundException) {
           throw new InterruptedException(
-              e.getMessage() + ". insert overwrite may be in progress.Please check");
+              "Insert overwrite may be in progress.Please check " + e.getMessage());
         }
         ext = ext.getCause();
       }
       throw new InterruptedException(e.getMessage());
+    } catch (Exception e) {
+      Throwable ext = e;
+      while (ext != null) {
+        if (ext instanceof FileNotFoundException) {
+          LOGGER.error(e);
+          throw new InterruptedException(
+              "Insert overwrite may be in progress.Please check " + e.getMessage());
+        }
+        ext = ext.getCause();
+      }
+      throw e;
     }
   }