You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by vi...@apache.org on 2016/09/07 16:52:02 UTC
[1/2] incubator-carbondata git commit: If the compaction is triggered
without data load then compaction is failing. corrected the code.
Repository: incubator-carbondata
Updated Branches:
refs/heads/master f15906973 -> c3597743d
If the compaction is triggered without data load then compaction is failing. corrected the code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/dbf3ef9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/dbf3ef9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/dbf3ef9e
Branch: refs/heads/master
Commit: dbf3ef9eb111b714b4a8b9dc3d856cc623bd54b1
Parents: f159069
Author: ravikiran <ra...@gmail.com>
Authored: Wed Sep 7 05:08:43 2016 -0700
Committer: Vimal-Das <vi...@apache.org>
Committed: Wed Sep 7 22:14:55 2016 +0530
----------------------------------------------------------------------
.../org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/dbf3ef9e/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
index ef2920f..31cc8ac 100644
--- a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
+++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
@@ -402,7 +402,7 @@ object CarbonDataRDDFactory extends Logging {
carbonLoadModel.getLoadMetadataDetails
)
CarbonDataMergerUtil.sortSegments(sortedSegments)
- val lastSegment = sortedSegments.get(sortedSegments.size() - 1)
+
var segList = carbonLoadModel.getLoadMetadataDetails
var loadsToMerge = CarbonDataMergerUtil.identifySegmentsToBeMerged(
hdfsStoreLocation,
@@ -413,6 +413,7 @@ object CarbonDataRDDFactory extends Logging {
compactionModel.compactionType
)
while (loadsToMerge.size() > 1) {
+ val lastSegment = sortedSegments.get(sortedSegments.size() - 1)
deletePartialLoadsInCompaction(carbonLoadModel)
val futureList: util.List[Future[Void]] = new util.ArrayList[Future[Void]](
CarbonCommonConstants
[2/2] incubator-carbondata git commit: [CARBONDATA-219]If the
compaction is triggered without data load failing. This closes #133
Posted by vi...@apache.org.
[CARBONDATA-219]If the compaction is triggered without data load failing. This closes #133
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/c3597743
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/c3597743
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/c3597743
Branch: refs/heads/master
Commit: c3597743d9c14522d05b68029bca2fcc6d3571ec
Parents: f159069 dbf3ef9
Author: Vimal-Das <vi...@apache.org>
Authored: Wed Sep 7 22:16:21 2016 +0530
Committer: Vimal-Das <vi...@apache.org>
Committed: Wed Sep 7 22:16:21 2016 +0530
----------------------------------------------------------------------
.../org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------