Repository: carbondata Updated Branches: refs/heads/master 3e0693b9e -> 43ffe79f3
[CARBONDATA-3058] Fix some exception coding in data loading This closes #2879 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/43ffe79f Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/43ffe79f Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/43ffe79f Branch: refs/heads/master Commit: 43ffe79f3574a6cef926987045d4e8759f8f8b95 Parents: 3e0693b Author: Manhua <kevin...@qq.com> Authored: Mon Oct 29 19:05:03 2018 +0800 Committer: Jacky Li <jacky.li...@qq.com> Committed: Wed Oct 31 16:23:46 2018 +0800 ---------------------------------------------------------------------- .../loading/steps/CarbonRowDataWriterProcessorStepImpl.java | 8 ++++++-- .../loading/steps/DataWriterBatchProcessorStepImpl.java | 4 +++- .../loading/steps/DataWriterProcessorStepImpl.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/43ffe79f/processing/src/main/java/org/apache/carbondata/processing/loading/steps/CarbonRowDataWriterProcessorStepImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/CarbonRowDataWriterProcessorStepImpl.java b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/CarbonRowDataWriterProcessorStepImpl.java index ce79f24..d4d48f9 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/CarbonRowDataWriterProcessorStepImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/CarbonRowDataWriterProcessorStepImpl.java @@ -209,7 +209,11 @@ public class CarbonRowDataWriterProcessorStepImpl extends AbstractDataLoadProces try { processingComplete(dataHandler); } catch (CarbonDataLoadingException e) { - exception = new CarbonDataWriterException(e.getMessage(), e); + // only assign when exception is null + // else it will erase original root cause + if (null == exception) { + exception = new CarbonDataWriterException(e); + } } CarbonTimeStatisticsFactory.getLoadStatisticsInstance() .recordDictionaryValue2MdkAdd2FileTime(CarbonTablePath.DEPRECATED_PATITION_ID, @@ -305,7 +309,7 @@ public class CarbonRowDataWriterProcessorStepImpl extends AbstractDataLoadProces } writeCounter[iteratorIndex] += batch.getSize(); } catch (Exception e) { - throw new CarbonDataLoadingException("unable to generate the mdkey", e); + throw new CarbonDataLoadingException(e); } rowCounter.getAndAdd(batch.getSize()); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/43ffe79f/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java index 7cb102b..a0a845b 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java @@ -140,7 +140,9 @@ public class DataWriterBatchProcessorStepImpl extends AbstractDataLoadProcessorS try { processingComplete(dataHandler); } catch (Exception e) { - exception = new CarbonDataWriterException(e.getMessage(), e); + if (null == exception) { + exception = new CarbonDataWriterException(e); + } } CarbonTimeStatisticsFactory.getLoadStatisticsInstance() .recordDictionaryValue2MdkAdd2FileTime(CarbonTablePath.DEPRECATED_PATITION_ID, http://git-wip-us.apache.org/repos/asf/carbondata/blob/43ffe79f/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java index 1595e1b..1657476 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java @@ -255,7 +255,7 @@ public class DataWriterProcessorStepImpl extends AbstractDataLoadProcessorStep { readCounter++; dataHandler.addDataToStore(row); } catch (Exception e) { - throw new CarbonDataLoadingException("unable to generate the mdkey", e); + throw new CarbonDataLoadingException(e); } rowCounter.getAndAdd(1); }
