[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/18380a6b Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/18380a6b Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/18380a6b Branch: refs/heads/master Commit: 18380a6b4747f6b7a77da057a829426191fae2a9 Parents: 78d0114 Author: ravipesala <ravi.pes...@gmail.com> Authored: Sat Mar 10 20:56:22 2018 +0530 Committer: Jacky Li <jacky.li...@qq.com> Committed: Wed Mar 14 12:11:09 2018 +0800 ---------------------------------------------------------------------- .../apache/carbondata/core/locks/LocalFileLock.java | 13 ------------- pom.xml | 7 +++---- .../sort/unsafe/comparator/UnsafeRowComparator.java | 3 +-- 3 files changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/18380a6b/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/18380a6b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fdc9210..972be1e 100644 --- a/pom.xml +++ b/pom.xml @@ -99,9 +99,10 @@ <module>core</module> <module>processing</module> <module>hadoop</module> - <module>store/sdk</module> <module>integration/spark-common</module> <module>integration/spark-common-test</module> + <module>datamap/examples</module> + <module>store/sdk</module> <module>assembly</module> </modules> @@ -266,6 +267,7 @@ <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <version>2.2.1</version> + <scope>test</scope> </dependency> </dependencies> </dependencyManagement> @@ -342,7 +344,6 @@ <artifactId>findbugs-maven-plugin</artifactId> <version>3.0.4</version> <configuration> - <skip>true</skip> <excludeFilterFile>${dev.path}/findbugs-exclude.xml</excludeFilterFile> <failOnError>true</failOnError> <findbugsXmlOutput>true</findbugsXmlOutput> @@ -444,7 +445,6 @@ <module>format</module> <module>integration/spark2</module> <module>examples/spark2</module> - <module>datamap/examples</module> <module>integration/hive</module> <module>integration/presto</module> <module>examples/flink</module> @@ -481,7 +481,6 @@ <module>integration/presto</module> <module>streaming</module> <module>examples/spark2</module> - <module>datamap/examples</module> <module>datamap/lucene</module> </modules> <build> http://git-wip-us.apache.org/repos/asf/carbondata/blob/18380a6b/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; } /**
