[2/5] kylin git commit: KYLIN-2481 fix ModelChooser

[billyliu]

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/f3ad6ca7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f3ad6ca7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f3ad6ca7

Branch: refs/heads/yang22-hbase102
Commit: f3ad6ca7d6dec2fca9ce66d6c53646c1102f27bd
Parents: 4849c30
Author: Li Yang 
Authored: Sat Mar 4 17:03:23 2017 +0800
Committer: Li Yang 
Committed: Sat Mar 4 17:03:23 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/f3ad6ca7/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 ccb2900..1dec30e 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
@@ -137,7 +137,12 @@ public class ModelChooser {
 TreeMap result = Maps.newTreeMap(new 
Comparator() {
 @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);

[2/5] kylin git commit: KYLIN-2481 fix ModelChooser

[billyliu]

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/f3ad6ca7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f3ad6ca7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f3ad6ca7

Branch: refs/heads/yang22-cdh5.7
Commit: f3ad6ca7d6dec2fca9ce66d6c53646c1102f27bd
Parents: 4849c30
Author: Li Yang 
Authored: Sat Mar 4 17:03:23 2017 +0800
Committer: Li Yang 
Committed: Sat Mar 4 17:03:23 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/f3ad6ca7/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 ccb2900..1dec30e 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
@@ -137,7 +137,12 @@ public class ModelChooser {
 TreeMap result = Maps.newTreeMap(new 
Comparator() {
 @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);