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 2017/02/27 10:34:46 UTC
[1/2] incubator-carbondata git commit: modify the code style to make
compile successfully. compile command: mvn -DskipTests -Pspark-2.1 -Pdist
-Pprovided -Phadoop-2.7.2 clean install
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 565bc9b8f -> 88e9b2a84
modify the code style to make compile successfully.
compile command: mvn -DskipTests -Pspark-2.1 -Pdist -Pprovided -Phadoop-2.7.2 clean install
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/9e932d11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/9e932d11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/9e932d11
Branch: refs/heads/master
Commit: 9e932d112b2278284c92cfbb4d9d6e8a311d9e6d
Parents: 565bc9b
Author: bill1208 <zg...@163.com>
Authored: Mon Feb 27 11:55:20 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Mon Feb 27 18:33:52 2017 +0800
----------------------------------------------------------------------
.../carbondata/processing/newflow/sort/unsafe/sort/TimSort.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e932d11/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
index 3c439aa..6700327 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
@@ -438,8 +438,8 @@ public class TimSort<K, Buffer> {
private void mergeCollapse() {
while (stackSize > 1) {
int n = stackSize - 2;
- if ((n >= 1 && runLen[n-1] <= runLen[n] + runLen[n+1])
- || (n >= 2 && runLen[n-2] <= runLen[n] + runLen[n-1])) {
+ if ((n >= 1 && runLen[n - 1] <= runLen[n] + runLen[n + 1])
+ || (n >= 2 && runLen[n - 2] <= runLen[n] + runLen[n - 1])) {
if (runLen[n - 1] < runLen[n + 1]) {
n--;
}
[2/2] incubator-carbondata git commit: modify one code check style
issue to make compile successfully. This closes #612
Posted by ja...@apache.org.
modify one code check style issue to make compile successfully. This closes #612
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/88e9b2a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/88e9b2a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/88e9b2a8
Branch: refs/heads/master
Commit: 88e9b2a8453b8463542a2d2cfbb0aee126faedf8
Parents: 565bc9b 9e932d1
Author: jackylk <ja...@huawei.com>
Authored: Mon Feb 27 18:34:25 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Mon Feb 27 18:34:25 2017 +0800
----------------------------------------------------------------------
.../carbondata/processing/newflow/sort/unsafe/sort/TimSort.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------