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 2018/01/25 07:49:13 UTC
carbondata git commit: [HOTFIX] process JVM error for the streaming
writer
Repository: carbondata
Updated Branches:
refs/heads/master 3312ee72c -> d9bb64797
[HOTFIX] process JVM error for the streaming writer
process JVM error for the streaming writer by using Throwable instead of Exception
This closes #1849
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/d9bb6479
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/d9bb6479
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/d9bb6479
Branch: refs/heads/master
Commit: d9bb647978712d39d72273b816c2d3a84307854f
Parents: 3312ee7
Author: QiangCai <qi...@qq.com>
Authored: Tue Jan 23 21:12:32 2018 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Thu Jan 25 15:48:50 2018 +0800
----------------------------------------------------------------------
.../carbondata/hadoop/streaming/CarbonStreamRecordWriter.java | 3 ++-
.../org/apache/carbondata/streaming/segment/StreamSegment.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/d9bb6479/hadoop/src/main/java/org/apache/carbondata/hadoop/streaming/CarbonStreamRecordWriter.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/streaming/CarbonStreamRecordWriter.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/streaming/CarbonStreamRecordWriter.java
index 212baa7..364a6a6 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/streaming/CarbonStreamRecordWriter.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/streaming/CarbonStreamRecordWriter.java
@@ -134,7 +134,6 @@ public class CarbonStreamRecordWriter extends RecordWriter<Void, Object> {
}
private void initializeAtFirstRow() throws IOException, InterruptedException {
- isFirstRow = false;
// initialize metadata
isNoDictionaryDimensionColumn =
@@ -173,6 +172,8 @@ public class CarbonStreamRecordWriter extends RecordWriter<Void, Object> {
outputStream = FileFactory.getDataOutputStream(filePath, fileType);
writeFileHeader();
}
+
+ isFirstRow = false;
}
@Override public void write(Void key, Object value) throws IOException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/carbondata/blob/d9bb6479/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java
----------------------------------------------------------------------
diff --git a/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java b/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java
index 74e1461..4dbdfb0 100644
--- a/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java
+++ b/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java
@@ -244,7 +244,7 @@ public class StreamSegment {
writer.write(null, inputIterators.next());
}
inputIterators.close();
- } catch (Exception ex) {
+ } catch (Throwable ex) {
if (writer != null) {
LOGGER.error(ex, "Failed to append batch data to stream segment: " +
writer.getSegmentDir());