You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2016/11/17 01:21:27 UTC
[1/2] incubator-carbondata git commit: replaced usage of for loop
with index access for array
Repository: incubator-carbondata
Updated Branches:
refs/heads/master df3c35ca3 -> 017c2a3d7
replaced usage of for loop with index access for array
resolved for index out of bound exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/8749cdaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/8749cdaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/8749cdaa
Branch: refs/heads/master
Commit: 8749cdaac28596b1243cce302b50b4e457a5b131
Parents: df3c35c
Author: PallaviSingh1992 <pa...@yahoo.co.in>
Authored: Wed Nov 16 14:33:37 2016 +0530
Committer: jackylk <ja...@huawei.com>
Committed: Thu Nov 17 09:19:03 2016 +0800
----------------------------------------------------------------------
.../spark/merger/CarbonDataMergerUtil.java | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8749cdaa/integration/spark/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java b/integration/spark/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java
index 6c9ca41..6e8ab0c 100644
--- a/integration/spark/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java
+++ b/integration/spark/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java
@@ -510,19 +510,13 @@ public final class CarbonDataMergerUtil {
int level1Size = 0;
int level2Size = 0;
- boolean first = true;
-
- for(int levelCount : noOfSegmentLevelsCount){
- if(first){
- level1Size = levelCount;
- first = false;
- }
- else{
- level2Size = levelCount;
- break;
- // breaking as we are doing only 2 levels
- }
+ int size = noOfSegmentLevelsCount.length;
+ if (size >= 2) {
+ level1Size = noOfSegmentLevelsCount[0];
+ level2Size = noOfSegmentLevelsCount[1];
+ } else if (size == 1) {
+ level1Size = noOfSegmentLevelsCount[0];
}
int unMergeCounter = 0;
[2/2] incubator-carbondata git commit: [CARBONDATA-414] Access array
elements using index than For Loop This closes #321
Posted by ja...@apache.org.
[CARBONDATA-414] Access array elements using index than For Loop This closes #321
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/017c2a3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/017c2a3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/017c2a3d
Branch: refs/heads/master
Commit: 017c2a3d7aeae1ced571d8d0fecbad4bed913bb8
Parents: df3c35c 8749cda
Author: jackylk <ja...@huawei.com>
Authored: Thu Nov 17 09:21:11 2016 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Thu Nov 17 09:21:11 2016 +0800
----------------------------------------------------------------------
.../spark/merger/CarbonDataMergerUtil.java | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------