Repository: carbondata Updated Branches: refs/heads/master 8f1a029b9 -> 83f9f12a8
[HOTFIX] Removed scala dependency from carbon core module Removed scala dependencies from carbon-core and sdk modules This closes #2709 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/83f9f12a Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/83f9f12a Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/83f9f12a Branch: refs/heads/master Commit: 83f9f12a842e167669bf594588640273e885260f Parents: 8f1a029 Author: ravipesala <[email protected]> Authored: Tue Sep 11 15:14:38 2018 +0530 Committer: Jacky Li <[email protected]> Committed: Wed Sep 12 14:59:10 2018 +0800 ---------------------------------------------------------------------- core/pom.xml | 5 ----- .../apache/carbondata/core/util/CarbonUtil.java | 4 ++-- .../carbondata/core/util/DataTypeUtilTest.java | 18 ------------------ store/sdk/pom.xml | 5 ----- 4 files changed, 2 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/83f9f12a/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index decb5d0..51c603e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -118,11 +118,6 @@ <artifactId>lz4</artifactId> <version>1.3.0</version> </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/carbondata/blob/83f9f12a/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 fa982be..d71f294 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 @@ -103,6 +103,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -116,7 +117,6 @@ import org.apache.thrift.TException; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TIOStreamTransport; -import scala.StringContext; public final class CarbonUtil { @@ -610,7 +610,7 @@ public final class CarbonUtil { * @return */ public static String unescapeChar(String parseStr) { - return StringContext.treatEscapes(parseStr); + return StringEscapeUtils.unescapeJava(parseStr); } /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/83f9f12a/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java b/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java index c67da7d..720e954 100644 --- a/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java +++ b/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java @@ -59,24 +59,6 @@ public class DataTypeUtilTest { assertTrue(result == result); } - @Test public void testGetDataBasedOnDataType() throws NumberFormatException { - String data = " "; - if (data.isEmpty()) { - assertEquals(getDataBasedOnDataType(data, DataTypes.INT), null); - } - assertEquals(getDataBasedOnDataType("1", DataTypes.INT), 1); - assertEquals(getDataBasedOnDataType(" ", DataTypes.INT), null); - assertEquals(getDataBasedOnDataType("0", DataTypes.DOUBLE), 0.0d); - assertEquals(getDataBasedOnDataType("0", DataTypes.LONG), 0L); - java.math.BigDecimal javaDecVal = new java.math.BigDecimal(1); - scala.math.BigDecimal scalaDecVal = new scala.math.BigDecimal(javaDecVal); - assertEquals(getDataBasedOnDataType("1", DataTypes.createDefaultDecimalType()), - DataTypeUtil.getDataTypeConverter().convertFromBigDecimalToDecimal(scalaDecVal)); - assertEquals(getDataBasedOnDataType("default", DataTypes.NULL), - DataTypeUtil.getDataTypeConverter().convertFromStringToUTF8String("default")); - assertEquals(getDataBasedOnDataType((String) null, DataTypes.NULL), null); - } - @Test public void testGetMeasureValueBasedOnDataType() { ColumnSchema columnSchema = new ColumnSchema(); CarbonMeasure carbonMeasure = new CarbonMeasure(columnSchema, 1); http://git-wip-us.apache.org/repos/asf/carbondata/blob/83f9f12a/store/sdk/pom.xml ---------------------------------------------------------------------- diff --git a/store/sdk/pom.xml b/store/sdk/pom.xml index aecf7e2..ea720a2 100644 --- a/store/sdk/pom.xml +++ b/store/sdk/pom.xml @@ -30,11 +30,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.binary.version}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> <version>1.8.1</version>
