Repository: carbondata Updated Branches: refs/heads/master 06adb5a03 -> 7dea46168
[CARBONDATA-3019] Add error log in catch block to avoid to abort the exception which is thrown from catch block when there is an exception thrown in finally block 1.Add error log in catch block to avoid to abort the exception which is thrown from catch block when there is an exception thrown in finally block. 2.enhance log output. This closes #2825 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/7dea4616 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/7dea4616 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/7dea4616 Branch: refs/heads/master Commit: 7dea4616888c9d91e2122a8929b61addf66bfe20 Parents: 06adb5a Author: Zhang Zhichao <[email protected]> Authored: Wed Oct 17 14:12:20 2018 +0800 Committer: Jacky Li <[email protected]> Committed: Thu Oct 18 16:59:45 2018 +0800 ---------------------------------------------------------------------- .../org/apache/carbondata/core/util/comparator/Comparator.java | 2 +- .../sql/execution/command/management/CarbonLoadDataCommand.scala | 1 + .../spark/sql/execution/command/table/CarbonDropTableCommand.scala | 2 ++ .../processing/merger/CompactionResultSortProcessor.java | 1 + .../carbondata/processing/merger/RowResultMergerProcessor.java | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/7dea4616/core/src/main/java/org/apache/carbondata/core/util/comparator/Comparator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/comparator/Comparator.java b/core/src/main/java/org/apache/carbondata/core/util/comparator/Comparator.java index d9bc94b..6981405 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/comparator/Comparator.java +++ b/core/src/main/java/org/apache/carbondata/core/util/comparator/Comparator.java @@ -70,7 +70,7 @@ public final class Comparator { } else if (dataType == DataTypes.BYTE) { return new ByteArraySerializableComparator(); } else { - throw new IllegalArgumentException("Unsupported data type"); + throw new IllegalArgumentException("Unsupported data type: " + dataType.getName()); } } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/7dea4616/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala index 22d0bb3..f8077ae 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala @@ -347,6 +347,7 @@ case class CarbonLoadDataCommand( throw new RuntimeException(s"Dataload failure for $dbName.$tableName, ${ex.getMessage}") // In case of event related exception case preEventEx: PreEventException => + LOGGER.error(s"Dataload failure for $dbName.$tableName", preEventEx) throw new AnalysisException(preEventEx.getMessage) case ex: Exception => LOGGER.error(ex) http://git-wip-us.apache.org/repos/asf/carbondata/blob/7dea4616/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDropTableCommand.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDropTableCommand.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDropTableCommand.scala index e8cb689..21070be 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDropTableCommand.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/table/CarbonDropTableCommand.scala @@ -146,10 +146,12 @@ case class CarbonDropTableCommand( } catch { case ex: NoSuchTableException => + LOGGER.error(ex.getLocalizedMessage, ex) if (!ifExistsSet) { throw ex } case ex: ConcurrentOperationException => + LOGGER.error(ex.getLocalizedMessage, ex) throw ex case ex: Exception => val msg = s"Dropping table $dbName.$tableName failed: ${ex.getMessage}" http://git-wip-us.apache.org/repos/asf/carbondata/blob/7dea4616/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java index 2a70dbd..e0a30da 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java @@ -173,6 +173,7 @@ public class CompactionResultSortProcessor extends AbstractResultProcessor { } isCompactionSuccess = true; } catch (Exception e) { + LOGGER.error(e.getLocalizedMessage(), e); throw e; } finally { if (partitionSpec != null) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/7dea4616/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java index 1801c1d..dcb7cb4 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java @@ -171,6 +171,7 @@ public class RowResultMergerProcessor extends AbstractResultProcessor { mergeStatus = true; } catch (Exception e) { mergeStatus = false; + LOGGER.error(e.getLocalizedMessage(), e); throw e; } finally { try {
