You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/01/12 04:10:19 UTC

[47/50] [abbrv] kylin git commit: KYLIN-2382 fix column order for select *

KYLIN-2382 fix column order for select *


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

Branch: refs/heads/master-cdh5.7
Commit: b0a406ff3c43d0cf6f8aa0b632e324d933440439
Parents: 0603099
Author: Yang Li <li...@apache.org>
Authored: Thu Jan 12 08:08:29 2017 +0800
Committer: Yang Li <li...@apache.org>
Committed: Thu Jan 12 08:08:29 2017 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/kylin/query/schema/OLAPTable.java   | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/b0a406ff/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java b/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java
index fe6a806..9d20fc7 100644
--- a/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java
+++ b/query/src/main/java/org/apache/kylin/query/schema/OLAPTable.java
@@ -19,6 +19,8 @@
 package org.apache.kylin.query.schema;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -218,6 +220,12 @@ public class OLAPTable extends AbstractQueryableTable implements TranslatableTab
             logger.info("To avoid overflow, upgraded {}'s type from {} to {}", tableColumns.get(index), tableColumns.get(index).getType(), tableColumns.get(index).getUpgradedType());
         }
 
+        Collections.sort(tableColumns, new Comparator<ColumnDesc>() {
+            @Override
+            public int compare(ColumnDesc o1, ColumnDesc o2) {
+                return o1.getZeroBasedIndex() - o2.getZeroBasedIndex();
+            }
+        });
         return Lists.newArrayList(Iterables.concat(tableColumns, metricColumns));
     }