carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qiang...@apache.org
Subject carbondata git commit: [CARBONDATA-1717] Fix issue of no sort when data in carbon table is all numeric
Date Thu, 23 Nov 2017 06:31:03 GMT
Repository: carbondata
Updated Branches:
  refs/heads/master 06204d40c -> 472cf6761


[CARBONDATA-1717] Fix issue of no sort when data in carbon table is all numeric

This closes #1554


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

Branch: refs/heads/master
Commit: 472cf676121cbb1e294cea623abec5d95ab3356f
Parents: 06204d4
Author: chenerlu <chenerlu@huawei.com>
Authored: Wed Nov 22 23:04:13 2017 +0800
Committer: QiangCai <qiangcai@qq.com>
Committed: Thu Nov 23 14:26:48 2017 +0800

----------------------------------------------------------------------
 .../main/scala/org/apache/carbondata/spark/util/CommonUtil.scala | 2 +-
 .../src/main/scala/org/apache/spark/util/FileUtils.scala         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/472cf676/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
index 838ab89..af1d3f8 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
@@ -590,7 +590,7 @@ object CommonUtil {
     } else {
       context.defaultParallelism
     }
-    val spaceConsumed = FileUtils.getSpaceOccupied(filePaths)
+    val spaceConsumed = FileUtils.getSpaceOccupied(filePaths, hadoopConfiguration)
     val blockSize =
       hadoopConfiguration.getLongBytes("dfs.blocksize", CarbonCommonConstants.CARBON_256MB)
     LOGGER.info("[Block Distribution]")

http://git-wip-us.apache.org/repos/asf/carbondata/blob/472cf676/integration/spark-common/src/main/scala/org/apache/spark/util/FileUtils.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/spark/util/FileUtils.scala
b/integration/spark-common/src/main/scala/org/apache/spark/util/FileUtils.scala
index fcd460e..681910d 100644
--- a/integration/spark-common/src/main/scala/org/apache/spark/util/FileUtils.scala
+++ b/integration/spark-common/src/main/scala/org/apache/spark/util/FileUtils.scala
@@ -87,7 +87,7 @@ object FileUtils {
     }
   }
 
-  def getSpaceOccupied(inputPath: String): Long = {
+  def getSpaceOccupied(inputPath: String, hadoopConfiguration: Configuration): Long = {
     var size : Long = 0
     if (inputPath == null || inputPath.isEmpty) {
       size
@@ -95,7 +95,7 @@ object FileUtils {
       val filePaths = inputPath.split(",")
       for (i <- 0 until filePaths.size) {
         val fileType = FileFactory.getFileType(filePaths(i))
-        val carbonFile = FileFactory.getCarbonFile(filePaths(i), fileType)
+        val carbonFile = FileFactory.getCarbonFile(filePaths(i), fileType, hadoopConfiguration)
         size = size + carbonFile.getSize
       }
       size


Mime
View raw message