You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/10/06 00:20:35 UTC
zeppelin git commit: [ZEPPELIN-3528] [branch-0.8] Ordering by
interpreter name in same interpreter group
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 ee116a212 -> 058fc1b36
[ZEPPELIN-3528] [branch-0.8] Ordering by interpreter name in same interpreter group
### What is this PR for?
Merge for branch-0.8.
In 'Create new note' diagram, 'Default Interpreter' is ordered by only interpreter groups.
But interpreter is not ordered in same interpreter group.
(It seems to be ordered by hashcode of 'InterpreterSetting')
When there are many interpreter in same group and this group is first,
user cannot predict what interpreter is showed first.
So I think that interpreter need to be ordered by name.
### What type of PR is it?
[Improvement]
### Todos
* [x] - Modify Code
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3528
### How should this be tested?
* Click 'create new note'
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update?
* No
* Is there breaking changes for older versions?
* No
* Does this needs documentation?
* No
Author: Jaehoon Jeong <jaehoon.jeongwoowahan.com>
Closes #3005 from woowahan-jaehoon/ZEPPELIN-3528 and squashes the following commits:
5cb709ce3 [Jaehoon Jeong] [ZEPPELIN-3528] Ordering by interpreter name in same interpreter group
### What is this PR for?
A few sentences describing the overall goals of the pull request's commits.
First time? Check out the contributing guide - https://zeppelin.apache.org/contribution/contributions.html
### What type of PR is it?
[Bug Fix | Improvement | Feature | Documentation | Hot Fix | Refactoring]
### Todos
* [ ] - Task
### What is the Jira issue?
* Open an issue on Jira https://issues.apache.org/jira/browse/ZEPPELIN/
* Put link here, and add [ZEPPELIN-*Jira number*] in PR title, eg. [ZEPPELIN-533]
### How should this be tested?
* First time? Setup Travis CI as described on https://zeppelin.apache.org/contribution/contributions.html#continuous-integration
* Strongly recommended: add automated unit tests for any new or changed behavior
* Outline any manual steps to test the PR here.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update?
* Is there breaking changes for older versions?
* Does this needs documentation?
Author: Jaehoon Jeong <ja...@woowahan.com>
Closes #3202 from weand/branch-0.8 and squashes the following commits:
00af514ea [Jaehoon Jeong] [ZEPPELIN-3528] Ordering by interpreter name in same interpreter group
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/058fc1b3
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/058fc1b3
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/058fc1b3
Branch: refs/heads/branch-0.8
Commit: 058fc1b36dc8697062485c711ac768a8b78964b0
Parents: ee116a2
Author: Jaehoon Jeong <ja...@woowahan.com>
Authored: Tue Jun 5 20:39:55 2018 +0900
Committer: Jeff Zhang <zj...@apache.org>
Committed: Sat Oct 6 08:20:22 2018 +0800
----------------------------------------------------------------------
.../org/apache/zeppelin/interpreter/InterpreterSettingManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/058fc1b3/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
index 5d465bd..2a36a64 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
@@ -899,7 +899,7 @@ public class InterpreterSettingManager implements InterpreterSettingManagerMBean
} else if (i > j) {
return 1;
} else {
- return 0;
+ return o1.getName().compareTo(o2.getName());
}
}
});