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 2018/11/21 18:00:05 UTC

[38/50] [abbrv] carbondata git commit: [HOTFIX]s3 lock file fix

[HOTFIX]s3 lock file fix

This closes #2922


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

Branch: refs/heads/branch-1.5
Commit: 6df965bc21253f6e87b0cd85f12f67a03d8d6d00
Parents: 518e2b6
Author: akashrn5 <ak...@gmail.com>
Authored: Wed Nov 14 21:53:39 2018 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Wed Nov 21 22:43:46 2018 +0530

----------------------------------------------------------------------
 .../carbondata/core/datastore/filesystem/S3CarbonFile.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/6df965bc/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
index f1f9fd2..ee67097 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
@@ -107,8 +107,11 @@ public class S3CarbonFile extends HDFSCarbonFile {
         // create buffer
         byte[] byteStreamBuffer = new byte[count];
         int bytesRead = dataInputStream.read(byteStreamBuffer);
+        dataInputStream.close();
         stream = fileSystem.create(pt, true, bufferSize);
-        stream.write(byteStreamBuffer, 0, bytesRead);
+        if (bytesRead > 0) {
+          stream.write(byteStreamBuffer, 0, bytesRead);
+        }
       } else {
         stream = fileSystem.create(pt, true, bufferSize);
       }