carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jack...@apache.org
Subject [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
Date Mon, 27 Feb 2017 10:34:46 GMT
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 <zgcsky08@163.com>
Authored: Mon Feb 27 11:55:20 2017 +0800
Committer: jackylk <jacky.likun@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--;
           }


Mime
View raw message