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/03/12 11:48:46 UTC
[14/48] kylin git commit: KYLIN-2481 fix ModelChooser
KYLIN-2481 fix ModelChooser
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/29dc1dd0
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/29dc1dd0
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/29dc1dd0
Branch: refs/heads/master-hbase0.98
Commit: 29dc1dd095ed70044f8f6a00e1ecfe8e0d1b0757
Parents: 4d2fa3c
Author: Li Yang <li...@apache.org>
Authored: Sat Mar 4 17:03:23 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Sat Mar 4 17:09:39 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/query/routing/ModelChooser.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/29dc1dd0/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java b/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java
index 507b371..f842345 100644
--- a/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java
+++ b/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java
@@ -163,7 +163,12 @@ public class ModelChooser {
TreeMap<DataModelDesc, Set<IRealization>> result = Maps.newTreeMap(new Comparator<DataModelDesc>() {
@Override
public int compare(DataModelDesc o1, DataModelDesc o2) {
- return costs.get(o1).compareTo(costs.get(o2));
+ RealizationCost c1 = costs.get(o1);
+ RealizationCost c2 = costs.get(o2);
+ int comp = c1.compareTo(c2);
+ if (comp == 0)
+ comp = o1.getName().compareTo(o2.getName());
+ return comp;
}
});
result.putAll(models);