You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2016/11/07 11:51:57 UTC
[4/5] incubator-carbondata git commit: In case while copying store to
hdfs, if stream didn't closed properly,
file doesn't get copied to HDFS So we need to propogate exception to executor
so that task can be launched again.
In case while copying store to hdfs, if stream didn't closed properly, file doesn't get copied to HDFS
So we need to propogate exception to executor so that task can be launched again.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/bc3f954f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/bc3f954f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/bc3f954f
Branch: refs/heads/branch-0.2
Commit: bc3f954f7392ca092b80ccac6d16e76e9bd222aa
Parents: ad9a515
Author: Ashok <as...@gmail.com>
Authored: Thu Nov 3 07:41:07 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Mon Nov 7 17:15:28 2016 +0530
----------------------------------------------------------------------
.../apache/carbondata/core/util/CarbonUtil.java | 21 ++++++++++++++------
.../store/writer/AbstractFactDataWriter.java | 3 ++-
2 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bc3f954f/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
index 8aceecd..bb8e82b 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
@@ -117,18 +117,27 @@ public final class CarbonUtil {
// Added if to avoid NullPointerException in case one stream is being passed as null
if (null != streams) {
for (Closeable stream : streams) {
- if (null != stream) {
- try {
- stream.close();
- } catch (IOException e) {
- LOGGER.error("Error while closing stream" + stream);
- }
+ try {
+ closeStream(stream);
+ } catch (IOException e) {
+ LOGGER.error("Error while closing stream:" + e);
}
}
}
}
/**
+ * This method closes stream
+ *
+ * @param stream
+ * @throws IOException
+ */
+ public static void closeStream(Closeable stream) throws IOException {
+ if (null != stream) {
+ stream.close();
+ }
+ }
+ /**
* @param baseStorePath
* @return
*/
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bc3f954f/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java b/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java
index f56a5d2..16bd771 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java
@@ -632,7 +632,8 @@ public abstract class AbstractFactDataWriter<T> implements CarbonFactDataWriter<
.getDataInputStream(localFilePath, FileFactory.getFileType(localFilePath), bufferSize);
IOUtils.copyBytes(dataInputStream, dataOutputStream, bufferSize);
} finally {
- CarbonUtil.closeStreams(dataInputStream, dataOutputStream);
+ CarbonUtil.closeStream(dataInputStream);
+ CarbonUtil.closeStream(dataOutputStream);
}
}