Repository: carbondata Updated Branches: refs/heads/master fc74f5d3d -> 1c8d5f0bb
[HOTFIX] Fix unsafe load in test case Unsafe Load fails for dictionary columns because of refactoring This closes #2051 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/1c8d5f0b Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/1c8d5f0b Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/1c8d5f0b Branch: refs/heads/master Commit: 1c8d5f0bb7af5c116b438d3eaff0087de59709df Parents: fc74f5d Author: ravipesala <ravi.pes...@gmail.com> Authored: Sat Mar 10 20:56:22 2018 +0530 Committer: chenliang613 <chenliang...@huawei.com> Committed: Mon Mar 12 17:50:18 2018 +0800 ---------------------------------------------------------------------- .../apache/carbondata/core/locks/LocalFileLock.java | 13 ------------- pom.xml | 1 + .../sort/unsafe/comparator/UnsafeRowComparator.java | 3 +-- 3 files changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/1c8d5f0b/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 cb80877..e3b3126 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 @@ -27,7 +27,6 @@ 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; @@ -136,18 +135,6 @@ public class LocalFileLock extends AbstractCarbonLock { status = false; } finally { 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; - } - } } return status; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/1c8d5f0b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 114a4f0..c7e140d 100644 --- a/pom.xml +++ b/pom.xml @@ -481,6 +481,7 @@ <module>integration/presto</module> <module>streaming</module> <module>examples/spark2</module> + <module>datamap/lucene</module> </modules> <build> <plugins> http://git-wip-us.apache.org/repos/asf/carbondata/blob/1c8d5f0b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java index 33342dc..8f29cee 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java @@ -33,8 +33,7 @@ public class UnsafeRowComparator implements Comparator<UnsafeCarbonRow> { public UnsafeRowComparator(UnsafeCarbonRowPage rowPage) { this.baseObject = rowPage.getDataBlock().getBaseObject(); this.tableFieldStat = rowPage.getTableFieldStat(); - this.dictSizeInMemory = (tableFieldStat.getDictSortDimCnt() - + tableFieldStat.getDictNoSortDimCnt()) * 4; + this.dictSizeInMemory = tableFieldStat.getDictSortDimCnt() * 4; } /**
