[48/50] [abbrv] carbondata git commit: [CARBONDATA-1114][Tests] Fix bugs in tests in windows env
[CARBONDATA-1114][Tests] Fix bugs in tests in windows env
Fix bugs in tests that will cause failure under windows env
This closes #1994
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/ce88eb6a
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/ce88eb6a
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/ce88eb6a
Branch: refs/heads/carbonstore
Commit: ce88eb6a2d6d54acf15a2bdf2a9165ecc9570647
Parents: faad967
Author: xuchuanyin
Authored: Sat Feb 24 21:18:17 2018 +0800
Committer: Jacky Li
Committed: Sun Mar 4 20:32:14 2018 +0800
--
.../carbondata/core/locks/LocalFileLock.java| 30 +++-
.../store/impl/DFSFileReaderImplUnitTest.java | 11 ---
.../store/impl/FileFactoryImplUnitTest.java | 28 +-
.../filesystem/HDFSCarbonFileTest.java | 3 +-
.../filesystem/LocalCarbonFileTest.java | 20 +
.../BooleanDataTypesInsertTest.scala| 5 ++--
.../carbondata/lcm/locks/LocalFileLockTest.java | 2 +-
.../loading/csvinput/CSVInputFormatTest.java| 1 +
8 files changed, 64 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/carbondata/blob/ce88eb6a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
--
diff --git
a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
index 75ea074..cb80877 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
@@ -17,17 +17,20 @@
package org.apache.carbondata.core.locks;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
import org.apache.carbondata.common.logging.LogService;
import org.apache.carbondata.common.logging.LogServiceFactory;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.datastore.filesystem.CarbonFile;
import org.apache.carbondata.core.datastore.impl.FileFactory;
import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier;
+import org.apache.carbondata.core.util.CarbonUtil;
/**
* This class handles the file locking in the local file system.
@@ -40,11 +43,6 @@ public class LocalFileLock extends AbstractCarbonLock {
private String location;
/**
- * fileOutputStream of the local lock file
- */
- private FileOutputStream fileOutputStream;
-
- /**
* channel is the FileChannel of the lock file.
*/
private FileChannel channel;
@@ -104,8 +102,8 @@ public class LocalFileLock extends AbstractCarbonLock {
FileFactory.createNewLockFile(lockFilePath,
FileFactory.getFileType(location));
}
- fileOutputStream = new FileOutputStream(lockFilePath);
- channel = fileOutputStream.getChannel();
+ channel = FileChannel.open(Paths.get(lockFilePath),
StandardOpenOption.WRITE,
+ StandardOpenOption.APPEND);
try {
fileLock = channel.tryLock();
} catch (OverlappingFileLockException e) {
@@ -137,11 +135,17 @@ public class LocalFileLock extends AbstractCarbonLock {
} catch (IOException e) {
status = false;
} finally {
- if (null != fileOutputStream) {
-try {
- fileOutputStream.close();
-} catch (IOException e) {
- LOGGER.error(e.getMessage());
+ CarbonUtil.closeStreams(channel);
+
+ // deleting the lock file after releasing the lock.
+ if (null != lockFilePath) {
+CarbonFile lockFile = FileFactory.getCarbonFile(lockFilePath,
+FileFactory.getFileType(lockFilePath));
+if (!lockFile.exists() || lockFile.delete()) {
+ LOGGER.info("Successfully deleted the lock file " + lockFilePath);
+} else {
+ LOGGER.error("Not able to delete the lock file " + lockFilePath);
+ status = false;
}
}
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/ce88eb6a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
--
diff --git
a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
b/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
index da61a94..30144c1 100644
---
a/core/src/test/java/org/apache/
[48/50] [abbrv] carbondata git commit: [CARBONDATA-1114][Tests] Fix bugs in tests in windows env
[CARBONDATA-1114][Tests] Fix bugs in tests in windows env
Fix bugs in tests that will cause failure under windows env
This closes #1994
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/ce88eb6a
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/ce88eb6a
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/ce88eb6a
Branch: refs/heads/carbonstore-rebase5
Commit: ce88eb6a2d6d54acf15a2bdf2a9165ecc9570647
Parents: faad967
Author: xuchuanyin
Authored: Sat Feb 24 21:18:17 2018 +0800
Committer: Jacky Li
Committed: Sun Mar 4 20:32:14 2018 +0800
--
.../carbondata/core/locks/LocalFileLock.java| 30 +++-
.../store/impl/DFSFileReaderImplUnitTest.java | 11 ---
.../store/impl/FileFactoryImplUnitTest.java | 28 +-
.../filesystem/HDFSCarbonFileTest.java | 3 +-
.../filesystem/LocalCarbonFileTest.java | 20 +
.../BooleanDataTypesInsertTest.scala| 5 ++--
.../carbondata/lcm/locks/LocalFileLockTest.java | 2 +-
.../loading/csvinput/CSVInputFormatTest.java| 1 +
8 files changed, 64 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/carbondata/blob/ce88eb6a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
--
diff --git
a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
index 75ea074..cb80877 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
@@ -17,17 +17,20 @@
package org.apache.carbondata.core.locks;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
import org.apache.carbondata.common.logging.LogService;
import org.apache.carbondata.common.logging.LogServiceFactory;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.datastore.filesystem.CarbonFile;
import org.apache.carbondata.core.datastore.impl.FileFactory;
import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier;
+import org.apache.carbondata.core.util.CarbonUtil;
/**
* This class handles the file locking in the local file system.
@@ -40,11 +43,6 @@ public class LocalFileLock extends AbstractCarbonLock {
private String location;
/**
- * fileOutputStream of the local lock file
- */
- private FileOutputStream fileOutputStream;
-
- /**
* channel is the FileChannel of the lock file.
*/
private FileChannel channel;
@@ -104,8 +102,8 @@ public class LocalFileLock extends AbstractCarbonLock {
FileFactory.createNewLockFile(lockFilePath,
FileFactory.getFileType(location));
}
- fileOutputStream = new FileOutputStream(lockFilePath);
- channel = fileOutputStream.getChannel();
+ channel = FileChannel.open(Paths.get(lockFilePath),
StandardOpenOption.WRITE,
+ StandardOpenOption.APPEND);
try {
fileLock = channel.tryLock();
} catch (OverlappingFileLockException e) {
@@ -137,11 +135,17 @@ public class LocalFileLock extends AbstractCarbonLock {
} catch (IOException e) {
status = false;
} finally {
- if (null != fileOutputStream) {
-try {
- fileOutputStream.close();
-} catch (IOException e) {
- LOGGER.error(e.getMessage());
+ CarbonUtil.closeStreams(channel);
+
+ // deleting the lock file after releasing the lock.
+ if (null != lockFilePath) {
+CarbonFile lockFile = FileFactory.getCarbonFile(lockFilePath,
+FileFactory.getFileType(lockFilePath));
+if (!lockFile.exists() || lockFile.delete()) {
+ LOGGER.info("Successfully deleted the lock file " + lockFilePath);
+} else {
+ LOGGER.error("Not able to delete the lock file " + lockFilePath);
+ status = false;
}
}
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/ce88eb6a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
--
diff --git
a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
b/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
index da61a94..30144c1 100644
---
a/core/src/test/java/org
[48/50] [abbrv] carbondata git commit: [CARBONDATA-1114][Tests] Fix bugs in tests in windows env
[CARBONDATA-1114][Tests] Fix bugs in tests in windows env
Fix bugs in tests that will cause failure under windows env
This closes #1994
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/8a9dd8b2
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/8a9dd8b2
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/8a9dd8b2
Branch: refs/heads/carbonstore-rebase5
Commit: 8a9dd8b21907096ded81fb58e152eecc3f629bb8
Parents: b1c9628
Author: xuchuanyin
Authored: Sat Feb 24 21:18:17 2018 +0800
Committer: Jacky Li
Committed: Fri Mar 2 15:52:37 2018 +0800
--
.../carbondata/core/locks/LocalFileLock.java| 30 +++-
.../store/impl/DFSFileReaderImplUnitTest.java | 11 ---
.../store/impl/FileFactoryImplUnitTest.java | 28 +-
.../filesystem/HDFSCarbonFileTest.java | 3 +-
.../filesystem/LocalCarbonFileTest.java | 20 +
.../BooleanDataTypesInsertTest.scala| 5 ++--
.../carbondata/lcm/locks/LocalFileLockTest.java | 2 +-
.../loading/csvinput/CSVInputFormatTest.java| 1 +
8 files changed, 64 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/carbondata/blob/8a9dd8b2/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
--
diff --git
a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
index 75ea074..cb80877 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java
@@ -17,17 +17,20 @@
package org.apache.carbondata.core.locks;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
import org.apache.carbondata.common.logging.LogService;
import org.apache.carbondata.common.logging.LogServiceFactory;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.datastore.filesystem.CarbonFile;
import org.apache.carbondata.core.datastore.impl.FileFactory;
import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier;
+import org.apache.carbondata.core.util.CarbonUtil;
/**
* This class handles the file locking in the local file system.
@@ -40,11 +43,6 @@ public class LocalFileLock extends AbstractCarbonLock {
private String location;
/**
- * fileOutputStream of the local lock file
- */
- private FileOutputStream fileOutputStream;
-
- /**
* channel is the FileChannel of the lock file.
*/
private FileChannel channel;
@@ -104,8 +102,8 @@ public class LocalFileLock extends AbstractCarbonLock {
FileFactory.createNewLockFile(lockFilePath,
FileFactory.getFileType(location));
}
- fileOutputStream = new FileOutputStream(lockFilePath);
- channel = fileOutputStream.getChannel();
+ channel = FileChannel.open(Paths.get(lockFilePath),
StandardOpenOption.WRITE,
+ StandardOpenOption.APPEND);
try {
fileLock = channel.tryLock();
} catch (OverlappingFileLockException e) {
@@ -137,11 +135,17 @@ public class LocalFileLock extends AbstractCarbonLock {
} catch (IOException e) {
status = false;
} finally {
- if (null != fileOutputStream) {
-try {
- fileOutputStream.close();
-} catch (IOException e) {
- LOGGER.error(e.getMessage());
+ CarbonUtil.closeStreams(channel);
+
+ // deleting the lock file after releasing the lock.
+ if (null != lockFilePath) {
+CarbonFile lockFile = FileFactory.getCarbonFile(lockFilePath,
+FileFactory.getFileType(lockFilePath));
+if (!lockFile.exists() || lockFile.delete()) {
+ LOGGER.info("Successfully deleted the lock file " + lockFilePath);
+} else {
+ LOGGER.error("Not able to delete the lock file " + lockFilePath);
+ status = false;
}
}
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/8a9dd8b2/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
--
diff --git
a/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
b/core/src/test/java/org/apache/carbondata/core/carbon/datastorage/filesystem/store/impl/DFSFileReaderImplUnitTest.java
index da61a94..30144c1 100644
---
a/core/src/test/java/org
