carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jack...@apache.org
Subject carbondata git commit: [MINOR]Remove dependency of Java 1.8
Date Thu, 08 Feb 2018 17:09:52 GMT
Repository: carbondata
Updated Branches:
  refs/heads/master 5a4fe1673 -> 582916fb5


[MINOR]Remove dependency of Java 1.8

This closes #1928


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

Branch: refs/heads/master
Commit: 582916fb52b94b4bde429cafa60191c194efdad1
Parents: 5a4fe16
Author: Zhang Zhichao <441586683@qq.com>
Authored: Sun Feb 4 12:54:24 2018 +0800
Committer: Jacky Li <jacky.likun@qq.com>
Committed: Fri Feb 9 01:09:42 2018 +0800

----------------------------------------------------------------------
 .../command/preaaggregate/CreatePreAggregateTableCommand.scala     | 2 +-
 .../apache/spark/sql/execution/datasources/CarbonFileFormat.scala  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/582916fb/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala
b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala
index 17d6882..54f0390 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala
@@ -79,7 +79,7 @@ case class CreatePreAggregateTableCommand(
     )
     tableProperties.put(CarbonCommonConstants.SORT_COLUMNS, neworder.mkString(","))
     tableProperties.put("sort_scope", parentTable.getTableInfo.getFactTable.
-      getTableProperties.getOrDefault("sort_scope", CarbonCommonConstants
+      getTableProperties.asScala.getOrElse("sort_scope", CarbonCommonConstants
       .LOAD_SORT_SCOPE_DEFAULT))
     tableProperties
       .put(CarbonCommonConstants.TABLE_BLOCKSIZE, parentTable.getBlockSizeInMB.toString)

http://git-wip-us.apache.org/repos/asf/carbondata/blob/582916fb/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/CarbonFileFormat.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/CarbonFileFormat.scala
b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/CarbonFileFormat.scala
index 99e5732..17749c8 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/CarbonFileFormat.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/CarbonFileFormat.scala
@@ -272,7 +272,7 @@ private class CarbonOutputWriter(path: String,
       val formattedPartitions = updatedPartitions.map {case (col, value) =>
         // Only convert the static partitions to the carbon format and use it while loading
data
         // to carbon.
-        if (staticPartition.getOrDefault(col, false)) {
+        if (staticPartition.asScala.getOrElse(col, false)) {
           (col, CarbonScalaUtil.convertToCarbonFormat(value,
             CarbonScalaUtil.convertCarbonToSparkDataType(
               table.getColumnByName(table.getTableName, col).getDataType),


Mime
View raw message