zeppelin git commit: [ZEPPELIN-2336] Fix note reload on another note create/rename/remove
Repository: zeppelin
Updated Branches:
refs/heads/master c87fa53a3 -> e7882b6db
[ZEPPELIN-2336] Fix note reload on another note create/rename/remove
### What is this PR for?
This is to fix the issue with repeated note reload when some other note is
created/renamed/removed
### What type of PR is it?
Bug Fix
### Todos
* [x] - don't initialise controller on note list update
### What is the Jira issue?
[ZEPPELIN-2336](https://issues.apache.org/jira/browse/ZEPPELIN-2336)
### How should this be tested?
Described in
[ZEPPELIN-2336](https://issues.apache.org/jira/browse/ZEPPELIN-2336),
also additional test from
[ZEPPELIN-1145](https://issues.apache.org/jira/browse/ZEPPELIN-1145) would be
nice
### 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: Khalid Huseynov
Closes #2216 from khalidhuseynov/fix/ZEPPELIN-2336 and squashes the following
commits:
7454336 [Khalid Huseynov] fix js test
e53edc0 [Khalid Huseynov] remove init controller on note_info
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e7882b6d
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e7882b6d
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e7882b6d
Branch: refs/heads/master
Commit: e7882b6db4752392329d5c26c5921fe7376f5b20
Parents: c87fa53
Author: Khalid Huseynov
Authored: Tue Apr 4 16:09:19 2017 +0900
Committer: Lee moon soo
Committed: Wed Apr 5 04:35:01 2017 +0900
--
zeppelin-web/src/app/notebook/notebook.controller.js | 5 -
zeppelin-web/src/app/notebook/notebook.controller.test.js | 8
2 files changed, 4 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e7882b6d/zeppelin-web/src/app/notebook/notebook.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js
b/zeppelin-web/src/app/notebook/notebook.controller.js
index 7846725..5fde0f4 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -128,11 +128,6 @@ function NotebookCtrl($scope, $route, $routeParams,
$location, $rootScope,
initNotebook();
- // force notebook reload on user change
- $scope.$on('setNoteMenu', function(event, note) {
-initNotebook();
- });
-
$scope.focusParagraphOnClick = function(clickEvent) {
if (!$scope.note) {
return;
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e7882b6d/zeppelin-web/src/app/notebook/notebook.controller.test.js
--
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.test.js
b/zeppelin-web/src/app/notebook/notebook.controller.test.js
index df90c81..6df6893 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.test.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.test.js
@@ -126,14 +126,14 @@ describe('Controller: NotebookCtrl', function() {
spyOn(websocketMsgSrvMock, 'listRevisionHistory');
scope.$broadcast('setNoteMenu');
-expect(websocketMsgSrvMock.getNote.calls.count()).toEqual(1);
-expect(websocketMsgSrvMock.listRevisionHistory.calls.count()).toEqual(1);
+expect(websocketMsgSrvMock.getNote.calls.count()).toEqual(0);
+expect(websocketMsgSrvMock.listRevisionHistory.calls.count()).toEqual(0);
websocketMsgSrvMock.getNote.calls.reset();
websocketMsgSrvMock.listRevisionHistory.calls.reset();
scope.$broadcast('setNoteMenu');
-expect(websocketMsgSrvMock.getNote.calls.count()).toEqual(1);
-expect(websocketMsgSrvMock.listRevisionHistory.calls.count()).toEqual(1);
+expect(websocketMsgSrvMock.getNote.calls.count()).toEqual(0);
+expect(websocketMsgSrvMock.listRevisionHistory.calls.count()).toEqual(0);
});
});
zeppelin git commit: [ZEPPELIN-2336] Fix note reload on another note create/rename/remove
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 9e6e65c4e -> ac3c5f40c
[ZEPPELIN-2336] Fix note reload on another note create/rename/remove
### What is this PR for?
This is to fix the issue with repeated note reload when some other note is
created/renamed/removed
### What type of PR is it?
Bug Fix
### Todos
* [x] - don't initialise controller on note list update
### What is the Jira issue?
[ZEPPELIN-2336](https://issues.apache.org/jira/browse/ZEPPELIN-2336)
### How should this be tested?
Described in
[ZEPPELIN-2336](https://issues.apache.org/jira/browse/ZEPPELIN-2336),
also additional test from
[ZEPPELIN-1145](https://issues.apache.org/jira/browse/ZEPPELIN-1145) would be
nice
### 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: Khalid Huseynov
Closes #2216 from khalidhuseynov/fix/ZEPPELIN-2336 and squashes the following
commits:
7454336 [Khalid Huseynov] fix js test
e53edc0 [Khalid Huseynov] remove init controller on note_info
(cherry picked from commit e7882b6db4752392329d5c26c5921fe7376f5b20)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ac3c5f40
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ac3c5f40
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ac3c5f40
Branch: refs/heads/branch-0.7
Commit: ac3c5f40cd201ac2e93ccd4d7ce25f6be1e693d0
Parents: 9e6e65c
Author: Khalid Huseynov
Authored: Tue Apr 4 16:09:19 2017 +0900
Committer: Lee moon soo
Committed: Wed Apr 5 04:35:13 2017 +0900
--
zeppelin-web/src/app/notebook/notebook.controller.js | 5 -
zeppelin-web/src/app/notebook/notebook.controller.test.js | 8
2 files changed, 4 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ac3c5f40/zeppelin-web/src/app/notebook/notebook.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js
b/zeppelin-web/src/app/notebook/notebook.controller.js
index 9f27d7d..97d8335 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -141,11 +141,6 @@ function NotebookCtrl($scope, $route, $routeParams,
$location, $rootScope,
initNotebook();
- // force notebook reload on user change
- $scope.$on('setNoteMenu', function(event, note) {
-initNotebook();
- });
-
$scope.focusParagraphOnClick = function(clickEvent) {
if (!$scope.note) {
return;
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ac3c5f40/zeppelin-web/src/app/notebook/notebook.controller.test.js
--
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.test.js
b/zeppelin-web/src/app/notebook/notebook.controller.test.js
index df90c81..6df6893 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.test.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.test.js
@@ -126,14 +126,14 @@ describe('Controller: NotebookCtrl', function() {
spyOn(websocketMsgSrvMock, 'listRevisionHistory');
scope.$broadcast('setNoteMenu');
-expect(websocketMsgSrvMock.getNote.calls.count()).toEqual(1);
-expect(websocketMsgSrvMock.listRevisionHistory.calls.count()).toEqual(1);
+expect(websocketMsgSrvMock.getNote.calls.count()).toEqual(0);
+expect(websocketMsgSrvMock.listRevisionHistory.calls.count()).toEqual(0);
websocketMsgSrvMock.getNote.calls.reset();
websocketMsgSrvMock.listRevisionHistory.calls.reset();
scope.$broadcast('setNoteMenu');
-expect(websocketMsgSrvMock.getNote.calls.count()).toEqual(1);
-expect(websocketMsgSrvMock.listRevisionHistory.calls.count()).toEqual(1);
+expect(websocketMsgSrvMock.getNote.calls.count()).toEqual(0);
+expect(websocketMsgSrvMock.listRevisionHistory.calls.count()).toEqual(0);
});
});
zeppelin git commit: [ZEPPELIN-2348] Line chart setting is not rendered (master)
Repository: zeppelin
Updated Branches:
refs/heads/master e7882b6db -> 6ae578cad
[ZEPPELIN-2348] Line chart setting is not rendered (master)
### What is this PR for?
Line chart setting is not rendered.
### What type of PR is it?
[Bug Fix]
### Todos
None.
### What is the Jira issue?
[ZEPPELIN-2348](https://issues.apache.org/jira/browse/ZEPPELIN-2348)
### How should this be tested?
1. Open the default line chart's setting
2. Check checkboxes for options.
### Screenshots (if appropriate)
After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2218 from 1ambda/ZEPPELIN-2348/line-chart-setting-msater and squashes
the following commits:
0f3ea04 [1ambda] fix: Tr, Vis setting
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/6ae578ca
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/6ae578ca
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/6ae578ca
Branch: refs/heads/master
Commit: 6ae578cadf92b20f629a5888f7381da3eaa881c5
Parents: e7882b6
Author: 1ambda <1am...@gmail.com>
Authored: Tue Apr 4 14:00:18 2017 +0900
Committer: Lee moon soo
Committed: Wed Apr 5 04:37:55 2017 +0900
--
.../notebook/paragraph/result/result.controller.js | 16
1 file changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6ae578ca/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
--
diff --git
a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
index 6b26595..5708339 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
@@ -468,6 +468,14 @@ function ResultCtrl($scope, $rootScope, $route, $window,
$routeParams, $location
}
}
+ const getTrSettingElem = function(scopeId, graphMode) {
+return angular.element('#trsetting' + scopeId + '_' + graphMode)
+ }
+
+ const getVizSettingElem = function(scopeId, graphMode) {
+return angular.element('#vizsetting' + scopeId + '_' + graphMode)
+ }
+
const renderGraph = function(graphElemId, graphMode, refresh) {
// set graph height
const height = $scope.config.graph.height;
@@ -495,8 +503,8 @@ function ResultCtrl($scope, $rootScope, $route, $window,
$routeParams, $location
// render when targetEl is available
afterLoaded = function(loadedElem) {
try {
- const transformationSettingTargetEl = angular.element('#trsetting' +
$scope.id + '_' + graphMode);
- const visualizationSettingTargetEl = angular.element('#trsetting' +
$scope.id + '_' + graphMode);
+ const transformationSettingTargetEl = getTrSettingElem($scope.id,
graphMode)
+ const visualizationSettingTargetEl = getVizSettingElem($scope.id,
graphMode)
// set height
loadedElem.height(height);
@@ -537,8 +545,8 @@ function ResultCtrl($scope, $rootScope, $route, $window,
$routeParams, $location
console.log('Refresh data %o', tableData);
afterLoaded = function(loadedElem) {
-const transformationSettingTargetEl = angular.element('#trsetting' +
$scope.id + '_' + graphMode);
-const visualizationSettingTargetEl = angular.element('#trsetting' +
$scope.id + '_' + graphMode);
+const transformationSettingTargetEl = getTrSettingElem($scope.id,
graphMode)
+const visualizationSettingTargetEl = getVizSettingElem($scope.id,
graphMode)
const config = getVizConfig(graphMode);
loadedElem.height(height);
const transformation = builtInViz.instance.getTransformation();
zeppelin git commit: [ZEPPELIN-2348] Line chart setting is not rendered (branch-0.7)
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 ac3c5f40c -> 4021520f7
[ZEPPELIN-2348] Line chart setting is not rendered (branch-0.7)
### What is this PR for?
Line chart setting is not rendered.
### What type of PR is it?
[Bug Fix]
### Todos
None.
### What is the Jira issue?
[ZEPPELIN-2348](https://issues.apache.org/jira/browse/ZEPPELIN-2348)
### How should this be tested?
1. Open the default line chart's setting
2. Check checkboxes for options.
### Screenshots (if appropriate)
After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2219 from 1ambda/ZEPPELIN-2348/line-chart-setting and squashes the
following commits:
4216587 [1ambda] fix: overwriting trSetting
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4021520f
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4021520f
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4021520f
Branch: refs/heads/branch-0.7
Commit: 4021520f782d026915eac565b77e8954f73df52c
Parents: ac3c5f4
Author: 1ambda <1am...@gmail.com>
Authored: Tue Apr 4 15:44:28 2017 +0900
Committer: Lee moon soo
Committed: Wed Apr 5 04:39:47 2017 +0900
--
.../src/app/notebook/paragraph/result/result.controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4021520f/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
--
diff --git
a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
index 9b95b40..e7026f7 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
@@ -456,7 +456,7 @@ function ResultCtrl($scope, $rootScope, $route, $window,
$routeParams, $location
var retryRenderer = function() {
var targetEl = angular.element('#p' + $scope.id + '_' + type);
var transformationSettingTargetEl = angular.element('#trsetting' +
$scope.id + '_' + type);
- var visualizationSettingTargetEl = angular.element('#trsetting' +
$scope.id + '_' + type);
+ var visualizationSettingTargetEl = angular.element('#vizsetting' +
$scope.id + '_' + type);
if (targetEl.length) {
var config = getVizConfig(type);
targetEl.height(height);
zeppelin git commit: [ZEPPELIN-1492] fixing the issue where updating a paragraph was not propagated correctly
Repository: zeppelin
Updated Branches:
refs/heads/master 6ae578cad -> c23aa8871
[ZEPPELIN-1492] fixing the issue where updating a paragraph was not propagated
correctly
### What is this PR for?
This pull request fixes two issues regarding paragraphs not being updated and
therefore overwritten unintentionally. The first issue yields to local changes
being overwritten when remote changes are made. The second issue yields to
changes being overwritten when, e.g., the notebook is renamed.
The first change happens in the `updateParagraph` broadcast event handler
function. This function has the purpose to update the local state of the
paragraph in the paragraph controller scope when there is an update from the
web socket.
However, it did not update the state if the only thing that has changed was the
text. Now it will, which fixes the original issue in the issue description.
This was one of the issues identified by
https://issues.apache.org/jira/browse/ZEPPELIN-1492?focusedCommentId=15744928&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-15744928
The second issue is fixed by saving the paragraph when the editor loses focus.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
- https://issues.apache.org/jira/browse/ZEPPELIN-1492
### How should this be tested?
The first issue can be reproduced with the following two browser-windows and a
single notebook.
Browser A:
```
%pyspark
print "Original Zeppelin Notebook"
```
In Browser B, edit the notebook and the above command to:
```
%pyspark
print "Notebook is updated"
```
If I run the notebook via browser A followed by Browser B, everything is
updated nicely. Now also if I you add the following line to the Notebook though
Browser B:
```
print "once again"
```
and run the notebook through Browser B again, the content in Browser A will be
updated.
The second issue can be reproduced by editing a cell without executing it and
renaming the notebook right afterwards. The rename will reset your cell to the
previous state. With the fix, your state is saved.
Author: Frank Rosner
Closes #2120 from FRosner/ZEPPELIN-1492 and squashes the following commits:
be28a5d [Frank Rosner] ZEPPELIN-1492 save paragraph on editor blur
4a0cf72 [Frank Rosner] ZEPPELIN-1492 newPara is already a paragraph I guess :S
c5c53fd [Frank Rosner] ZEPPELIN-1492 also update paragraph if the text has
changed
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c23aa887
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c23aa887
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c23aa887
Branch: refs/heads/master
Commit: c23aa88717488788d88305f34a36ee9cddc90152
Parents: 6ae578c
Author: Frank Rosner
Authored: Mon Mar 13 11:32:08 2017 +0100
Committer: Lee moon soo
Committed: Wed Apr 5 04:56:52 2017 +0900
--
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c23aa887/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index f0c301b..dbc6f4d 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -681,6 +681,7 @@ function ParagraphCtrl($scope, $rootScope, $route, $window,
$routeParams, $locat
$scope.editor.on('blur', function() {
handleFocus(false);
+$scope.saveParagraph($scope.paragraph);
});
$scope.editor.on('paste', function(e) {
@@ -1120,6 +1121,7 @@ function ParagraphCtrl($scope, $rootScope, $route,
$window, $routeParams, $locat
function isUpdateRequired(oldPara, newPara) {
return (newPara.id === oldPara.id &&
(newPara.dateCreated !== oldPara.dateCreated ||
+ newPara.text !== oldPara.text ||
newPara.dateFinished !== oldPara.dateFinished ||
newPara.dateStarted !== oldPara.dateStarted ||
newPara.dateUpdated !== oldPara.dateUpdated ||
zeppelin git commit: [ZEPPELIN-1492] fixing the issue where updating a paragraph was not propagated correctly
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 4021520f7 -> 42af64bb9
[ZEPPELIN-1492] fixing the issue where updating a paragraph was not propagated
correctly
This pull request fixes two issues regarding paragraphs not being updated and
therefore overwritten unintentionally. The first issue yields to local changes
being overwritten when remote changes are made. The second issue yields to
changes being overwritten when, e.g., the notebook is renamed.
The first change happens in the `updateParagraph` broadcast event handler
function. This function has the purpose to update the local state of the
paragraph in the paragraph controller scope when there is an update from the
web socket.
However, it did not update the state if the only thing that has changed was the
text. Now it will, which fixes the original issue in the issue description.
This was one of the issues identified by
https://issues.apache.org/jira/browse/ZEPPELIN-1492?focusedCommentId=15744928&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-15744928
The second issue is fixed by saving the paragraph when the editor loses focus.
Bug Fix
- https://issues.apache.org/jira/browse/ZEPPELIN-1492
The first issue can be reproduced with the following two browser-windows and a
single notebook.
Browser A:
```
%pyspark
print "Original Zeppelin Notebook"
```
In Browser B, edit the notebook and the above command to:
```
%pyspark
print "Notebook is updated"
```
If I run the notebook via browser A followed by Browser B, everything is
updated nicely. Now also if I you add the following line to the Notebook though
Browser B:
```
print "once again"
```
and run the notebook through Browser B again, the content in Browser A will be
updated.
The second issue can be reproduced by editing a cell without executing it and
renaming the notebook right afterwards. The rename will reset your cell to the
previous state. With the fix, your state is saved.
Author: Frank Rosner
Closes #2120 from FRosner/ZEPPELIN-1492 and squashes the following commits:
be28a5d [Frank Rosner] ZEPPELIN-1492 save paragraph on editor blur
4a0cf72 [Frank Rosner] ZEPPELIN-1492 newPara is already a paragraph I guess :S
c5c53fd [Frank Rosner] ZEPPELIN-1492 also update paragraph if the text has
changed
(cherry picked from commit c23aa88717488788d88305f34a36ee9cddc90152)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/42af64bb
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/42af64bb
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/42af64bb
Branch: refs/heads/branch-0.7
Commit: 42af64bb9d7a90f06a4ece07b7d9d6b59457466b
Parents: 4021520
Author: Frank Rosner
Authored: Mon Mar 13 11:32:08 2017 +0100
Committer: Lee moon soo
Committed: Wed Apr 5 04:59:30 2017 +0900
--
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/42af64bb/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index c40a56d..5e1d5c5 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -554,6 +554,7 @@ function ParagraphCtrl($scope, $rootScope, $route, $window,
$routeParams, $locat
$scope.editor.on('blur', function() {
handleFocus(false);
+$scope.saveParagraph($scope.paragraph);
});
$scope.editor.on('paste', function(e) {
@@ -993,6 +994,7 @@ function ParagraphCtrl($scope, $rootScope, $route, $window,
$routeParams, $locat
$scope.$on('updateParagraph', function(event, data) {
if (data.paragraph.id === $scope.paragraph.id &&
(data.paragraph.dateCreated !== $scope.paragraph.dateCreated ||
+ data.paragraph.text !== $scope.paragraph.text ||
data.paragraph.dateFinished !== $scope.paragraph.dateFinished ||
data.paragraph.dateStarted !== $scope.paragraph.dateStarted ||
data.paragraph.dateUpdated !== $scope.paragraph.dateUpdated ||
zeppelin git commit: [MINOR] remove typo in line and area chart
Repository: zeppelin
Updated Branches:
refs/heads/master c23aa8871 -> 8a7117248
[MINOR] remove typo in line and area chart
### What is this PR for?
The line and area chart have the typo `xLables`, not `xLabels`.
However, this line is not necessary, because `xLabels` is defined by `render`
function. That's why these chart was working well.
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
* None
### How should this be tested?
- Run line and area chart and check whether it works well or not.
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: soralee
Closes #2214 from soralee/ZEPPLIN_remove_initial_code_in_Chart and squashes the
following commits:
c4ec2ee [soralee] remove initial code in chart
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8a711724
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8a711724
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8a711724
Branch: refs/heads/master
Commit: 8a71172481299d1c28d8acfed776f6f8369c1ea2
Parents: c23aa88
Author: soralee
Authored: Mon Apr 3 13:09:10 2017 +0900
Committer: Lee moon soo
Committed: Wed Apr 5 05:05:15 2017 +0900
--
.../src/app/visualization/builtins/visualization-areachart.js | 1 -
.../src/app/visualization/builtins/visualization-linechart.js | 1 -
2 files changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8a711724/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
--
diff --git
a/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
b/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
index 25ed16f..4e0d318 100644
--- a/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
@@ -23,7 +23,6 @@ export default class AreachartVisualization extends
Nvd3ChartVisualization {
super(targetEl, config);
this.pivot = new PivotTransformation(config);
-this.xLables = [];
};
type() {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8a711724/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
--
diff --git
a/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
b/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
index 02a2114..577001f 100644
--- a/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
@@ -23,7 +23,6 @@ export default class LinechartVisualization extends
Nvd3ChartVisualization {
super(targetEl, config);
this.pivot = new PivotTransformation(config);
-this.xLables = [];
};
type() {
zeppelin git commit: [MINOR] remove typo in line and area chart
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 42af64bb9 -> 78804bb78
[MINOR] remove typo in line and area chart
### What is this PR for?
The line and area chart have the typo `xLables`, not `xLabels`.
However, this line is not necessary, because `xLabels` is defined by `render`
function. That's why these chart was working well.
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
* None
### How should this be tested?
- Run line and area chart and check whether it works well or not.
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: soralee
Closes #2214 from soralee/ZEPPLIN_remove_initial_code_in_Chart and squashes the
following commits:
c4ec2ee [soralee] remove initial code in chart
(cherry picked from commit 8a71172481299d1c28d8acfed776f6f8369c1ea2)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/78804bb7
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/78804bb7
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/78804bb7
Branch: refs/heads/branch-0.7
Commit: 78804bb78f37733847b5f7df45825f3048a4a95f
Parents: 42af64b
Author: soralee
Authored: Mon Apr 3 13:09:10 2017 +0900
Committer: Lee moon soo
Committed: Wed Apr 5 05:05:28 2017 +0900
--
.../src/app/visualization/builtins/visualization-areachart.js | 1 -
.../src/app/visualization/builtins/visualization-linechart.js | 1 -
2 files changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/78804bb7/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
--
diff --git
a/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
b/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
index 25ed16f..4e0d318 100644
--- a/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
@@ -23,7 +23,6 @@ export default class AreachartVisualization extends
Nvd3ChartVisualization {
super(targetEl, config);
this.pivot = new PivotTransformation(config);
-this.xLables = [];
};
type() {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/78804bb7/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
--
diff --git
a/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
b/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
index aab51f8..f48227d 100644
--- a/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
@@ -23,7 +23,6 @@ export default class LinechartVisualization extends
Nvd3ChartVisualization {
super(targetEl, config);
this.pivot = new PivotTransformation(config);
-this.xLables = [];
};
type() {
zeppelin git commit: [ZEPPELIN-2257] notification about incompleteness of data
Repository: zeppelin
Updated Branches:
refs/heads/master 85c525200 -> 61b7162fb
[ZEPPELIN-2257] notification about incompleteness of data
### What is this PR for?
Added notification about exceeding the limit in the result.
### What type of PR is it?
Improvement
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2257
### How should this be tested?
1. Create table *test* with more than 2 records (if not exists)
2. Set parameter `common.max_count ` = 2
3. Execute
```
%jdbc
select *from test
```
You should see message about exceeds limit
### 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: Tinkoff DWH
Closes #2134 from tinkoff-dwh/ZEPPELIN-2257 and squashes the following commits:
367ac65 [Tinkoff DWH] [ZEPPELIN-2257] merge
1048214 [Tinkoff DWH] Merge remote-tracking branch 'origin/master' into
ZEPPELIN-2257
3c52b52 [Tinkoff DWH] [ZEPPELIN-2257] custom css class for alert
2e6c976 [Tinkoff DWH] [ZEPPELIN-2257] close button to alert
d6dbe3e [Tinkoff DWH] Merge remote-tracking branch 'origin/master' into
ZEPPELIN-2257
edeca0e [Tinkoff DWH] [ZEPPELIN-2257] notifications about incompleteness of data
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/61b7162f
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/61b7162f
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/61b7162f
Branch: refs/heads/master
Commit: 61b7162fb850c682d8f3f6467816cc17a95f65f9
Parents: 85c5252
Author: Tinkoff DWH
Authored: Mon Apr 3 15:33:50 2017 +0500
Committer: Lee moon soo
Committed: Thu Apr 6 08:05:29 2017 +0900
--
.../apache/zeppelin/jdbc/JDBCInterpreter.java | 12 +++--
.../zeppelin/jdbc/JDBCInterpreterTest.java | 2 +
.../zeppelin/livy/LivySparkSQLInterpreter.java | 4 +-
.../zeppelin/pig/PigQueryInterpreter.java | 8 ++--
.../zeppelin/pig/PigQueryInterpreterTest.java | 2 +-
.../zeppelin/spark/SparkSqlInterpreter.java | 7 ++-
.../apache/zeppelin/spark/ZeppelinContext.java | 5 ++-
.../zeppelin/spark/SparkSqlInterpreterTest.java | 19 +++-
.../zeppelin/interpreter/InterpreterOutput.java | 6 +--
.../zeppelin/interpreter/InterpreterResult.java | 4 ++
.../zeppelin/interpreter/ResultMessages.java| 46
.../interpreter/InterpreterOutputTest.java | 6 ++-
.../app/notebook/paragraph/result/result.css| 12 +++--
13 files changed, 111 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/61b7162f/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
--
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index 1080c2b..47cdfcc 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -47,6 +47,7 @@ import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
+import org.apache.zeppelin.interpreter.ResultMessages;
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.apache.zeppelin.jdbc.security.JDBCSecurityImpl;
import org.apache.zeppelin.scheduler.Scheduler;
@@ -474,7 +475,7 @@ public class JDBCInterpreter extends Interpreter {
msg.append(NEWLINE);
int displayRowCount = 0;
-while (resultSet.next() && displayRowCount < getMaxResult()) {
+while (displayRowCount < getMaxResult() && resultSet.next()) {
for (int i = 1; i < md.getColumnCount() + 1; i++) {
Object resultObject;
String resultValue;
@@ -602,8 +603,13 @@ public class JDBCInterpreter extends Interpreter {
interpreterResult.add(InterpreterResult.Type.TEXT,
"Query executed successfully.");
} else {
- interpreterResult.add(
- getResults(resultSet, !containsIgnoreCase(sqlToExecute,
EXPLAIN_PREDICATE)));
+ String results = getResults(resultSet,
+ !containsIgnoreCase(sqlToExecute, EXPLAIN_PREDICATE));
+ interpreterResult.add(results);
+ if (resultSet.next()) {
+
interpreterResult.add(ResultMessages.getExceedsLimitRowsMessage(getMaxResult(),
+
zeppelin git commit: [ZEPPELIN-2088] Bundle helium packages one by one
Repository: zeppelin Updated Branches: refs/heads/master 495be1ede -> 241fd0344 [ZEPPELIN-2088] Bundle helium packages one by one ### What is this PR for? Bundle helium packages one by one because Summary Let's say you have one helium package called `ultimate-line-chart`. **1. Package Path** - **(before)** `$ZEPPELIN_HOME/local-repo/helium-bundles/node_modules/ultimate-line-chart` - **(after)** `$ZEPPELIN_HOME/local-repo/helium-bundles/bundles/ultimate-line-chart` **2. Zeppelin Local Module Path** - **(before)** `$ZEPPELIN_HOME/local-repo/helium-bundles/node_modules/zeppelin-tabledata` - **(after)** `$ZEPPELIN_HOME/local-repo/helium-bundles/local_modules/zeppelin-tabledata` **3. Bundle Cache Path** - **(before)** `$ZEPPELIN_HOME/local-repo/helium-bundles/helium.bundle.cache.js` (mixed one) - **(after)** `$ZEPPELIN_HOME/local-repo/helium-bundles/bundles/ultimate-line-chart/helium.bundle.cache.js` (for each helium package) Details - Bundling them in one file is not good idea because the whole bundling is broken when only 1 bundle fails - Some node packages might not installed correctly. For example, `amchart/amcharts3` will be installed in `helium-bundles/node_modules/my-helium-vis/node_modules` but `amchart-export` will be placed in `helium-bundles/node_modules` so `my-helium-vis` can't import `amchart-export`. (This is real case) - Additionally, I used yarn to install required node_modules. separated bundling requires install same dependencies multiple times. This takes more time than before and npm is too slow to install them all. - Install Zeppelin framework modules using [local path](https://docs.npmjs.com/files/package.json#local-paths). It's more safe and correct way to install local modules. ### What type of PR is it? [Improvement] ### Todos NONE ### What is the Jira issue? [ZEPPELIN-2088](https://issues.apache.org/jira/browse/ZEPPELIN-2088) ### How should this be tested? 1. Install any local helium package 2. Install any online helium package 3. Use them 4. Disable 5. Test `npm run dev:helium` ### Screenshots (if appropriate) NONE ### Questions: * Does the licenses files need update? - NO * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <1am...@gmail.com> Closes #2210 from 1ambda/ZEPPELIN-2088/evaluate-helium-bundle-one-by-one and squashes the following commits: bea6c09 [1ambda] fix: Bundling errors 53145fa [1ambda] fix: Add error handling for failed bundle 212c737 [1ambda] feat: Apply #2178 736acee [1ambda] fix: Add nodeInstallationDir 11ef0ae [1ambda] fix: HeliumBundleFactoryTest 5a2a938 [1ambda] fix: Log single bundle error to browser console a99f981 [1ambda] test: Fix APIs 743aba4 [1ambda] feat: Loading bundles 697c5e6 [1ambda] feat: enable, disable 002e66f [1ambda] feat: Build online packages 512508d [1ambda] feat: Build each bundle using yarn Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/241fd034 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/241fd034 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/241fd034 Branch: refs/heads/master Commit: 241fd0344da3f6fbda7ba8d0976a85a51e3c33e9 Parents: 495be1e Author: 1ambda <1am...@gmail.com> Authored: Tue Apr 4 17:59:14 2017 +0900 Committer: Lee moon soo Committed: Sun Apr 9 07:48:31 2017 +0900 -- .../org/apache/zeppelin/rest/HeliumRestApi.java | 50 +- .../apache/zeppelin/server/ZeppelinServer.java | 4 +- .../src/components/helium/helium.service.js | 100 ++-- zeppelin-zengine/pom.xml| 5 + .../java/org/apache/zeppelin/helium/Helium.java | 36 +- .../zeppelin/helium/HeliumBundleFactory.java| 479 +-- .../zeppelin/helium/HeliumLocalRegistry.java| 1 - .../src/main/resources/helium/package.json | 8 +- .../src/main/resources/helium/webpack.config.js | 55 +-- .../helium/HeliumBundleFactoryTest.java | 45 +- 10 files changed, 513 insertions(+), 270 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/241fd034/zeppelin-server/src/main/java/org/apache/zeppelin/rest/HeliumRestApi.java -- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/HeliumRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/HeliumRestApi.java index 9234cc5..44b583c 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/HeliumRestApi.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/HeliumRestApi.java @@ -24,6 +24,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.zeppelin.helium.Helium; import org.apache.zeppelin
zeppelin git commit: [ZEPPELIN-2279] excluded comments from SQL
Repository: zeppelin
Updated Branches:
refs/heads/master 241fd0344 -> f9830a7d6
[ZEPPELIN-2279] excluded comments from SQL
### What is this PR for?
Exclusion comments (single-, multiline) from queries before execution. Comments
don't need to execute query and sometimes there are errors.
### What type of PR is it?
Bug Fix | Improvement
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2279
### How should this be tested?
```
/* ; */
select 1;
-- text select 1
/* bla
bla
bla*/
select 1; -- text
```
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Tinkoff DWH
Closes #2158 from tinkoff-dwh/ZEPPELIN-2279 and squashes the following commits:
3f7496e [Tinkoff DWH] [ZEPPELIN-2279] fix conditions, common format
f48f7d6 [Tinkoff DWH] [ZEPPELIN-2279] improve test, revert precode execution
2cb94fa [Tinkoff DWH] Merge remote-tracking branch 'origin/master' into
ZEPPELIN-2279
6db3c46 [Tinkoff DWH] [ZEPPELIN-2279] excluded comments from SQL
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f9830a7d
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f9830a7d
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f9830a7d
Branch: refs/heads/master
Commit: f9830a7d64921c1f67aeb6ee179b574769e0a6f9
Parents: 241fd03
Author: Tinkoff DWH
Authored: Wed Apr 5 12:32:44 2017 +0500
Committer: Lee moon soo
Committed: Sun Apr 9 07:50:09 2017 +0900
--
.../apache/zeppelin/jdbc/JDBCInterpreter.java | 46 +---
.../zeppelin/jdbc/JDBCInterpreterTest.java | 28
2 files changed, 67 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f9830a7d/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
--
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index 5bf4063..2e35e81 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -508,19 +508,36 @@ public class JDBCInterpreter extends Interpreter {
protected ArrayList splitSqlQueries(String sql) {
ArrayList queries = new ArrayList<>();
StringBuilder query = new StringBuilder();
-Character character;
+char character;
Boolean antiSlash = false;
+Boolean multiLineComment = false;
+Boolean singleLineComment = false;
Boolean quoteString = false;
Boolean doubleQuoteString = false;
for (int item = 0; item < sql.length(); item++) {
character = sql.charAt(item);
- if (character.equals('\\')) {
+ if ((singleLineComment && (character == '\n' || item == sql.length() -
1))
+ || (multiLineComment && character == '/' && sql.charAt(item - 1) ==
'*')) {
+singleLineComment = false;
+multiLineComment = false;
+if (item == sql.length() - 1 && query.length() > 0) {
+ queries.add(StringUtils.trim(query.toString()));
+}
+continue;
+ }
+
+ if (singleLineComment || multiLineComment) {
+continue;
+ }
+
+ if (character == '\\') {
antiSlash = true;
}
- if (character.equals('\'')) {
+
+ if (character == '\'') {
if (antiSlash) {
antiSlash = false;
} else if (quoteString) {
@@ -529,7 +546,8 @@ public class JDBCInterpreter extends Interpreter {
quoteString = true;
}
}
- if (character.equals('"')) {
+
+ if (character == '"') {
if (antiSlash) {
antiSlash = false;
} else if (doubleQuoteString) {
@@ -539,16 +557,30 @@ public class JDBCInterpreter extends Interpreter {
}
}
- if (character.equals(';') && !antiSlash && !quoteString &&
!doubleQuoteString) {
-queries.add(query.toString());
+ if (!quoteString && !doubleQuoteString && !multiLineComment &&
!singleLineComment
+ && sql.length() > item + 1) {
+if (character == '-' && sql.charAt(item + 1) == '-') {
+ singleLineComment = true;
+ continue;
+}
+
+if (character == '/' && sql.charAt(item + 1) == '*') {
+ multiLineComment = true;
+ continue;
+}
+ }
+
+ if (character == ';' &a
zeppelin git commit: [ZEPPELIN-2357] fix: tooltip doesn't work in btn-group
Repository: zeppelin Updated Branches: refs/heads/master 540ceb87d -> b55231464 [ZEPPELIN-2357] fix: tooltip doesn't work in btn-group ### What is this PR for? tooltip provided by [angular-ui: bootstrap](https://github.com/angular-ui/bootstrap) doesn't work with `btn-group` class. ### What type of PR is it? [Bug Fix] ### Todos * [x] - fixed tooltip issue by bumping version of angular-bootstrap * [x] - added tooltip to charts as like before ### What is the Jira issue? [ZEPPELIN-2357](https://issues.apache.org/jira/browse/ZEPPELIN-2357) ### How should this be tested? 1. Open spark tutorial 2. Test tooltips in notebook controller and in paragraphs. ### Screenshots (if appropriate) Before  After   ### Questions: * Does the licenses files need update? - YES, updated * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <1am...@gmail.com> Closes #2225 from 1ambda/ZEPPELIN-2357/tooltip-doesnt-work-with-btngroup and squashes the following commits: b9365c6 [1ambda] fix: Use uib-pagination directive 2522ff5 [1ambda] fix: Use uib-tooltip in IT classes d03a70e [1ambda] fix: bin license 0b6ad26 [1ambda] feat: Tooltip for charts 1e2db4e [1ambda] fix: Use uib-tooltip instead 62784c8 [1ambda] fix: Bump up angular-bootstrap version Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b5523146 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b5523146 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b5523146 Branch: refs/heads/master Commit: b55231464199f4fd5598970ab2f746f0d254c0b4 Parents: 540ceb8 Author: 1ambda <1am...@gmail.com> Authored: Thu Apr 6 12:11:46 2017 +0900 Committer: Lee moon soo Committed: Tue Apr 11 18:11:54 2017 +0900 -- zeppelin-distribution/src/bin_license/LICENSE | 2 +- .../org/apache/zeppelin/WebDriverManager.java | 2 +- .../zeppelin/integration/AuthenticationIT.java | 2 +- .../zeppelin/integration/SparkParagraphIT.java | 4 +-- zeppelin-web/bower.json | 2 +- zeppelin-web/src/app/credential/credential.html | 2 +- zeppelin-web/src/app/helium/helium.html | 7 ++-- zeppelin-web/src/app/home/home.html | 2 +- .../src/app/home/notebook-template.html | 22 ++--- zeppelin-web/src/app/home/notebook.html | 2 +- .../interpreter-create/interpreter-create.html | 14 .../src/app/interpreter/interpreter.html| 20 ++-- zeppelin-web/src/app/jobmanager/jobmanager.html | 2 +- .../src/app/jobmanager/jobs/job-control.html| 4 +-- zeppelin-web/src/app/jobmanager/jobs/job.html | 14 .../src/app/notebook/notebook-actionBar.html| 34 ++-- zeppelin-web/src/app/notebook/notebook.html | 2 +- .../notebook/paragraph/paragraph-control.html | 18 +-- .../paragraph/result/result-chart-selector.html | 3 +- .../app/notebook/paragraph/result/result.html | 4 +-- zeppelin-web/src/components/navbar/navbar.html | 4 +-- 21 files changed, 83 insertions(+), 83 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b5523146/zeppelin-distribution/src/bin_license/LICENSE -- diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index 9f0c74b..ce5b3bb 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -229,7 +229,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) Json3 v3.3.1 (http://bestiejs.github.io/json3) - https://github.com/bestiejs/json3/blob/v3.3.1/LICENSE (The MIT License) es5-shim v3.1.0 (https://github.com/es-shims/es5-shim) - https://github.com/es-shims/es5-shim/blob/v3.1.0/LICENSE (The MIT License) bootstrap v3.2.0 (http://getbootstrap.com/) - https://github.com/twbs/bootstrap/blob/v3.2.0/LICENSE -(The MIT License) UI Bootstrap v0.13.0 (http://angular-ui.github.io/bootstrap/) - https://github.com/angular-ui/bootstrap/blob/0.13.0/LICENSE +(The MIT License) UI Bootstrap v2.5.0 (http://angular-ui.github.io/bootstrap/) - https://github.com/angular-ui/bootstrap/blob/2.5.0/LICENSE (The MIT License) bootstrap3-dialog v1.34.7 (https://github.com/nakupanda/bootstrap3-dialog/tree/v1.34.7) - htt
zeppelin git commit: [ZEPPELIN-2357] fix: tooltip doesn't work in btn-group
Repository: zeppelin Updated Branches: refs/heads/branch-0.7 46b196575 -> 7e73b0a68 [ZEPPELIN-2357] fix: tooltip doesn't work in btn-group tooltip provided by [angular-ui: bootstrap](https://github.com/angular-ui/bootstrap) doesn't work with `btn-group` class. [Bug Fix] * [x] - fixed tooltip issue by bumping version of angular-bootstrap * [x] - added tooltip to charts as like before [ZEPPELIN-2357](https://issues.apache.org/jira/browse/ZEPPELIN-2357) 1. Open spark tutorial 2. Test tooltips in notebook controller and in paragraphs.    * Does the licenses files need update? - YES, updated * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <1am...@gmail.com> Closes #2225 from 1ambda/ZEPPELIN-2357/tooltip-doesnt-work-with-btngroup and squashes the following commits: b9365c6 [1ambda] fix: Use uib-pagination directive 2522ff5 [1ambda] fix: Use uib-tooltip in IT classes d03a70e [1ambda] fix: bin license 0b6ad26 [1ambda] feat: Tooltip for charts 1e2db4e [1ambda] fix: Use uib-tooltip instead 62784c8 [1ambda] fix: Bump up angular-bootstrap version (cherry picked from commit b55231464199f4fd5598970ab2f746f0d254c0b4) Signed-off-by: Lee moon soo Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7e73b0a6 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7e73b0a6 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7e73b0a6 Branch: refs/heads/branch-0.7 Commit: 7e73b0a687479b8e478add5394403dfda3534d65 Parents: 46b1965 Author: 1ambda <1am...@gmail.com> Authored: Thu Apr 6 12:11:46 2017 +0900 Committer: Lee moon soo Committed: Tue Apr 11 18:19:37 2017 +0900 -- zeppelin-distribution/src/bin_license/LICENSE | 2 +- .../org/apache/zeppelin/WebDriverManager.java | 2 +- .../zeppelin/integration/AuthenticationIT.java | 2 +- .../zeppelin/integration/SparkParagraphIT.java | 4 +-- zeppelin-web/bower.json | 2 +- zeppelin-web/src/app/credential/credential.html | 2 +- zeppelin-web/src/app/helium/helium.html | 3 +- zeppelin-web/src/app/home/home.html | 2 +- .../src/app/home/notebook-template.html | 22 ++--- zeppelin-web/src/app/home/notebook.html | 2 +- .../interpreter-create/interpreter-create.html | 14 .../src/app/interpreter/interpreter.html| 20 ++-- zeppelin-web/src/app/jobmanager/jobmanager.html | 2 +- .../src/app/jobmanager/jobs/job-control.html| 4 +-- zeppelin-web/src/app/jobmanager/jobs/job.html | 14 .../src/app/notebook/notebook-actionBar.html| 34 ++-- zeppelin-web/src/app/notebook/notebook.html | 2 +- .../notebook/paragraph/paragraph-control.html | 12 +++ .../paragraph/result/result-chart-selector.html | 3 +- .../app/notebook/paragraph/result/result.html | 4 +-- zeppelin-web/src/components/navbar/navbar.html | 4 +-- 21 files changed, 78 insertions(+), 78 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7e73b0a6/zeppelin-distribution/src/bin_license/LICENSE -- diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index ae3ea5f..9dec2f5 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -229,7 +229,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) Json3 v3.3.1 (http://bestiejs.github.io/json3) - https://github.com/bestiejs/json3/blob/v3.3.1/LICENSE (The MIT License) es5-shim v3.1.0 (https://github.com/es-shims/es5-shim) - https://github.com/es-shims/es5-shim/blob/v3.1.0/LICENSE (The MIT License) bootstrap v3.2.0 (http://getbootstrap.com/) - https://github.com/twbs/bootstrap/blob/v3.2.0/LICENSE -(The MIT License) UI Bootstrap v0.13.0 (http://angular-ui.github.io/bootstrap/) - https://github.com/angular-ui/bootstrap/blob/0.13.0/LICENSE +(The MIT License) UI Bootstrap v2.5.0 (http://angular-ui.github.io/bootstrap/) - https://github.com/angular-ui/bootstrap/blob/2.5.0/LICENSE (The MIT License) bootstrap3-dialog v1.34.7 (https://github.com/nakupanda/bootstrap3-dialog/tree/v1.34.7) - https://github.com/nakupanda/bootstrap3-dialog/tree/v1.34.7 (The MIT License) Angular
zeppelin git commit: fix bugs for timer saver
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 6955c8d8a -> d4cacadaf
fix bugs for timer saver
### What is this PR for?
* add saveNote action when cron schedule setting in file notebook.controller.js
* case:
open one noteï¼edit some text in a paragraph, then do a cron schedule
setting, the content which just edited disappeared
* change invoke method for the timer saver in file paragraph.controller.js
* case:
open one browserï¼edit some text in a paragraph, then open the note in
other browserï¼you will find that the text you just edited did not be synced
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
[ZEPPELIN-2323](https://issues.apache.org/jira/browse/ZEPPELIN-2323)
### How should this be tested?
Outline the 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: LeiWang
Author: lei wang
Closes #2196 from wary/master and squashes the following commits:
b2ee2f9 [LeiWang] Update notebook.controller.js
2ab58c3 [LeiWang] Update notebook.controller.js
9908227 [LeiWang] Update paragraph.controller.js
3612f56 [lei wang] fix bugs for timer saver
(cherry picked from commit 902892a97723b0c4deb4ef832588067a0faa9d74)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d4cacada
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d4cacada
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d4cacada
Branch: refs/heads/branch-0.7
Commit: d4cacadaf25bec969f6facb48694ce65265b97dc
Parents: 6955c8d
Author: LeiWang
Authored: Sun Apr 9 19:01:46 2017 +0800
Committer: Lee moon soo
Committed: Thu Apr 13 08:29:29 2017 +0900
--
.../src/app/notebook/paragraph/paragraph.controller.js | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d4cacada/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 5e1d5c5..47d34c6 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -125,15 +125,15 @@ function ParagraphCtrl($scope, $rootScope, $route,
$window, $routeParams, $locat
var initializeDefault = function(config) {
var forms = $scope.paragraph.settings.forms;
-
+
if (!config.colWidth) {
config.colWidth = 12;
}
-
+
if (config.enabled === undefined) {
config.enabled = true;
}
-
+
for (var idx in forms) {
if (forms[idx]) {
if (forms[idx].options) {
@@ -472,7 +472,7 @@ function ParagraphCtrl($scope, $rootScope, $route, $window,
$routeParams, $locat
var session = editor.getSession();
var dirtyText = session.getValue();
$scope.dirtyText = dirtyText;
-$scope.$broadcast('startSaveTimer');
+$scope.startSaveTimer();
setParagraphMode(session, dirtyText, editor.getCursorPosition());
};
zeppelin git commit: fix bugs for timer saver
Repository: zeppelin
Updated Branches:
refs/heads/master 35fa9d287 -> 902892a97
fix bugs for timer saver
### What is this PR for?
* add saveNote action when cron schedule setting in file notebook.controller.js
* case:
open one noteï¼edit some text in a paragraph, then do a cron schedule
setting, the content which just edited disappeared
* change invoke method for the timer saver in file paragraph.controller.js
* case:
open one browserï¼edit some text in a paragraph, then open the note in
other browserï¼you will find that the text you just edited did not be synced
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
[ZEPPELIN-2323](https://issues.apache.org/jira/browse/ZEPPELIN-2323)
### How should this be tested?
Outline the 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: LeiWang
Author: lei wang
Closes #2196 from wary/master and squashes the following commits:
b2ee2f9 [LeiWang] Update notebook.controller.js
2ab58c3 [LeiWang] Update notebook.controller.js
9908227 [LeiWang] Update paragraph.controller.js
3612f56 [lei wang] fix bugs for timer saver
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/902892a9
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/902892a9
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/902892a9
Branch: refs/heads/master
Commit: 902892a97723b0c4deb4ef832588067a0faa9d74
Parents: 35fa9d2
Author: LeiWang
Authored: Sun Apr 9 19:01:46 2017 +0800
Committer: Lee moon soo
Committed: Thu Apr 13 08:29:17 2017 +0900
--
.../src/app/notebook/paragraph/paragraph.controller.js | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/902892a9/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index dbc6f4d..231ac0b 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -129,15 +129,15 @@ function ParagraphCtrl($scope, $rootScope, $route,
$window, $routeParams, $locat
var initializeDefault = function(config) {
var forms = $scope.paragraph.settings.forms;
-
+
if (!config.colWidth) {
config.colWidth = 12;
}
-
+
if (config.enabled === undefined) {
config.enabled = true;
}
-
+
for (var idx in forms) {
if (forms[idx]) {
if (forms[idx].options) {
@@ -599,7 +599,7 @@ function ParagraphCtrl($scope, $rootScope, $route, $window,
$routeParams, $locat
var session = editor.getSession();
var dirtyText = session.getValue();
$scope.dirtyText = dirtyText;
-$scope.$broadcast('startSaveTimer');
+$scope.startSaveTimer();
setParagraphMode(session, dirtyText, editor.getCursorPosition());
};
[3/3] zeppelin git commit: [ZEPPELIN-2217] AdvancedTransformation for Visualization
getCube func 25d51a9 [1ambda] DON'T display aggr.name when aggrColumns.length == 1 f37e13d [1ambda] fix: Add 'object' transform.method da2370c [1ambda] fix: Add resetAxis, Param funcs 2370682 [1ambda] fix: average is not caculated correctly dd08e38 [1ambda] fix: Set param panel height to 400 881695a [1ambda] feat: clear chart, param separately 4d0d62b [1ambda] fix: DON'T clean panel config 92676d1 [1ambda] fix: limit parameter panel height to 370 cc29060 [1ambda] feat: parse param description as HTML 9a2d227 [1ambda] fix: Stop event propagation in widgets fcc625c [1ambda] feat: Automatic param parsing b4d774c [1ambda] fix: Dont close param panel when enter 088705b [1ambda] refactor: Remove util and add Widget funcs bf88b4f [1ambda] feat: textare widget and update hook 4e73012 [1ambda] feat: widget checkbox 11b7eaa [1ambda] feat: option widget 5d3efc9 [1ambda] fix: Change panel header b1d9d31 [1ambda] feat: Save and close with enter key 53f508c [1ambda] feat: custom axisSpec 0dbc431 [1ambda] feat: Support transformer 94d837a [1ambda] feat: Automatic spec versioning 74b8b4e [1ambda] fix: Duplicated radio btn id, name 5b88f08 [1ambda] fix: Modify margin of subchart radio btns 019892c [1ambda] feat: Support transform: flatten 0484e1e [1ambda] feat: Support maxAxisCount in axisSpec 936901b [1ambda] feat: Support undefined valueType in axisSpec 7a454ff [1ambda] feat: Cube Transformation f0ed02f [1ambda] feat: Support same axis types 49985c6 [1ambda] refactor: Refine axis, param spec d89e223 [1ambda] feat: advanced-transformation-api 75569ce [1ambda] feat: Support multiple charts in UI e1fcc2e [1ambda] feat: Support multiple charts 97be629 [1ambda] fix: Add singleDimensionAggregatorChanged 676bd7e [1ambda] refactor: Refine transform API 9fb398e [1ambda] feat: Add clearConfig a8a4fb1 [1ambda] refactor: Add getAxisInSingleDimension func 9768ecf [1ambda] feat: Add groupBase axis option 91ae54d [1ambda] fix: Overflow issue in single aggr 10c80fc [1ambda] feat: AdvancedTransformation Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/45cc8a9e Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/45cc8a9e Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/45cc8a9e Branch: refs/heads/master Commit: 45cc8a9e8a23a57271dec384245d0012a0e5e608 Parents: 2173b40 Author: 1ambda <1am...@gmail.com> Authored: Tue Apr 11 23:14:46 2017 +0900 Committer: Lee moon soo Committed: Sat Apr 15 07:34:27 2017 +0900 -- docs/_includes/themes/zeppelin/_navigation.html |9 +- docs/development/writingzeppelinapplication.md |4 +- docs/development/writingzeppelinspell.md|4 +- .../development/writingzeppelinvisualization.md |4 +- ...itingzeppelinvisualization_transformation.md | 281 +++ docs/index.md |9 +- zeppelin-web/karma.conf.js |6 +- zeppelin-web/package.json |2 +- .../advanced-transformation-setting.html| 280 +++ .../tabledata/advanced-transformation-util.js | 1259 + .../advanced-transformation-util.test.js| 1746 ++ .../app/tabledata/advanced-transformation.js| 230 +++ zeppelin-web/src/index.js |1 + .../zeppelin/helium/HeliumBundleFactory.java| 101 +- .../helium/HeliumBundleFactoryTest.java |2 +- 15 files changed, 3878 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/45cc8a9e/docs/_includes/themes/zeppelin/_navigation.html -- diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html index 623fac3..4e49a1a 100644 --- a/docs/_includes/themes/zeppelin/_navigation.html +++ b/docs/_includes/themes/zeppelin/_navigation.html @@ -117,10 +117,11 @@ Notebook Authorization Data Source Authorization -Helium Framework -Writing Zeppelin Application (Experimental) -Writing Zeppelin Spell (Experimental) -Writing Zeppelin Visualization (Experimental) +Helium Framework (Experimental) +Writing Zeppelin Application +Writing Zeppelin Spell +Writing Zeppelin Visualization: Basics +Writing Zeppelin Visualization: Transformation Advanced Zeppelin on Vagrant VM http://git-wip-us.apache.org/repos/asf/zeppelin/blob/45cc8a9e/docs/development/writingzeppelinapplication.md -- diff --git a/docs/development/writingze
[1/3] zeppelin git commit: [ZEPPELIN-2217] AdvancedTransformation for Visualization
Repository: zeppelin
Updated Branches:
refs/heads/master 2173b4013 -> 45cc8a9e8
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/45cc8a9e/zeppelin-web/src/app/tabledata/advanced-transformation-util.test.js
--
diff --git
a/zeppelin-web/src/app/tabledata/advanced-transformation-util.test.js
b/zeppelin-web/src/app/tabledata/advanced-transformation-util.test.js
new file mode 100644
index 000..6fde659
--- /dev/null
+++ b/zeppelin-web/src/app/tabledata/advanced-transformation-util.test.js
@@ -0,0 +1,1746 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as Util from './advanced-transformation-util.js'
+
+/* eslint-disable max-len */
+const MockParameter = {
+ 'floatParam': { valueType: 'float', defaultValue: 10, description: '', },
+ 'intParam': { valueType: 'int', defaultValue: 50, description: '', },
+ 'jsonParam': { valueType: 'JSON', defaultValue: '', description: '', widget:
'textarea', },
+ 'stringParam1': { valueType: 'string', defaultValue: '', description: '', },
+ 'stringParam2': { valueType: 'string', defaultValue: '', description: '',
widget: 'input', },
+ 'boolParam': { valueType: 'boolean', defaultValue: false, description: '',
widget: 'checkbox', },
+ 'optionParam': { valueType: 'string', defaultValue: 'line', description: '',
widget: 'option', optionValues: [ 'line', 'smoothedLine', ], },
+}
+/* eslint-enable max-len */
+
+const MockAxis1 = {
+ 'keyAxis': { dimension: 'multiple', axisType: 'key', },
+ 'aggrAxis': { dimension: 'multiple', axisType: 'aggregator', },
+ 'groupAxis': { dimension: 'multiple', axisType: 'group', },
+}
+
+const MockAxis2 = {
+ 'singleKeyAxis': { dimension: 'single', axisType: 'key', },
+ 'limitedAggrAxis': { dimension: 'multiple', axisType: 'aggregator',
maxAxisCount: 2, },
+ 'groupAxis': { dimension: 'multiple', axisType: 'group', },
+}
+
+const MockAxis3 = {
+ 'customAxis1': { dimension: 'single', axisType: 'unique', },
+ 'customAxis2': { dimension: 'multiple', axisType: 'value', },
+}
+
+const MockAxis4 = {
+ 'key1Axis': { dimension: 'multiple', axisType: 'key', },
+ 'key2Axis': { dimension: 'multiple', axisType: 'key', },
+ 'aggrAxis': { dimension: 'multiple', axisType: 'aggregator', },
+ 'groupAxis': { dimension: 'multiple', axisType: 'group', },
+}
+
+
+// test spec for axis, param, widget
+const MockSpec = {
+ charts: {
+'object-chart': {
+ transform: { method: 'object', },
+ sharedAxis: true,
+ axis: JSON.parse(JSON.stringify(MockAxis1)),
+ parameter: MockParameter,
+},
+
+'array-chart': {
+ transform: { method: 'array', },
+ sharedAxis: true,
+ axis: JSON.parse(JSON.stringify(MockAxis1)),
+ parameter: {
+'arrayChartParam0': { valueType: 'string', defaultValue: '',
description: 'param0', },
+ },
+},
+
+'drillDown-chart': {
+ transform: { method: 'drill-down', },
+ axis: JSON.parse(JSON.stringify(MockAxis2)),
+ parameter: {
+'drillDownChartParam0': { valueType: 'string', defaultValue: '',
description: 'param0', },
+ },
+},
+
+'raw-chart': {
+ transform: { method: 'raw', },
+ axis: JSON.parse(JSON.stringify(MockAxis3)),
+ parameter: {
+'rawChartParam0': { valueType: 'string', defaultValue: '',
description: 'param0', },
+ },
+},
+ },
+}
+
+// test spec for transformation
+const MockSpec2 = {
+ charts: {
+'object-chart': {
+ transform: { method: 'object', },
+ sharedAxis: false,
+ axis: JSON.parse(JSON.stringify(MockAxis1)),
+ parameter: MockParameter,
+},
+
+'array-chart': {
+ transform: { method: 'array', },
+ sharedAxis: false,
+ axis: JSON.parse(JSON.stringify(MockAxis1)),
+ parameter: {
+'arrayChartParam0': { valueType: 'string', defaultValue: '',
description: 'param0', },
+ },
+},
+
+'drillDown-chart': {
+ transform: { method: 'drill-down', },
+ sharedAxis: false,
+ axis: JSON.parse(JSON.stringify(MockAxis1)),
+ parameter: {
+'drillDownChartParam0': { valueType: 'string', defaultValue: '',
description: 'param0', },
+ },
+},
+
+'array2Key-chart': {
+ transform: { method: 'array:2-key', },
+ sharedAxis: false,
+ axis: JSON.parse(JSON.stringify(MockAxis4)),
+ parameter: {
+'drillDownChartParam0': { valueType: 'string', defaultValue: '',
descrip
[2/3] zeppelin git commit: [ZEPPELIN-2217] AdvancedTransformation for Visualization
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/45cc8a9e/zeppelin-web/src/app/tabledata/advanced-transformation-util.js
--
diff --git a/zeppelin-web/src/app/tabledata/advanced-transformation-util.js
b/zeppelin-web/src/app/tabledata/advanced-transformation-util.js
new file mode 100644
index 000..0bcefb6
--- /dev/null
+++ b/zeppelin-web/src/app/tabledata/advanced-transformation-util.js
@@ -0,0 +1,1259 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export function getCurrentChart(config) {
+ return config.chart.current;
+}
+
+export function getCurrentChartTransform(config) {
+ return config.spec.charts[getCurrentChart(config)].transform
+}
+
+export function getCurrentChartAxis(config) {
+ return config.axis[getCurrentChart(config)]
+}
+
+export function getCurrentChartParam(config) {
+ return config.parameter[getCurrentChart(config)]
+}
+
+export function getCurrentChartAxisSpecs(config) {
+ return config.axisSpecs[getCurrentChart(config)]
+}
+
+export function getCurrentChartParamSpecs(config) {
+ return config.paramSpecs[getCurrentChart(config)]
+}
+
+export function useSharedAxis(config, chart) {
+ return config.spec.charts[chart].sharedAxis
+}
+
+export function serializeSharedAxes(config) {
+ const availableCharts = getAvailableChartNames(config.spec.charts)
+ for (let i = 0; i < availableCharts.length; i++) {
+const chartName = availableCharts[i];
+if (useSharedAxis(config, chartName)) {
+ /** use reference :) in case of sharedAxis */
+ config.axis[chartName] = config.sharedAxis
+}
+ }
+}
+
+export const Widget = {
+ INPUT: 'input', /** default */
+ OPTION: 'option',
+ CHECKBOX: 'checkbox',
+ TEXTAREA: 'textarea',
+}
+
+export function isInputWidget(paramSpec) {
+ return (paramSpec && !paramSpec.widget) || (paramSpec && paramSpec.widget
=== Widget.INPUT);
+}
+
+export function isOptionWidget(paramSpec) {
+ return paramSpec && paramSpec.widget === Widget.OPTION;
+}
+
+export function isCheckboxWidget(paramSpec) {
+ return paramSpec && paramSpec.widget === Widget.CHECKBOX;
+}
+
+export function isTextareaWidget(paramSpec) {
+ return paramSpec && paramSpec.widget === Widget.TEXTAREA;
+}
+
+export const ParameterValueType = {
+ INT: 'int',
+ FLOAT: 'float',
+ BOOLEAN: 'boolean',
+ STRING: 'string',
+ JSON: 'JSON',
+}
+
+export function parseParameter(paramSpecs, param) {
+ /** copy original params */
+ const parsed = JSON.parse(JSON.stringify(param))
+
+ for (let i = 0 ; i < paramSpecs.length; i++) {
+const paramSpec = paramSpecs[i]
+const name = paramSpec.name
+
+if (paramSpec.valueType === ParameterValueType.INT &&
+ typeof parsed[name] !== 'number') {
+
+ try { parsed[name] = parseInt(parsed[name]); }
+ catch (error) { parsed[name] = paramSpec.defaultValue; }
+}
+else if (paramSpec.valueType === ParameterValueType.FLOAT &&
+ typeof parsed[name] !== 'number') {
+
+ try { parsed[name] = parseFloat(parsed[name]); }
+ catch (error) { parsed[name] = paramSpec.defaultValue; }
+}
+else if (paramSpec.valueType === ParameterValueType.BOOLEAN) {
+ if (parsed[name] === 'false') {
+parsed[name] = false;
+ } else if (parsed[name] === 'true') {
+parsed[name] = true;
+ } else if (typeof parsed[name] !== 'boolean') {
+parsed[name] = paramSpec.defaultValue;
+ }
+}
+else if (paramSpec.valueType === ParameterValueType.JSON) {
+ if (parsed[name] !== null && typeof parsed[name] !== 'object') {
+try { parsed[name] = JSON.parse(parsed[name]); }
+catch (error) { parsed[name] = paramSpec.defaultValue; }
+ } else if (parsed[name] === null) {
+parsed[name] = paramSpec.defaultValue;
+ }
+}
+ }
+
+ return parsed
+}
+
+export const AxisType = {
+ AGGREGATOR: 'aggregator',
+ KEY: 'key',
+ GROUP: 'group',
+}
+
+export function isAggregatorAxis(axisSpec) {
+ return axisSpec && axisSpec.axisType === AxisType.AGGREGATOR
+}
+export function isGroupAxis(axisSpec) {
+ return axisSpec && axisSpec.axisType === AxisType.GROUP
+}
+export function isKeyAxis(axisSpec) {
+ return axisSpec && axisSpec.axisType === AxisType.KEY
+}
+export function isSingleDimensionAxis(axisSpec) {
+ return axisSpec && axisSpec.dimension === 'single'
+}
+
+/**
+ * before: { name: { ... } }
+ * after: [ { name, ... } ]
+ *
+ * add the `name` field while conver
zeppelin git commit: [ZEPPELIN-2365] button to create note into folder
Repository: zeppelin
Updated Branches:
refs/heads/master 45cc8a9e8 -> e5922b6bb
[ZEPPELIN-2365] button to create note into folder
### What is this PR for?
Added button to create new note into folder (home page)
### What type of PR is it?
Feature
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2365
### 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: Tinkoff DWH
Closes #2228 from tinkoff-dwh/ZEPPELIN-2365 and squashes the following commits:
e870ad4 [Tinkoff DWH] Merge remote-tracking branch 'upstream/master' into
ZEPPELIN-2365
0fe290e [Tinkoff DWH] [ZEPPELIN-2365] button to create note into folder
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e5922b6b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e5922b6b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e5922b6b
Branch: refs/heads/master
Commit: e5922b6bbaecacdfdcd279c4ff1f181c482210ca
Parents: 45cc8a9
Author: Tinkoff DWH
Authored: Wed Apr 12 09:06:07 2017 +0500
Committer: Lee moon soo
Committed: Sat Apr 15 08:51:56 2017 +0900
--
zeppelin-web/src/app/home/notebook-template.html| 12 ++--
.../components/noteName-create/notename.controller.js | 8
.../src/components/noteName-create/visible.directive.js | 3 ++-
3 files changed, 16 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e5922b6b/zeppelin-web/src/app/home/notebook-template.html
--
diff --git a/zeppelin-web/src/app/home/notebook-template.html
b/zeppelin-web/src/app/home/notebook-template.html
index d8daaba..98708f9 100644
--- a/zeppelin-web/src/app/home/notebook-template.html
+++ b/zeppelin-web/src/app/home/notebook-template.html
@@ -59,8 +59,16 @@ limitations under the License.
{{getNoteName(node)}}
-
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e5922b6b/zeppelin-web/src/components/noteName-create/notename.controller.js
--
diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js
b/zeppelin-web/src/components/noteName-create/notename.controller.js
index 43269a6..865d653 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -44,14 +44,14 @@ function NotenameCtrl($scope, noteListDataFactory,
$routeParams, websocketMsgSrv
vm.createNote();
};
- vm.preVisible = function(clone, sourceNoteName) {
+ vm.preVisible = function(clone, sourceNoteName, path) {
vm.clone = clone;
vm.sourceNoteName = sourceNoteName;
-$scope.note.notename = vm.clone ? vm.cloneNoteName() : vm.newNoteName();
+$scope.note.notename = vm.clone ? vm.cloneNoteName() :
vm.newNoteName(path);
$scope.$apply();
};
- vm.newNoteName = function() {
+ vm.newNoteName = function(path) {
var newCount = 1;
angular.forEach(vm.notes.flatList, function(noteName) {
noteName = noteName.name;
@@ -62,7 +62,7 @@ function NotenameCtrl($scope, noteListDataFactory,
$routeParams, websocketMsgSrv
}
}
});
-return 'Untitled Note ' + newCount;
+return (path ? path + '/' : '') +'Untitled Note ' + newCount;
};
vm.cloneNoteName = function() {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e5922b6b/zeppelin-web/src/components/noteName-create/visible.directive.js
--
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js
b/zeppelin-web/src/components/noteName-create/visible.directive.js
index 403fd60..6dd19da 100644
--- a/zeppelin-web/src/components/noteName-create/visible.directive.js
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -30,8 +30,9 @@ function modalvisible() {
var relatedTarget = angular.element(e.relatedTarget);
var clone = relatedTarget.data('clone');
var sourceNoteName = relatedTarget.data('source-note-name');
+var path = relatedTarget.data('path');
var cloneNote = clone ? true : false;
-previsibleMethod()(cloneNote, sourceNoteName);
+previsibleMethod()(cloneNote, sourceNoteName, path);
});
element.on('shown.bs.modal', function(e) {
if (scope.targetinput) {
zeppelin git commit: [ZEPPELIN-2396] eliminate the 'ctrl/command+L' keyboard shortcut
Repository: zeppelin
Updated Branches:
refs/heads/master 8d03920b9 -> 775607f10
[ZEPPELIN-2396] eliminate the 'ctrl/command+L' keyboard shortcut
### What is this PR for?
This PR is for that eliminate the `Ctrl/Command+L` shortcut keyboard. This
function is what the ace editor defined.
### What type of PR is it?
[Improvement | Document]
### What is the Jira issue?
* [ZEPPELIN-2396](https://issues.apache.org/jira/browse/ZEPPELIN-2396)
### How should this be tested?
* **Improvement** - Press `Ctrl + L` key and check if showing the dialog or not
* **Document** - Run document development mode and check [this
document](http://localhost:4000/install/upgrade.html#upgrading-from-zeppelin-07-to-08)
### Screenshots (if appropriate)
[Before]
[After]
[Document]
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? Yes, I did. Please review [this
document](http://localhost:4000/install/upgrade.html#upgrading-from-zeppelin-07-to-08)
if you run document development mode (localhost:4000)
Author: soralee
Closes #2248 from soralee/ZEPPELIN-2396_ctrl_l and squashes the following
commits:
bb0f7d8 [soralee] modify document
d1f966a [soralee] modify document
928f179 [soralee] add space between + and who is providing
5f30fe4 [soralee] upgrade eliminate keyboard shortcut feature and add document
4e1b846 [soralee] ZEPPELIN-2396 drop the Ctrl+L shortcut keyboard
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/775607f1
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/775607f1
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/775607f1
Branch: refs/heads/master
Commit: 775607f103d1e5f6c6e209b687f11bdc038c3e71
Parents: 8d03920
Author: soralee
Authored: Sat Apr 15 14:01:40 2017 +0900
Committer: Lee moon soo
Committed: Mon Apr 17 14:16:20 2017 +0900
--
docs/install/upgrade.md | 2 +-
.../notebook/paragraph/paragraph.controller.js | 24 +---
2 files changed, 17 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/775607f1/docs/install/upgrade.md
--
diff --git a/docs/install/upgrade.md b/docs/install/upgrade.md
index 44e38a3..61d2d68 100644
--- a/docs/install/upgrade.md
+++ b/docs/install/upgrade.md
@@ -60,4 +60,4 @@ So, copying `notebook` and `conf` directory should be enough.
### Upgrading from Zeppelin 0.7 to 0.8
- From 0.8, we recommend to use `PYSPARK_PYTHON` and `PYSPARK_DRIVER_PYTHON`
instead of `zeppelin.pyspark.python` as `zeppelin.pyspark.python` only effects
driver. You can use `PYSPARK_PYTHON` and `PYSPARK_DRIVER_PYTHON` as using them
in spark.
-
\ No newline at end of file
+ - From 0.8, depending on your device, the keyboard shortcut `Ctrl-L` or
`Command-L` which goes to the line somewhere user wants is not supported.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/775607f1/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 231ac0b..6a9920a 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -709,19 +709,27 @@ function ParagraphCtrl($scope, $rootScope, $route,
$window, $routeParams, $locat
*/
// remove binding
- $scope.editor.commands.bindKey('ctrl-alt-n.', null);
$scope.editor.commands.removeCommand('showSettingsMenu');
- $scope.editor.commands.bindKey('ctrl-alt-l', null);
- $scope.editor.commands.bindKey('ctrl-alt-w', null);
- $scope.editor.commands.bindKey('ctrl-alt-a', null);
- $scope.editor.commands.bindKey('ctrl-alt-k', null);
- $scope.editor.commands.bindKey('ctrl-alt-e', null);
- $scope.editor.commands.bindKey('ctrl-alt-t', null);
+ var isOption = $rootScope.isMac? 'option' : 'alt';
+
+ $scope.editor.commands.bindKey('ctrl-' + isOption + '-n.', null);
+ $scope.editor.commands.bindKey('ctrl-' + isOption + '-l&#x
[2/3] zeppelin git commit: [ZEPPELIN-2297] improvements to jdbc autocompleter
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4d398ef2/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
--
diff --git a/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
b/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
index 567e975..999f7de 100644
--- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
+++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/SqlCompleterTest.java
@@ -14,18 +14,26 @@
*/
package org.apache.zeppelin.jdbc;
-import com.google.common.base.Joiner;
-import com.mockrunner.jdbc.BasicJDBCTestCaseAdapter;
-import jline.console.completer.ArgumentCompleter;
-import jline.console.completer.Completer;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.zeppelin.completer.CompletionType;
+import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.*;
+import com.google.common.base.Joiner;
+import jline.console.completer.ArgumentCompleter;
import static com.google.common.collect.Sets.newHashSet;
import static org.junit.Assert.assertEquals;
@@ -34,18 +42,18 @@ import static org.junit.Assert.assertTrue;
/**
* SQL completer unit tests
*/
-public class SqlCompleterTest extends BasicJDBCTestCaseAdapter {
+public class SqlCompleterTest {
public class CompleterTester {
-private Completer completer;
+private SqlCompleter completer;
private String buffer;
private int fromCursor;
private int toCursor;
-private Set expectedCompletions;
+private Set expectedCompletions;
-public CompleterTester(Completer completer) {
+public CompleterTester(SqlCompleter completer) {
this.completer = completer;
}
@@ -64,7 +72,7 @@ public class SqlCompleterTest extends
BasicJDBCTestCaseAdapter {
return this;
}
-public CompleterTester expect(Set expectedCompletions) {
+public CompleterTester expect(Set
expectedCompletions) {
this.expectedCompletions = expectedCompletions;
return this;
}
@@ -75,9 +83,13 @@ public class SqlCompleterTest extends
BasicJDBCTestCaseAdapter {
}
}
-private void expectedCompletions(String buffer, int cursor, Set
expected) {
+private void expectedCompletions(String buffer, int cursor,
+Set expected) {
+ if (StringUtils.isNotEmpty(buffer) && buffer.length() > cursor) {
+buffer = buffer.substring(0, cursor + 1);
+ }
- ArrayList candidates = new ArrayList<>();
+ List candidates = new ArrayList<>();
completer.complete(buffer, cursor, candidates);
@@ -85,11 +97,15 @@ public class SqlCompleterTest extends
BasicJDBCTestCaseAdapter {
logger.info(explain);
- assertEquals("Buffer [" + buffer.replace(" ", ".") + "] and Cursor[" +
cursor + "] "
- + explain, expected, newHashSet(candidates));
+ Assert.assertEquals("Buffer [" + buffer.replace(" ", ".") + "] and
Cursor[" + cursor + "] "
+ + explain, expected, newHashSet(candidates));
}
-private String explain(String buffer, int cursor, ArrayList
candidates) {
+private String explain(String buffer, int cursor,
List candidates) {
+ List cndidateStrings = new ArrayList<>();
+ for (InterpreterCompletion candidate : candidates) {
+cndidateStrings.add(candidate.getValue());
+ }
StringBuffer sb = new StringBuffer();
for (int i = 0; i <= Math.max(cursor, buffer.length()); i++) {
@@ -109,7 +125,7 @@ public class SqlCompleterTest extends
BasicJDBCTestCaseAdapter {
sb.append(")");
}
}
- sb.append(" >> [").append(Joiner.on(",").join(candidates)).append("]");
+ sb.append(" >>
[").append(Joiner.on(",").join(cndidateStrings)).append("]");
return sb.toString();
}
@@ -122,7 +138,7 @@ public class SqlCompleterTest extends
BasicJDBCTestCaseAdapter {
private CompleterTester tester;
private ArgumentCompleter.WhitespaceArgumentDelimiter delimiter =
- new ArgumentCompleter.WhitespaceArgumentDelimiter();
+ new ArgumentCompleter.WhitespaceArgumentDelimiter();
private SqlCompleter sqlCompleter = new SqlCompleter();
@@ -178,7 +194,7 @@ public class SqlCompleterTest extends
BasicJDBCTestCaseAdapter {
}
@Test
- public void testFindAliasesInSQL_Simple(){
+ public void testFindAliasesInSQL_Simple() {
String sql = "select * from prod_emart.financial_account a";
Map res =
sqlCompleter.findAliasesInSQL(delimiter.delimit(sql, 0
[1/3] zeppelin git commit: [ZEPPELIN-2297] improvements to jdbc autocompleter
Repository: zeppelin
Updated Branches:
refs/heads/master 775607f10 -> 4d398ef2a
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4d398ef2/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
--
diff --git
a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
index 4321e22..c4ff6ab 100644
---
a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
+++
b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java
@@ -121,7 +121,8 @@ public class MockInterpreterResourcePool extends
Interpreter {
}
@Override
- public List completion(String buf, int cursor) {
+ public List completion(String buf, int cursor,
+ InterpreterContext interpreterContext) {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4d398ef2/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
--
diff --git
a/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
index b8343c0..1b1306a 100644
---
a/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
+++
b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java
@@ -68,7 +68,8 @@ public class MockInterpreter1 extends Interpreter{
}
@Override
- public List completion(String buf, int cursor) {
+ public List completion(String buf, int cursor,
+ InterpreterContext interpreterContext) {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4d398ef2/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 6a9920a..a453f16 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -640,6 +640,19 @@ function ParagraphCtrl($scope, $rootScope, $route,
$window, $routeParams, $locat
var remoteCompleter = {
getCompletions: function(editor, session, pos, prefix, callback) {
+ var langTools = ace.require('ace/ext/language_tools');
+ var defaultKeywords = new Set();
+ var getDefaultKeywords = function(err, completions) {
+ if (completions !== undefined) {
+ completions.forEach(function(c) {
+ defaultKeywords.add(c.value);
+ });
+ }
+ }
+ if (langTools.keyWordCompleter !== undefined) {
+ langTools.keyWordCompleter.getCompletions(editor, session, pos,
prefix, getDefaultKeywords);
+ }
+
if (!editor.isFocused()) {
return;
}
@@ -650,13 +663,29 @@ function ParagraphCtrl($scope, $rootScope, $route,
$window, $routeParams, $locat
websocketMsgSrv.completion($scope.paragraph.id, buf, pos);
$scope.$on('completionList', function(event, data) {
+var computeCaption = function(value, meta) {
+ var metaLength = meta !== undefined ? meta.length : 0;
+ var length = 42;
+ var whitespaceLength = 3;
+ var ellipses = '...';
+ var maxLengthCaption = length - metaLength - whitespaceLength -
ellipses.length;
+ if (value !== undefined && value.length > maxLengthCaption) {
+ return value.substr(0, maxLengthCaption) + ellipses;
+ }
+ return value;
+}
if (data.completions) {
var completions = [];
for (var c in data.completions) {
var v = data.completions[c];
+if (v.meta !== undefined && v.meta === 'keyword' &&
defaultKeywords.has(v.value.trim())) {
+continue;
+}
completions.push({
name: v.name,
value: v.value,
+ meta: v.meta,
+ caption: computeCaption(v.value, v.meta),
score: 300
});
}
@@ -842,7 +871,7 @@ function ParagraphCtrl($scope, $rootScope, $route, $window,
$routeParams, $locat
};
var getInterpreterName = function(paragraphText) {
-var intpNameRegexp = /^\s*%(.+?)\s/g;
+var intpNameRegexp = /
[3/3] zeppelin git commit: [ZEPPELIN-2297] improvements to jdbc autocompleter
[ZEPPELIN-2297] improvements to jdbc autocompleter ### What is this PR for? PR contains some improvements for completion (JDBC Interpreter): - types of completion - display of long values - refactoring of search of completions - uniqness of completions with type `keyword` - updating data in completer by pressing `Ctrl + .` - setting the schema filter to generate completions - fix highlighting code when used not default data source ### What type of PR is it? Improvement ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-2297 ### How should this be tested? try to work with new completer ### Screenshots (if appropriate) **1. Types of completion**  **2. Display of long values** before  after  **3. Refactoring of search of completions. Updating data in completer by pressing `Ctrl + .`** before  after  **4. uniqness of completions with type keyword** before  after  **5. fix highlighting code when used not default data source** before  after  ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Tinkoff DWH Closes #2203 from tinkoff-dwh/ZEPPELIN-2297 and squashes the following commits: b86b57a [Tinkoff DWH] [ZEPPELIN-2297] small fix to compute caption 8552049 [Tinkoff DWH] [ZEPPELIN-2297] schema filters 5308f1e [Tinkoff DWH] [ZEPPELIN-2297] updating completions ef6c9cb [Tinkoff DWH] Merge remote-tracking branch 'origin/ZEPPELIN-2297' into ZEPPELIN-2297 1e05a68 [Tinkoff DWH] [ZEPPELIN-2297] fix uniqueness keywords ec3cd3b [Tinkoff DWH] [ZEPPELIN-2297] fix uniqueness keywords 2b58cc5 [Tinkoff DWH] [ZEPPELIN-2297] refactoring search completions 7b5835d [Tinkoff DWH] [ZEPPELIN-2297] compute caption of copletion 1c74384 [Tinkoff DWH] [ZEPPELIN-2297] add type of completion Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4d398ef2 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4d398ef2 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4d398ef2 Branch: refs/heads/master Commit: 4d398ef2a6471614cebd6b0177a08333114f5802 Parents: 775607f Author: Tinkoff DWH Authored: Mon Apr 3 20:53:02 2017 +0500 Committer: Lee moon soo Committed: Mon Apr 17 14:18:32 2017 +0900 -- .../zeppelin/alluxio/AlluxioInterpreter.java| 7 +- .../alluxio/AlluxioInterpreterTest.java | 38 +-- .../zeppelin/angular/AngularInterpreter.java| 3 +- .../apache/zeppelin/beam/BeamInterpreter.java | 3 +- .../zeppelin/bigquery/BigQueryInterpreter.java | 3 +- .../cassandra/CassandraInterpreter.java | 3 +- docs/interpreter/jdbc.md| 5 + .../elasticsearch/ElasticsearchInterpreter.java | 6 +- .../ElasticsearchInterpreterTest.java | 11 +- .../apache/zeppelin/file/FileInterpreter.java | 3 +- .../zeppelin/file/HDFSFileInterpreter.java | 23 +- .../zeppelin/file/HDFSFileInterpreterTest.java | 10 +- .../apache/zeppelin/flink/FlinkInterpreter.java | 3 +- .../zeppelin/geode/GeodeOqlInterpreter.java | 3 +- .../apache/zeppelin/hbase/HbaseInterpreter.java | 3 +- .../apache/zeppelin/helium/DevInterpreter.java | 3 +- .../zeppelin/ignite/IgniteInterpreter.java | 3 +- .../zeppelin/ignite/IgniteSqlInterpreter.java | 3 +- jdbc/pom.xml| 12 - .../apache/zeppelin/jdbc/JDBCInterpreter.java | 56 ++-- .../org/apache/zeppelin/jdbc/SqlCompleter.java | 257 --- jdbc/src/main/resources/ansi.sql.keywords | 2 +- .../src/main/resources/interpreter-setting.json | 6 + .../postgresql-native-driver-sql.keywords | 2 +- .../zeppelin/jdbc/JDBCInterpreterTest.java
zeppelin git commit: [ZEPPELIN-1357, 1892, 1370][Umbrella] Text overlap in the MultiBarChart
Repository: zeppelin
Updated Branches:
refs/heads/master c706d453e -> 4d6485737
[ZEPPELIN-1357,1892,1370][Umbrella] Text overlap in the MultiBarChart
### What is this PR for?
If using the `multiChartBar`, it often occurs overlap in text. So, this PR is
for preventing to overlap in text.
>~~The below is the case what I updated.~~
~~1. The xLabel generally show all of the text without rotation (less than
30).~~
~~2. If the xLabel size is over than 30 and less than 80, the xLabel text are
rotated as 90 degree and displayed.~~
~~3. If the xLabel size is over than 80, the xLabel text are disappeared, but
the tooltip is displayed.~~
>~~I have made improvements based on my thinking, so I would appreciate to give
>me your feedback.~~
~~And if merged this PR, I'll update the feature so that user can use `min` and
`max` variables by user on web.~~
**[Update]**
To prevent overlap in xLabel text, in one way which is talked the below
mentions, user who is using zeppelin could select to visualization type of
xLabel such as `rotate 45 degree` or `hide`.
### What type of PR is it?
[Bug Fix | Improvement ]
### What is the Jira issue?
* [ZEPPELIN-1357; UI - label wrapping not done properly in
charts](https://issues.apache.org/jira/browse/ZEPPELIN-1357)
* [ZEPPELIN-1892; Display label vertically or horizontally
smartly](https://issues.apache.org/jira/browse/ZEPPELIN-1892)
* [ZEPPELIN-1370; Label overlaps - in default visualization example
barchart](https://issues.apache.org/jira/browse/ZEPPELIN-1370)
### How should this be tested?
1. Run the paragraph for bank data in the `Basic Features (Spark)` notebook.
2. Execute the following query.
```
%sql
select * from bank
```
3. Use the pivot in the `Setting` toggle in the `MultiBarChart` such as the
screenshots.
### Screenshots (if appropriate)
**[Before]**
**[After]**
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: soralee
Closes #2133 from soralee/ZEPPELIN-1357_overlap_text and squashes the following
commits:
32d7e37 [soralee] rebase master
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4d648573
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4d648573
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4d648573
Branch: refs/heads/master
Commit: 4d6485737cf72bc156c65c419b8e6e6cc907f3ea
Parents: c706d45
Author: soralee
Authored: Tue Mar 14 14:07:44 2017 +0900
Committer: Lee moon soo
Committed: Tue Apr 18 19:23:36 2017 -0700
--
.../builtins/visualization-barchart.js | 89 +++-
.../builtins/visualization-nvd3chart.js | 2 +-
2 files changed, 86 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4d648573/zeppelin-web/src/app/visualization/builtins/visualization-barchart.js
--
diff --git
a/zeppelin-web/src/app/visualization/builtins/visualization-barchart.js
b/zeppelin-web/src/app/visualization/builtins/visualization-barchart.js
index ffc0c22..15f0337 100644
--- a/zeppelin-web/src/app/visualization/builtins/visualization-barchart.js
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-barchart.js
@@ -45,6 +45,7 @@ export default class BarchartVisualization extends
Nvd3ChartVisualization {
true);
super.render(d3Data);
+this.config.changeXLabel(this.config.xLabelStatus);
};
/**
@@ -57,19 +58,99 @@ export default class BarchartVisualization extends
Nvd3ChartVisualization {
configureChart(chart) {
var self = this;
+var configObj = self.config;
+
chart.yAxis.axisLabelDistance(50);
chart.yAxis.tickFormat(function(d) {return self.yAxisTickFormat(d);});
-this.chart.stacked(this.config.stacked);
+self.chart.stacked(this.config.stacked);
+
+self.config.changeXLabel = function(type) {
+ switch (type) {
+case 'default':
+ self.chart._options['showXAxis'] = true;
+ self.chart._options['margin'] = {bottom: 50};
+ self.chart.xAxis.rotateLabels(0);
+ configObj.xLabelStatus = 'default';
+ break;
+case 'rotate':
+ self.chart._options['showXAxis'] = true;
+ self.chart._op
zeppelin git commit: Prevent NPE on delete local module cache
Repository: zeppelin
Updated Branches:
refs/heads/master 7b585c739 -> 722ed8231
Prevent NPE on delete local module cache
### What is this PR for?
Prevent NPE on delete local module cache in HeliumBundleFactory
```
Caused by: java.lang.NullPointerException
at
org.apache.zeppelin.helium.HeliumBundleFactory.deleteYarnCache(HeliumBundleFactory.java:465)
at
org.apache.zeppelin.helium.HeliumBundleFactory.copyFrameworkModulesToInstallPath(HeliumBundleFactory.java:487)
at
org.apache.zeppelin.helium.HeliumBundleFactory.buildPackage(HeliumBundleFactory.java:403)
at org.apache.zeppelin.helium.Helium.enable(Helium.java:314)
at
org.apache.zeppelin.rest.HeliumRestApi.enablePackage(HeliumRestApi.java:193)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
at
org.apache.cxf.service.invoker.AbstractInvoker.performInvocation(AbstractInvoker.java:180)
at
org.apache.cxf.service.invoker.AbstractInvoker.invoke(AbstractInvoker.java:96)
... 50 more
```
### What type of PR is it?
Bug Fix
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo
Closes #2259 from Leemoonsoo/prevent_npe_helium_bundle_factory and squashes the
following commits:
0934af8 [Lee moon soo] Prevent NPE on delete local module cache
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/722ed823
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/722ed823
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/722ed823
Branch: refs/heads/master
Commit: 722ed823193ed49d4e42ef17be2241cf6d48cd97
Parents: 7b585c7
Author: Lee moon soo
Authored: Tue Apr 18 18:33:00 2017 -0700
Committer: Lee moon soo
Committed: Wed Apr 19 20:17:17 2017 -0700
--
.../java/org/apache/zeppelin/helium/HeliumBundleFactory.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/722ed823/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
index 5bdb14c..bf2804e 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
@@ -462,8 +462,10 @@ public class HeliumBundleFactory {
};
File[] localModuleCaches = yarnCacheDir.listFiles(filter);
-for (File f : localModuleCaches) {
- FileUtils.deleteQuietly(f);
+if (localModuleCaches != null) {
+ for (File f : localModuleCaches) {
+FileUtils.deleteQuietly(f);
+ }
}
}
zeppelin git commit: [MINOR] Add paragraph to note
Repository: zeppelin
Updated Branches:
refs/heads/master 722ed8231 -> 13aabe3e4
[MINOR] Add paragraph to note
### What is this PR for?
We need to add an ability of adding custom _Paragraph_ to a _Note_. This will
make it easier to write _Note_ and _Paragraph_ tests. At the moment all
paragraphs are created inside _Note_ class.
This refactoring will allow to write a test for
[ZEPPELIN-1856](https://issues.apache.org/jira/browse/ZEPPELIN-1856) issue.
### What type of PR is it?
[Refactoring]
### Todos
* [x] - Rename `addParagraph()` -> `addNewParagraph()` and `insertParagraph()`
-> `insertNewParagraph()`. These names will describe what mathods do: create
new paragraph and add it to the note.
* [x] - Remove duplicated code from `addNewParagraph()` and
`insertNewParagraph()` methods.
* [x] - Add methods `addParagraph()` and `insertParagraph()`, which receive a
_Paragraph_ instance in parameters and add it to the _Note_.
### Questions:
* Does the licenses files need update? **no**
* Is there breaking changes for older versions? **no**
* Does this needs documentation? **no**
Author: Alexander Shoshin
Closes #2233 from AlexanderShoshin/add-paragraph-to-note and squashes the
following commits:
676db15 [Alexander Shoshin] added methods addParagraph() and insertParagrepg()
b0b1dd4 [Alexander Shoshin] remove duplicated code
4391f6b [Alexander Shoshin] rename addParagraph() -> addNewParagraph(),
insertParagraph() -> insertNewParagraph()
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/13aabe3e
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/13aabe3e
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/13aabe3e
Branch: refs/heads/master
Commit: 13aabe3e486f7f7b2822a44d3fea1bebc2589cb8
Parents: 722ed82
Author: Alexander Shoshin
Authored: Fri Apr 7 12:02:07 2017 +0300
Committer: Lee moon soo
Committed: Wed Apr 19 20:18:15 2017 -0700
--
.../apache/zeppelin/rest/NotebookRestApi.java | 8 +--
.../apache/zeppelin/socket/NotebookServer.java | 7 +--
.../zeppelin/rest/InterpreterRestApiTest.java | 6 +-
.../zeppelin/rest/NotebookRestApiTest.java | 13 ++--
.../zeppelin/rest/ZeppelinRestApiTest.java | 27 -
.../zeppelin/rest/ZeppelinSparkClusterTest.java | 42 ++---
.../zeppelin/socket/NotebookServerTest.java | 2 +-
.../java/org/apache/zeppelin/notebook/Note.java | 40 +++--
.../helium/HeliumApplicationFactoryTest.java| 10 ++--
.../org/apache/zeppelin/notebook/NoteTest.java | 22 +++
.../apache/zeppelin/notebook/NotebookTest.java | 62 ++--
.../notebook/repo/GitNotebookRepoTest.java | 16 +++--
.../notebook/repo/NotebookRepoSyncTest.java | 6 +-
.../notebook/repo/VFSNotebookRepoTest.java | 2 +-
.../zeppelin/search/LuceneSearchTest.java | 4 +-
15 files changed, 133 insertions(+), 134 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/13aabe3e/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
--
diff --git
a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
index bc15bfe..8ca0476 100644
---
a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
+++
b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
@@ -341,11 +341,11 @@ public class NotebookRestApi {
List initialParagraphs = request.getParagraphs();
if (initialParagraphs != null) {
for (NewParagraphRequest paragraphRequest : initialParagraphs) {
-Paragraph p = note.addParagraph(subject);
+Paragraph p = note.addNewParagraph(subject);
initParagraph(p, paragraphRequest, user);
}
}
-note.addParagraph(subject); // add one paragraph to the last
+note.addNewParagraph(subject); // add one paragraph to the last
String noteName = request.getName();
if (noteName.isEmpty()) {
noteName = "Note " + note.getId();
@@ -433,9 +433,9 @@ public class NotebookRestApi {
Paragraph p;
Double indexDouble = request.getIndex();
if (indexDouble == null) {
- p = note.addParagraph(subject);
+ p = note.addNewParagraph(subject);
} else {
- p = note.insertParagraph(indexDouble.intValue(), subject);
+ p = note.insertNewParagraph(indexDouble.intValue(), subject);
}
initParagraph(p, request, user);
note.persist(subject);
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/13aabe3e/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
--
diff --git
a
zeppelin git commit: [ZEPPELIN-2420] Slow notebook listing in navbar
Repository: zeppelin
Updated Branches:
refs/heads/master 652911abe -> 7a0cb6c7a
[ZEPPELIN-2420] Slow notebook listing in navbar
### What is this PR for?
Notebook listing is slow as you can see in the screenshot below.
The problem was,
- angular-bootstrap was updated to 2.5
- then, `dropdown-*` directives should be converted into `uib-dropdown-*`
- otherwise, changes in angular controller scope values will not affect on the
directives even though events are fired. (`show.bs.dropdown`,
`hide.bs.dropdown`)
```
function initNotebookListEventListener() {
angular.element(document).ready(function() {
angular.element('.notebook-list-dropdown').on('show.bs.dropdown',
function() {
$scope.isDrawNavbarNoteList = true;
});
angular.element('.notebook-list-dropdown').on('hide.bs.dropdown',
function() {
$scope.isDrawNavbarNoteList = false;
});
});
```
### What type of PR is it?
[Bug Fix]
### Todos
NONE
### What is the Jira issue?
[ZEPPELIN-2420](https://issues.apache.org/jira/browse/ZEPPELIN-2420)
### How should this be tested?
1. Open navbar.
2. Notebook listing should appear immediately.
### 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: 1ambda <1am...@gmail.com>
Closes #2261 from 1ambda/ZEPPELIN-2420/slow-navbar-notebook-listing and
squashes the following commits:
b20b6c6 [1ambda] fix: Revert ng-show -> ng-if
4237def [1ambda] fix: Use uib-dropdown in navbar
0fccc50 [1ambda] style: reformat DOM
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7a0cb6c7
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7a0cb6c7
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7a0cb6c7
Branch: refs/heads/master
Commit: 7a0cb6c7a66e2f2b6b882d1a800e6daa05fc4f8c
Parents: 652911a
Author: 1ambda <1am...@gmail.com>
Authored: Wed Apr 19 10:54:37 2017 +0900
Committer: Lee moon soo
Committed: Thu Apr 20 11:15:17 2017 -0700
--
zeppelin-web/src/components/navbar/navbar.html | 22 ++---
1 file changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a0cb6c7/zeppelin-web/src/components/navbar/navbar.html
--
diff --git a/zeppelin-web/src/components/navbar/navbar.html
b/zeppelin-web/src/components/navbar/navbar.html
index 890bc5c..4a1115a 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -25,23 +25,23 @@ limitations under the License.
-
- Notebook
+
+ Notebook
Create new note
-
-
-
-
-
-
-
+
+
+
+
+
+
+
zeppelin git commit: [ZEPPELIN-2420] Slow notebook listing in navbar
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 840663224 -> 57a889679
[ZEPPELIN-2420] Slow notebook listing in navbar
### What is this PR for?
Notebook listing is slow as you can see in the screenshot below.
The problem was,
- angular-bootstrap was updated to 2.5
- then, `dropdown-*` directives should be converted into `uib-dropdown-*`
- otherwise, changes in angular controller scope values will not affect on the
directives even though events are fired. (`show.bs.dropdown`,
`hide.bs.dropdown`)
```
function initNotebookListEventListener() {
angular.element(document).ready(function() {
angular.element('.notebook-list-dropdown').on('show.bs.dropdown',
function() {
$scope.isDrawNavbarNoteList = true;
});
angular.element('.notebook-list-dropdown').on('hide.bs.dropdown',
function() {
$scope.isDrawNavbarNoteList = false;
});
});
```
### What type of PR is it?
[Bug Fix]
### Todos
NONE
### What is the Jira issue?
[ZEPPELIN-2420](https://issues.apache.org/jira/browse/ZEPPELIN-2420)
### How should this be tested?
1. Open navbar.
2. Notebook listing should appear immediately.
### 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: 1ambda <1am...@gmail.com>
Closes #2261 from 1ambda/ZEPPELIN-2420/slow-navbar-notebook-listing and
squashes the following commits:
b20b6c6 [1ambda] fix: Revert ng-show -> ng-if
4237def [1ambda] fix: Use uib-dropdown in navbar
0fccc50 [1ambda] style: reformat DOM
(cherry picked from commit 7a0cb6c7a66e2f2b6b882d1a800e6daa05fc4f8c)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/57a88967
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/57a88967
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/57a88967
Branch: refs/heads/branch-0.7
Commit: 57a8896792a97faa535a488e80a016d577a814b5
Parents: 8406632
Author: 1ambda <1am...@gmail.com>
Authored: Wed Apr 19 10:54:37 2017 +0900
Committer: Lee moon soo
Committed: Thu Apr 20 11:15:55 2017 -0700
--
zeppelin-web/src/components/navbar/navbar.html | 22 ++---
1 file changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/57a88967/zeppelin-web/src/components/navbar/navbar.html
--
diff --git a/zeppelin-web/src/components/navbar/navbar.html
b/zeppelin-web/src/components/navbar/navbar.html
index 890bc5c..4a1115a 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -25,23 +25,23 @@ limitations under the License.
-
- Notebook
+
+ Notebook
Create new note
-
-
-
-
-
-
-
+
+
+
+
+
+
+
zeppelin git commit: [ZEPPELIN-2374] sorting notes tree
Repository: zeppelin
Updated Branches:
refs/heads/master 09e8f7f0c -> 5124e62a1
[ZEPPELIN-2374] sorting notes tree
### What is this PR for?
Updated angular version to 1.5.7 (added comparator to orderBy). Sorting notes
tree, order:
1. folders (alphabetically)
2. notes (alphabetically)
3. Trash
### What type of PR is it?
Improvement
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2374
### How should this be tested?
see screenshots
### Screenshots (if appropriate)
home page
before - after
navbar
before - after
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Tinkoff DWH
Closes #2234 from tinkoff-dwh/ZEPPELIN-2374 and squashes the following commits:
6722904 [Tinkoff DWH] Merge remote-tracking branch 'upstream/master' into
ZEPPELIN-2374
7b439e5 [Tinkoff DWH] ZEPPELIN-2374 eslint fix
634524e [Tinkoff DWH] Merge remote-tracking branch 'origin/master' into
ZEPPELIN-2374
c6327ce [Tinkoff DWH] Merge remote-tracking branch 'upstream/master' into
ZEPPELIN-2374
f511cee [Tinkoff DWH] [ZEPPELIN-2374] update angular to 1.5.7. sorting notes
tree
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5124e62a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5124e62a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5124e62a
Branch: refs/heads/master
Commit: 5124e62a176580b9b721ebeb25274f37a80e638c
Parents: 09e8f7f
Author: Tinkoff DWH
Authored: Fri Apr 21 08:04:13 2017 +0500
Committer: Lee moon soo
Committed: Fri Apr 21 17:26:29 2017 -0700
--
zeppelin-web/bower.json | 16 ++--
zeppelin-web/src/app/home/home.controller.js| 4 +++
zeppelin-web/src/app/home/home.html | 6 ++---
.../src/app/home/notebook-template.html | 4 +--
zeppelin-web/src/app/home/notebook.html | 4 +--
.../arrayOrderingSrv/arrayOrdering.service.js | 26
.../components/navbar/navbar-noteList-elem.html | 2 +-
zeppelin-web/src/components/navbar/navbar.html | 18 +++---
8 files changed, 55 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5124e62a/zeppelin-web/bower.json
--
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index 6547e83..690cd15 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -2,16 +2,16 @@
"name": "zeppelin-web",
"version": "0.0.0",
"dependencies": {
-"angular": "1.5.0",
+"angular": "1.5.7",
"json3": "~3.3.1",
"es5-shim": "~3.1.0",
"bootstrap": "~3.2.0",
-"angular-cookies": "1.5.0",
-"angular-sanitize": "1.5.0",
-"angular-animate": "1.5.0",
-"angular-touch": "1.5.0",
-"angular-route": "1.5.0",
-"angular-resource": "1.5.0",
+"angular-cookies": "1.5.7",
+"angular-sanitize": "1.5.7",
+"angular-animate": "1.5.7",
+"angular-touch": "1.5.7",
+"angular-route": "1.5.7",
+"angular-resource": "1.5.7",
"angular-bootstrap": "~2.5.0",
"angular-websocket": "~1.0.13",
"ace-builds": "1.2.6",
@@ -38,7 +38,7 @@
"ngclipboard": "^1.1.1"
},
"devDependencies": {
-"angular-mocks": "1.5.0"
+"angular-mocks": "1.5.7"
},
"appPath": "src",
"overrides": {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5124e62a/zeppelin-web/src/app/home/home.controller.js
--
diff --git a/zeppelin-web/src/app/home/home.controller.js
b/zeppelin-web/src/app/home/home.controller.js
index e8fccb9..83f9681 100644
--- a/zeppelin-web/src/app/home/home.controller.js
+++ b/zeppelin-web/src/app/home/home.controller.js
@@ -143,4 +143,8 @@ function HomeCtrl ($scope, noteListDataFactory,
websocketMsgSrv, $rootScope, arr
$scope.getNoteName = function (note) {
return
zeppelin git commit: [ZEPPELIN-2408] Should use $uibTooltip instead of $tooltip
Repository: zeppelin
Updated Branches:
refs/heads/master 5124e62a1 -> dad440dd1
[ZEPPELIN-2408] Should use $uibTooltip instead of $tooltip
### What is this PR for?
Since we are using angular-bootstrap 2.5+, we should use `$uibTooltip` instead
of `$tooltip`
otherwise we will get an error like the screenshot below.
See also https://github.com/angular-ui/bootstrap/issues/4591
### What type of PR is it?
[Bug Fix]
### Todos
NONE
### What is the Jira issue?
[ZEPPELIN-2048](https://issues.apache.org/jira/browse/ZEPPELIN-2408)
### How should this be tested?
1. open browser console
2. click the scatter chart.
3. shouldn't see an error
### 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: 1ambda <1am...@gmail.com>
Closes #2260 from 1ambda/ZEPPELIN-2048/fix-tooltip-provider and squashes the
following commits:
e779c43 [1ambda] fix: Use
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/dad440dd
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/dad440dd
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/dad440dd
Branch: refs/heads/master
Commit: dad440dd16a3b67c11c8d2aec5a793ea7ec7defc
Parents: 5124e62
Author: 1ambda <1am...@gmail.com>
Authored: Wed Apr 19 10:25:53 2017 +0900
Committer: Lee moon soo
Committed: Fri Apr 21 17:27:25 2017 -0700
--
.../popover-html-unsafe/popover-html-unsafe.directive.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad440dd/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
--
diff --git
a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
b/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
index d4dd546..a1f25b2 100644
---
a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
+++
b/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
@@ -14,8 +14,8 @@
angular.module('zeppelinWebApp').directive('popoverHtmlUnsafe',
popoverHtmlUnsafe)
-function popoverHtmlUnsafe ($tooltip) {
+function popoverHtmlUnsafe ($uibTooltip) {
'ngInject'
- return $tooltip('popoverHtmlUnsafe', 'popover', 'click')
+ return $uibTooltip('popoverHtmlUnsafe', 'popover', 'click')
}
zeppelin git commit: [ZEPPELIN-2408] Should use $uibTooltip instead of $tooltip
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 57a889679 -> da142d1e4
[ZEPPELIN-2408] Should use $uibTooltip instead of $tooltip
Since we are using angular-bootstrap 2.5+, we should use `$uibTooltip` instead
of `$tooltip`
otherwise we will get an error like the screenshot below.
See also https://github.com/angular-ui/bootstrap/issues/4591
[Bug Fix]
NONE
[ZEPPELIN-2048](https://issues.apache.org/jira/browse/ZEPPELIN-2408)
1. open browser console
2. click the scatter chart.
3. shouldn't see an error
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2260 from 1ambda/ZEPPELIN-2048/fix-tooltip-provider and squashes the
following commits:
e779c43 [1ambda] fix: Use
(cherry picked from commit dad440dd16a3b67c11c8d2aec5a793ea7ec7defc)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/da142d1e
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/da142d1e
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/da142d1e
Branch: refs/heads/branch-0.7
Commit: da142d1e4c4a618dbd0ed4ae0a5adacd375bb80e
Parents: 57a8896
Author: 1ambda <1am...@gmail.com>
Authored: Wed Apr 19 10:25:53 2017 +0900
Committer: Lee moon soo
Committed: Fri Apr 21 17:39:28 2017 -0700
--
.../popover-html-unsafe/popover-html-unsafe.directive.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/da142d1e/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
--
diff --git
a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
b/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
index 386a358..87e1d1e 100644
---
a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
+++
b/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
@@ -14,9 +14,9 @@
angular.module('zeppelinWebApp').directive('popoverHtmlUnsafe',
popoverHtmlUnsafe);
-popoverHtmlUnsafe.$inject = ['$tooltip'];
+popoverHtmlUnsafe.$inject = ['$uibTooltip'];
-function popoverHtmlUnsafe($tooltip) {
- return $tooltip('popoverHtmlUnsafe', 'popover', 'click');
+function popoverHtmlUnsafe ($uibTooltip) {
+ return $uibTooltip('popoverHtmlUnsafe', 'popover', 'click')
}
zeppelin git commit: [ZEPPELIN-1828] Flaky Test: RemoteInterpreterTest hanged in zeppelin-interpreter
Repository: zeppelin
Updated Branches:
refs/heads/master dad440dd1 -> 2f9011405
[ZEPPELIN-1828] Flaky Test: RemoteInterpreterTest hanged in zeppelin-interpreter
### What is this PR for?
When `interpreter.close()` occurs in code it shuts down
_RemoteInterpreterEventPoller_ and then tries to close thrift connection. While
closing thrift client will wait until events queue is empty. If
_RemoteInterpreterEventPoller_ has not processed all thrift events before the
shutdown signal comes, thrift client will wait forever. As a result Travis will
terminate the build after code is not responding for 10 minutes.
### What type of PR is it?
[Bug Fix]
### Todos
We need to:
* [x] - write a test that checks that event queue is empty after
_RemoteInterpreterEventPoller_ is done,
* [x] - clear unread events on _RemoteInterpreterEventPoller_ shutdown signal.
### What is the Jira issue?
[ZEPPELIN-1828](https://issues.apache.org/jira/browse/ZEPPELIN-1828)
### How should this be tested?
This issue can be reprodused if you put `Thread.sleep(3000L);` to
_RemoteInterpreterEventPoller.java_
```
...
} else if (event.getType() == RemoteInterpreterEventType.OUTPUT_UPDATE_ALL) {
Thread.sleep(3000L);
...
}
```
and run _RemoteInterpreterTest.java_.
### Questions:
* Does the licenses files need update? **no**
* Is there breaking changes for older versions? **no**
* Does this needs documentation? **no**
Author: Alexander Shoshin
Closes #2246 from AlexanderShoshin/ZEPPELIN-1828 and squashes the following
commits:
5818a83 [Alexander Shoshin] clear unread events on shutdown
66fe9c7 [Alexander Shoshin] test that EventPoller clear unread events on
shutdown
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2f901140
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2f901140
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2f901140
Branch: refs/heads/master
Commit: 2f90114055e4f5af0f6d051d0ce1da1c6204bd97
Parents: dad440d
Author: Alexander Shoshin
Authored: Wed Apr 12 11:04:31 2017 +0300
Committer: Lee moon soo
Committed: Fri Apr 21 21:44:05 2017 -0700
--
.../remote/RemoteInterpreterEventPoller.java| 9
.../RemoteInterpreterEventPollerTest.java | 55
2 files changed, 64 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2f901140/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java
index c841c71..126a46f 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java
@@ -266,11 +266,20 @@ public class RemoteInterpreterEventPoller extends Thread {
logger.error("Can't handle event " + event, e);
}
}
+try {
+ clearUnreadEvents(interpreterProcess.getClient());
+} catch (Exception e1) {
+ logger.error("Can't get RemoteInterpreterEvent", e1);
+}
if (appendFuture != null) {
appendFuture.cancel(true);
}
}
+ private void clearUnreadEvents(Client client) throws TException {
+while (client.getEvent().getType() != RemoteInterpreterEventType.NO_OP) {}
+ }
+
private void progressRemoteZeppelinControlEvent(
RemoteZeppelinServerResource.Type resourceType,
RemoteInterpreterProcessListener remoteWorksEventListener,
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2f901140/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java
--
diff --git
a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java
b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java
new file mode 100644
index 000..49aa7aa
--- /dev/null
+++
b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPollerTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License&
zeppelin git commit: [ZEPPELIN-2410]: Using UUID from filename in registry cache dir inste…
Repository: zeppelin
Updated Branches:
refs/heads/master 2f9011405 -> 96de73049
[ZEPPELIN-2410]: Using UUID from filename in registry cache dir insteâ¦
â¦ad of uri.
### What is this PR for?
Fixing issue ZEPPELIN-2410:
The previous version of this file used the full uri as file name in the
cache. This included special characters like the : in http: which
caused problems.
Since this is just a cache file, a better approach is to use an UUID.
The UUID is constructed from the URI to avoid the cache dir to grow
over time (in case there is no clean up of the cache dir).
Output of `ls -la` on macOS before the fix:
```
drwxr-xr-x 4 fries staff 136 17 Apr 22:28 .
drwxr-xr-x 8 fries staff 272 21 Apr 12:43 ..
drwxr-xr-x 3 fries staff 102 17 Apr 10:39 https:
```
Output of `ls -la` on macOS after the fix:
```
drwxr-xr-x 4 fries staff136 21 Apr 17:32 .
drwxr-xr-x 8 fries staff272 21 Apr 17:32 ..
-rw-r--r-- 1 fries staff 89666 21 Apr 17:32
a6618b3e-540a-340e-b624-07bf7f2b5e7d
```
Note: Windows 7 just fails to create the cache before the fix.
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2410?filter=-2
### How should this be tested?
Non-Regression Test.
Run on Windows, check cache dir.
### Screenshots (if appropriate)
N/A
### Questions:
* Does the licenses files need update?
No
* Is there breaking changes for older versions?
No
* Does this needs documentation?
No
Author: Christian Fries
Closes #2276 from cfries/helium-cache-filename-patch and squashes the following
commits:
5fda58f [Christian Fries] [ZEPPELIN-2410]: Using UUID from filename in registry
cache dir instead of uri.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/96de7304
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/96de7304
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/96de7304
Branch: refs/heads/master
Commit: 96de73049fb34877bc6049891f34d835e220a013
Parents: 2f90114
Author: Christian Fries
Authored: Fri Apr 21 17:07:00 2017 +0200
Committer: Lee moon soo
Committed: Sat Apr 22 19:12:50 2017 -0700
--
.../java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/96de7304/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
index d6bf499..b1c3a83 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
@@ -32,6 +32,7 @@ import java.net.URL;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
/**
* This registry reads helium package json data
@@ -55,7 +56,10 @@ public class HeliumOnlineRegistry extends HeliumRegistry {
public HeliumOnlineRegistry(String name, String uri, File registryCacheDir) {
super(name, uri);
registryCacheDir.mkdirs();
-this.registryCacheFile = new File(registryCacheDir, name);
+
+UUID registryCacheFileUuid = UUID.nameUUIDFromBytes(uri.getBytes());
+this.registryCacheFile = new File(registryCacheDir,
registryCacheFileUuid.toString());
+
gson = new Gson();
}
zeppelin git commit: [ZEPPELIN-2434] Credential feature does work in JDBC interpreter
Repository: zeppelin
Updated Branches:
refs/heads/master 96de73049 -> da793f372
[ZEPPELIN-2434] Credential feature does work in JDBC interpreter
### What is this PR for?
Credential feature does not work in JDBC interpreter.
This PR fixes unittest that does not detect this bug and fix jdbc interpreter
to correctly read credential.
### What type of PR is it?
Bug Fix
### Todos
* [x] - Fix unittest
* [x] - Fix condition when use credential, when use property.
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2434
### How should this be tested?
Set empty `default.user` property and set id/pw in 'credential' menu. And try
use jdbc interpreter.
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo
Closes #2269 from Leemoonsoo/jdbc_credential and squashes the following commits:
1de7ea6 [Lee moon soo] Use crednetial information instead of property when user
is empty string.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/da793f37
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/da793f37
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/da793f37
Branch: refs/heads/master
Commit: da793f37228c80a21be2a2b6cc891c9704cf0819
Parents: 96de730
Author: Lee moon soo
Authored: Thu Apr 20 17:31:44 2017 -0700
Committer: Lee moon soo
Committed: Sat Apr 22 19:16:21 2017 -0700
--
.../org/apache/zeppelin/jdbc/JDBCInterpreter.java | 11 +--
.../apache/zeppelin/jdbc/JDBCInterpreterTest.java | 18 +-
2 files changed, 14 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/da793f37/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
--
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index ff3d3cf..cc2c55b 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -149,7 +149,7 @@ public class JDBCInterpreter extends Interpreter {
logger.debug("propertyKey: {}", propertyKey);
String[] keyValue = propertyKey.split("\\.", 2);
if (2 == keyValue.length) {
-logger.info("key: {}, value: {}", keyValue[0], keyValue[1]);
+logger.debug("key: {}, value: {}", keyValue[0], keyValue[1]);
Properties prefixProperties;
if (basePropretiesMap.containsKey(keyValue[0])) {
@@ -249,6 +249,7 @@ public class JDBCInterpreter extends Interpreter {
private boolean existAccountInBaseProperty(String propertyKey) {
return basePropretiesMap.get(propertyKey).containsKey(USER_KEY) &&
+!isEmpty((String) basePropretiesMap.get(propertyKey).get(USER_KEY)) &&
basePropretiesMap.get(propertyKey).containsKey(PASSWORD_KEY);
}
@@ -295,7 +296,6 @@ public class JDBCInterpreter extends Interpreter {
}
}
jdbcUserConfigurations.setPropertyMap(propertyKey,
basePropretiesMap.get(propertyKey));
-
if (existAccountInBaseProperty(propertyKey)) {
return;
}
@@ -576,7 +576,7 @@ public class JDBCInterpreter extends Interpreter {
String precode = getProperty(String.format(PRECODE_KEY_TEMPLATE,
propertyKey));
if (StringUtils.isNotBlank(precode)) {
precode = StringUtils.trim(precode);
- logger.info("Run SQL precode '{}'", precode);
+ logger.debug("Run SQL precode '{}'", precode);
try (Statement statement = connection.createStatement()) {
statement.execute(precode);
if (!connection.getAutoCommit()) {
@@ -720,7 +720,7 @@ public class JDBCInterpreter extends Interpreter {
@Override
public InterpreterResult interpret(String cmd, InterpreterContext
contextInterpreter) {
-logger.info("Run SQL command '{}'", cmd);
+logger.debug("Run SQL command '{}'", cmd);
String propertyKey = getPropertyKey(cmd);
if (null != propertyKey && !propertyKey.equals(DEFAULT_KEY)) {
@@ -728,8 +728,7 @@ public class JDBCInterpreter extends Interpreter {
}
cmd = cmd.trim();
-
-logger.info("PropertyKey: {}, SQL command: '{}'", propertyKey, cmd);
+logger.debug("PropertyKey: {}, SQL command: '{}'", propertyKey, cmd);
return executeSql(propertyKey, cmd, contextInterpreter);
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/da793f37/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterprete
zeppelin git commit: [ZEPPELIN-2434] Credential feature does work in JDBC interpreter
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 da142d1e4 -> 090f67dad
[ZEPPELIN-2434] Credential feature does work in JDBC interpreter
Credential feature does not work in JDBC interpreter.
This PR fixes unittest that does not detect this bug and fix jdbc interpreter
to correctly read credential.
Bug Fix
* [x] - Fix unittest
* [x] - Fix condition when use credential, when use property.
https://issues.apache.org/jira/browse/ZEPPELIN-2434
Set empty `default.user` property and set id/pw in 'credential' menu. And try
use jdbc interpreter.
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo
Closes #2269 from Leemoonsoo/jdbc_credential and squashes the following commits:
1de7ea6 [Lee moon soo] Use crednetial information instead of property when user
is empty string.
(cherry picked from commit da793f37228c80a21be2a2b6cc891c9704cf0819)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/090f67da
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/090f67da
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/090f67da
Branch: refs/heads/branch-0.7
Commit: 090f67dadc880b36c4e2bddc2532d895ce705a4b
Parents: da142d1
Author: Lee moon soo
Authored: Thu Apr 20 17:31:44 2017 -0700
Committer: Lee moon soo
Committed: Sat Apr 22 19:18:31 2017 -0700
--
.../org/apache/zeppelin/jdbc/JDBCInterpreter.java | 9 -
.../apache/zeppelin/jdbc/JDBCInterpreterTest.java | 18 +-
2 files changed, 13 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/090f67da/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
--
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index eb9e032..ad456be 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -156,7 +156,7 @@ public class JDBCInterpreter extends Interpreter {
logger.debug("propertyKey: {}", propertyKey);
String[] keyValue = propertyKey.split("\\.", 2);
if (2 == keyValue.length) {
-logger.info("key: {}, value: {}", keyValue[0], keyValue[1]);
+logger.debug("key: {}, value: {}", keyValue[0], keyValue[1]);
Properties prefixProperties;
if (basePropretiesMap.containsKey(keyValue[0])) {
@@ -267,6 +267,7 @@ public class JDBCInterpreter extends Interpreter {
private boolean existAccountInBaseProperty(String propertyKey) {
return basePropretiesMap.get(propertyKey).containsKey(USER_KEY) &&
+!isEmpty((String) basePropretiesMap.get(propertyKey).get(USER_KEY)) &&
basePropretiesMap.get(propertyKey).containsKey(PASSWORD_KEY);
}
@@ -313,7 +314,6 @@ public class JDBCInterpreter extends Interpreter {
}
}
jdbcUserConfigurations.setPropertyMap(propertyKey,
basePropretiesMap.get(propertyKey));
-
if (existAccountInBaseProperty(propertyKey)) {
return;
}
@@ -680,7 +680,7 @@ public class JDBCInterpreter extends Interpreter {
@Override
public InterpreterResult interpret(String cmd, InterpreterContext
contextInterpreter) {
-logger.info("Run SQL command '{}'", cmd);
+logger.debug("Run SQL command '{}'", cmd);
String propertyKey = getPropertyKey(cmd);
if (null != propertyKey && !propertyKey.equals(DEFAULT_KEY)) {
@@ -688,8 +688,7 @@ public class JDBCInterpreter extends Interpreter {
}
cmd = cmd.trim();
-
-logger.info("PropertyKey: {}, SQL command: '{}'", propertyKey, cmd);
+logger.debug("PropertyKey: {}, SQL command: '{}'", propertyKey, cmd);
return executeSql(propertyKey, cmd, contextInterpreter);
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/090f67da/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
--
diff --git
a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
index 0c68322..2db3087 100644
--- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
+++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
@@ -334,18 +334,18 @@ public class JDBCInterpreterTest extends
BasicJDBCTestCaseAdapter {
* 'jdbc1' interpreter has user('dbuse
zeppelin git commit: [ZEPPELIN-2439] Use babel-preset-env to specify browser compatibility explicitly
Repository: zeppelin
Updated Branches:
refs/heads/master da793f372 -> bc1b4be8c
[ZEPPELIN-2439] Use babel-preset-env to specify browser compatibility explicitly
### What is this PR for?
Use babel-preset-env to specify browser compatibility explicitly.
- This will help to resolve some IE browser issues.
- Additionally, we don't need to add more presets like es2017, just update
preset env when we need.
Specified browser lists are
- last 5 versions of major browsers
- `> %5` in the world
- IE 9+
- edge 12+
- safari 7+
- chrome 47+
- firefox 31+ (due to travis CI)
See also - [Browser Compatibility
Table](https://kangax.github.io/compat-table/es6/)
### What type of PR is it?
[Improvement]
### Todos
* [x] - Setup babel-preset-env for web
* [x] - Setup babel-preset-env for helium
### What is the Jira issue?
[ZEPPELIN-2439](https://issues.apache.org/jira/browse/ZEPPELIN-2439)
### How should this be tested?
1. should be able to bundle existing helium packages
2. execute `npm run build` in `zeppelin-web`
3. should be able to see message like
```
babel-preset-env: `DEBUG` option
Using targets:
{
"chrome": 47,
"edge": 12,
"firefox": 31,
"ie": 7,
"ios": 8,
"safari": 7
}
Modules transform: commonjs
Using plugins:
check-es2015-constants
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-arrow-functions
{"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-block-scoped-functions
{"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-block-scoping
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-classes {"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-computed-properties {"firefox":31,"ie":7,"safari":7}
transform-es2015-destructuring
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-duplicate-keys {"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-for-of
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-function-name
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-literals {"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-object-super
{"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-parameters
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-shorthand-properties {"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-spread {"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-sticky-regex
{"chrome":47,"edge":12,"ie":7,"ios":8,"safari":7}
transform-es2015-template-literals
{"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-typeof-symbol {"firefox":31,"ie":7,"ios":8,"safari":7}
transform-es2015-unicode-regex
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-regenerator
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-exponentiation-operator
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
transform-async-to-generator
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
syntax-trailing-function-commas
{"chrome":47,"edge":12,"firefox":31,"ie":7,"ios":8,"safari":7}
```
### Screenshots (if appropriate)
NONE
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2273 from 1ambda/ZEPPELIN-2439/use-babel-preset-env and squashes the
following commits:
a62d9b3 [1ambda] feat: Apply preset env to helium
244468d [1ambda] feat: Apply preset env to zeppelin-web
Project: http://git-wip-us.apache.org/repos/
zeppelin git commit: [ZEPPELIN-2375]: Avoid modification of CLASSPATH variable.
Repository: zeppelin
Updated Branches:
refs/heads/master bc1b4be8c -> a3c78a4f4
[ZEPPELIN-2375]: Avoid modification of CLASSPATH variable.
The script previously modified the CLASSPATH variable. This may lead to
an undesired side effect, where the zeppelin server classpath is
exported to the zeppelin interpreter classpath, see JIRA issue
ZEPPELIN-2375 for details. Instead of modifying classpath we now work
the other way around and set ZEPPELIN_CLASSPATH or
ZEPPELIN_INT_CLASSPATH to include CLASSPATH and then use
ZEPPELIN_CLASSPATH or ZEPPELIN_INT_CLASSPATH in the corresponding exec
(runner), respectively.
See also https://issues.apache.org/jira/browse/ZEPPELIN-2375
### What is this PR for?
Fixing issue https://issues.apache.org/jira/browse/ZEPPELIN-2375
### What type of PR is it?
Bug Fix
### Todos
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2375
### How should this be tested?
Without this fix, the following fails on macOS Sierra (OS X):
1. Open bash, set CLASSPATH to empty string and export it using `export
CLASSPATH=`, then start zeppelin via `./bin/zepplin.sh`
2. Create and run a notebook with the md interpreter.
3. Results in an exception.
4. Stop zeppelin. Repeat the test with this fix.
See https://issues.apache.org/jira/browse/ZEPPELIN-2375
### 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: Christian Fries
Closes #2235 from cfries/master and squashes the following commits:
3635ed8 [Christian Fries] [ZEPPELIN-2375]: Avoid modification of CLASSPATH
variable.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a3c78a4f
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a3c78a4f
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a3c78a4f
Branch: refs/heads/master
Commit: a3c78a4f49653ee66b0316c694bf57bf1c38a53b
Parents: bc1b4be
Author: Christian Fries
Authored: Sat Apr 8 22:00:33 2017 +0200
Committer: Lee moon soo
Committed: Sat Apr 22 19:21:51 2017 -0700
--
bin/interpreter.sh | 10 --
bin/zeppelin.sh| 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a3c78a4f/bin/interpreter.sh
--
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index a9d8f32..29d0221 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -64,7 +64,7 @@ fi
. "${bin}/common.sh"
-ZEPPELIN_INTP_CLASSPATH=""
+ZEPPELIN_INTP_CLASSPATH="${CLASSPATH}"
# construct classpath
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
@@ -190,8 +190,6 @@ fi
addJarInDirForIntp "${LOCAL_INTERPRETER_REPO}"
-CLASSPATH+=":${ZEPPELIN_INTP_CLASSPATH}"
-
if [[ ! -z "$ZEPPELIN_IMPERSONATE_USER" ]]; then
suid="$(id -u ${ZEPPELIN_IMPERSONATE_USER})"
if [[ -n "${suid}" || -z "${SPARK_SUBMIT}" ]]; then
@@ -204,12 +202,12 @@ fi
if [[ -n "${SPARK_SUBMIT}" ]]; then
if [[ -n "$ZEPPELIN_IMPERSONATE_USER" ]] && [[
"$ZEPPELIN_IMPERSONATE_SPARK_PROXY_USER" != "false" ]]; then
- INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class
${ZEPPELIN_SERVER} --driver-class-path
\"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH}\" --driver-java-options
\"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} --proxy-user
${ZEPPELIN_IMPERSONATE_USER} ${SPARK_APP_JAR} ${PORT}`
+ INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class
${ZEPPELIN_SERVER} --driver-class-path
\"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${ZEPPELIN_INTP_CLASSPATH}\"
--driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS}
--proxy-user ${ZEPPELIN_IMPERSONATE_USER} ${SPARK_APP_JAR} ${PORT}`
else
- INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class
${ZEPPELIN_SERVER} --driver-class-path
\"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH}\" --driver-java-options
\"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT}`
+ INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class
${ZEPPELIN_SERVER} --driver-class-path
\"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${ZEPPELIN_INTP_CLASSPATH}\"
--driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS}
${SPARK_APP_JAR} ${PORT}`
fi
else
-INTERPRETER_RUN_COMMAND+=' '` echo ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS}
${ZEPPELIN_INTP_MEM} -cp ${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLA
zeppelin git commit: [ZEPPELIN-2375]: Avoid modification of CLASSPATH variable.
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 090f67dad -> f1064f62d
[ZEPPELIN-2375]: Avoid modification of CLASSPATH variable.
The script previously modified the CLASSPATH variable. This may lead to
an undesired side effect, where the zeppelin server classpath is
exported to the zeppelin interpreter classpath, see JIRA issue
ZEPPELIN-2375 for details. Instead of modifying classpath we now work
the other way around and set ZEPPELIN_CLASSPATH or
ZEPPELIN_INT_CLASSPATH to include CLASSPATH and then use
ZEPPELIN_CLASSPATH or ZEPPELIN_INT_CLASSPATH in the corresponding exec
(runner), respectively.
See also https://issues.apache.org/jira/browse/ZEPPELIN-2375
### What is this PR for?
Fixing issue https://issues.apache.org/jira/browse/ZEPPELIN-2375
### What type of PR is it?
Bug Fix
### Todos
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2375
### How should this be tested?
Without this fix, the following fails on macOS Sierra (OS X):
1. Open bash, set CLASSPATH to empty string and export it using `export
CLASSPATH=`, then start zeppelin via `./bin/zepplin.sh`
2. Create and run a notebook with the md interpreter.
3. Results in an exception.
4. Stop zeppelin. Repeat the test with this fix.
See https://issues.apache.org/jira/browse/ZEPPELIN-2375
### 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: Christian Fries
Closes #2235 from cfries/master and squashes the following commits:
3635ed8 [Christian Fries] [ZEPPELIN-2375]: Avoid modification of CLASSPATH
variable.
(cherry picked from commit a3c78a4f49653ee66b0316c694bf57bf1c38a53b)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f1064f62
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f1064f62
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f1064f62
Branch: refs/heads/branch-0.7
Commit: f1064f62d2fd4c22b13b18a029c4c8bcb70031f8
Parents: 090f67d
Author: Christian Fries
Authored: Sat Apr 8 22:00:33 2017 +0200
Committer: Lee moon soo
Committed: Sat Apr 22 19:21:59 2017 -0700
--
bin/interpreter.sh | 10 --
bin/zeppelin.sh| 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f1064f62/bin/interpreter.sh
--
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 0132b42..0a125d7 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -61,7 +61,7 @@ fi
. "${bin}/common.sh"
-ZEPPELIN_INTP_CLASSPATH=""
+ZEPPELIN_INTP_CLASSPATH="${CLASSPATH}"
# construct classpath
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
@@ -184,8 +184,6 @@ fi
addJarInDirForIntp "${LOCAL_INTERPRETER_REPO}"
-CLASSPATH+=":${ZEPPELIN_INTP_CLASSPATH}"
-
if [[ ! -z "$ZEPPELIN_IMPERSONATE_USER" ]]; then
suid="$(id -u ${ZEPPELIN_IMPERSONATE_USER})"
if [[ -n "${suid}" || -z "${SPARK_SUBMIT}" ]]; then
@@ -198,12 +196,12 @@ fi
if [[ -n "${SPARK_SUBMIT}" ]]; then
if [[ -n "$ZEPPELIN_IMPERSONATE_USER" ]] && [[
"$ZEPPELIN_IMPERSONATE_SPARK_PROXY_USER" != "false" ]]; then
- INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class
${ZEPPELIN_SERVER} --driver-class-path
\"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH}\" --driver-java-options
\"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} --proxy-user
${ZEPPELIN_IMPERSONATE_USER} ${SPARK_APP_JAR} ${PORT}`
+ INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class
${ZEPPELIN_SERVER} --driver-class-path
\"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${ZEPPELIN_INTP_CLASSPATH}\"
--driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS}
--proxy-user ${ZEPPELIN_IMPERSONATE_USER} ${SPARK_APP_JAR} ${PORT}`
else
- INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class
${ZEPPELIN_SERVER} --driver-class-path
\"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${CLASSPATH}\" --driver-java-options
\"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT}`
+ INTERPRETER_RUN_COMMAND+=' '` echo ${SPARK_SUBMIT} --class
${ZEPPELIN_SERVER} --driver-class-path
\"${ZEPPELIN_INTP_CLASSPATH_OVERRIDES}:${ZEPPELIN_INTP_CLASSPATH}\"
--driver-java-options \"${JAVA_INTP_OPTS}\" ${SPARK_SUBMIT_OPTIONS}
${SPARK_APP_JAR} ${PORT}`
fi
else
-INTERPRETER_RUN_COMMAND+=' '` echo $
zeppelin git commit: [ZEPPELIN-2409] DON'T block body scrolling in results scrollbar
Repository: zeppelin
Updated Branches:
refs/heads/master a3c78a4f4 -> 6eecdecb5
[ZEPPELIN-2409] DON'T block body scrolling in results scrollbar
### What is this PR for?
DON'T block body scrolling in results scrollbar.
See the GIFs below.
### What type of PR is it?
[Improvement]
### Todos
NONE
### What is the Jira issue?
[ZEPPELIN-2409](https://issues.apache.org/jira/browse/ZEPPELIN-2409)
### How should this be tested?
1. Create multiple paragraphs including scrollbar in result. For example,
```
bank.printSchema
bank.show()
```
```
select * from bank limit 1000
```
2. Scrolling down, up
### Screenshots (if appropriate)
Before
After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2270 from 1ambda/ZEPPELIN-2407/dont-block-body-scroll-in-para-results
and squashes the following commits:
a427d1d [1ambda] fix: Apply getPointEvent all types
33a7c36 [1ambda] fix: DON'T block body scrolling in para results scrollbar
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/6eecdecb
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/6eecdecb
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/6eecdecb
Branch: refs/heads/master
Commit: 6eecdecb5d590fba5c5b0216da4bcd2e8b22d933
Parents: a3c78a4
Author: 1ambda <1am...@gmail.com>
Authored: Sun Apr 23 11:04:18 2017 +0900
Committer: Lee moon soo
Committed: Sun Apr 23 21:47:50 2017 -0700
--
.../paragraph/result/result.controller.js | 9
.../app/notebook/paragraph/result/result.html | 43 +---
2 files changed, 37 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6eecdecb/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
--
diff --git
a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
index 71104b5..0ed5753 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
@@ -138,6 +138,15 @@ function ResultCtrl ($scope, $rootScope, $route, $window,
$routeParams, $locatio
// queue for append output
const textResultQueueForAppend = []
+ // prevent body area scrollbar from blocking due to scroll in paragraph
results
+ $scope.mouseOver = false
+ $scope.onMouseOver = function() { $scope.mouseOver = true }
+ $scope.onMouseOut = function() { $scope.mouseOver = false }
+ $scope.getPointerEvent = function() {
+return ($scope.mouseOver) ? {'pointer-events': 'auto' }
+ : {'pointer-events': 'none' }
+ }
+
$scope.init = function (result, config, paragraph, index) {
// register helium plugin vis
let visBundles = heliumService.getVisualizationBundles()
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6eecdecb/zeppelin-web/src/app/notebook/paragraph/result/result.html
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.html
b/zeppelin-web/src/app/notebook/paragraph/result/result.html
index 61ed2d7..5a523de 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result.html
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.html
@@ -15,17 +15,19 @@ limitations under the License.
+resizable on-resize="resize(width, height);">
-
+
+ ng-show="graphMode!='table' && config.graph.optionOpen && !asIframe
&& !viewOnly">
@@ -52,7 +54,8 @@ limitations under the License.
+ class="plainTextContainer"
+ ng-style="getPointerEvent()">
-
+
-
+
-
+
-
+
+ ng-src="{{getBase64ImageSrc(result.data)}}"
+ ng-style="getPointerEvent()" />
+ ng-show="config.helium.activeApp == app.id"
+ ng-style="getPointerEvent()">
zeppelin git commit: [HOTFIX] Fix CI build failure on branch-0.6
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 ad806ff77 -> 662b7d684 [HOTFIX] Fix CI build failure on branch-0.6 ### What is this PR for? Fix CI build failure on branch-0.6. ### What type of PR is it? Hot Fix ### Todos - Modified [.travis.yml](https://github.com/apache/zeppelin/blob/branch-0.6/.travis.yml) according to #1774 - Merged PR #1920 #1911 - Update spark version and hadoop version in [.travis.yml](https://github.com/apache/zeppelin/blob/branch-0.6/.travis.yml) since older spark version below 1.6.2 can not be downloaded from remote server any more. ### What is the Jira issue? No related Jira issue ### How should this be tested? See if CI becomes green ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Igor Drozdov Author: Lee moon soo Author: z0621 Closes #2262 from hammertank/HOTFIX and squashes the following commits: 380432c [z0621] [HOTFIX] Fix CI build failure on branch-0.6 f1c8041 [Igor Drozdov] [ZEPPELIN-1972] Preserve context classloader 4ae3adb [Lee moon soo] [ZEPPELIN-1455] Fix flaky test: AbstractAngularElemTest Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/662b7d68 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/662b7d68 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/662b7d68 Branch: refs/heads/branch-0.6 Commit: 662b7d6846c7b47c777916259f55e3ec1ffaf8df Parents: ad806ff Author: Igor Drozdov Authored: Mon Apr 24 09:42:21 2017 +0800 Committer: Lee moon soo Committed: Fri Apr 28 01:13:31 2017 -0700 -- .travis.yml | 34 ++--- .../zeppelin/ignite/IgniteInterpreter.java | 22 ++-- travis_check.py | 125 +++ .../angular/AbstractAngularElemTest.scala | 7 +- 4 files changed, 151 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/662b7d68/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 680a9f5..75d8ac2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,52 +28,32 @@ addons: - r-packages-precise packages: - r-base-dev -- r-cran-evaluate -- r-cran-base64enc matrix: include: # Test all modules with spark 2.0.0 and scala 2.11 - jdk: "oraclejdk7" - env: SCALA_VER="2.11" SPARK_VER="2.0.0" HADOOP_VER="2.3" PROFILE="-Pspark-2.0 -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.11" SPARK_VER="2.0.2" HADOOP_VER="2.6" PROFILE="-Pspark-2.0 -Phadoop-2.6 -Ppyspark -Psparkr -Pscalding -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" # Test all modules with scala 2.10 - jdk: "oraclejdk7" - env: SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pscala-2.10" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.10" SPARK_VER="1.6.3" HADOOP_VER="2.6" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.6 -Ppyspark -Psparkr -Pscalding -Pscala-2.10" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" # Test all modules with scala 2.11 - jdk: "oraclejdk7" - env: SCALA_VER="2.11" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.11" SPARK_VER="1.6.3" HADOOP_VER="2.6" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.6 -Ppyspark -Psparkr -Pscalding -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" -# Test spark module for 1.5.2 +# Test selenium with spark module for 1.6.3 - jdk: "oraclejdk7" - env: SCALA_VER="2.10" SPARK_VER="1.5.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.5 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG
zeppelin git commit: added principalSuffix to AD examples
Repository: zeppelin Updated Branches: refs/heads/branch-0.7 d45fdf921 -> 971d17e12 added principalSuffix to AD examples ### What is this PR for? Documentation - Adding an example use of prinicpalSuffix to the Active Directory authentication documentation. It took us a while to figure out that the lack of a principalSuffix was our problem and then a bit more hunting to figure out how to automatically include it ### What type of PR is it? Improvement ### 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? Outline the 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: Paul Brenner Closes #2281 from paul-brenner/patch-1 and squashes the following commits: 2ff57a9 [Paul Brenner] added principalSuffix to AD examples (cherry picked from commit ec84613657f6494e8a265ee3713a6ef1751115c6) Signed-off-by: Lee moon soo Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/971d17e1 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/971d17e1 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/971d17e1 Branch: refs/heads/branch-0.7 Commit: 971d17e12426ae6ed1fbf474eb606300703463ef Parents: d45fdf9 Author: Paul Brenner Authored: Mon Apr 24 17:35:04 2017 -0400 Committer: Lee moon soo Committed: Fri Apr 28 01:49:22 2017 -0700 -- docs/security/shiroauthentication.md | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/971d17e1/docs/security/shiroauthentication.md -- diff --git a/docs/security/shiroauthentication.md b/docs/security/shiroauthentication.md index edf202f..452600d 100644 --- a/docs/security/shiroauthentication.md +++ b/docs/security/shiroauthentication.md @@ -78,6 +78,7 @@ activeDirectoryRealm.searchBase = CN=Users,DC=SOME_GROUP,DC=COMPANY,DC=COM activeDirectoryRealm.url = ldap://ldap.test.com:389 activeDirectoryRealm.groupRolesMap = "CN=aGroupName,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"group1" activeDirectoryRealm.authorizationCachingEnabled = false +activeDirectoryRealm.principalSuffix = @corp.company.net ldapRealm = org.apache.zeppelin.server.LdapGroupRealm # search base for ldap groups (only relevant for LdapGroupRealm): @@ -114,6 +115,7 @@ activeDirectoryRealm.searchBase = CN=Users,DC=SOME_GROUP,DC=COMPANY,DC=COM activeDirectoryRealm.url = ldap://ldap.test.com:389 activeDirectoryRealm.groupRolesMap = "CN=aGroupName,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"group1" activeDirectoryRealm.authorizationCachingEnabled = false +activeDirectoryRealm.principalSuffix = @corp.company.net ```
zeppelin git commit: added principalSuffix to AD examples
Repository: zeppelin Updated Branches: refs/heads/master 874403256 -> ec8461365 added principalSuffix to AD examples ### What is this PR for? Documentation - Adding an example use of prinicpalSuffix to the Active Directory authentication documentation. It took us a while to figure out that the lack of a principalSuffix was our problem and then a bit more hunting to figure out how to automatically include it ### What type of PR is it? Improvement ### 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? Outline the 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: Paul Brenner Closes #2281 from paul-brenner/patch-1 and squashes the following commits: 2ff57a9 [Paul Brenner] added principalSuffix to AD examples Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ec846136 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ec846136 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ec846136 Branch: refs/heads/master Commit: ec84613657f6494e8a265ee3713a6ef1751115c6 Parents: 8744032 Author: Paul Brenner Authored: Mon Apr 24 17:35:04 2017 -0400 Committer: Lee moon soo Committed: Fri Apr 28 01:49:13 2017 -0700 -- docs/security/shiroauthentication.md | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ec846136/docs/security/shiroauthentication.md -- diff --git a/docs/security/shiroauthentication.md b/docs/security/shiroauthentication.md index edf202f..452600d 100644 --- a/docs/security/shiroauthentication.md +++ b/docs/security/shiroauthentication.md @@ -78,6 +78,7 @@ activeDirectoryRealm.searchBase = CN=Users,DC=SOME_GROUP,DC=COMPANY,DC=COM activeDirectoryRealm.url = ldap://ldap.test.com:389 activeDirectoryRealm.groupRolesMap = "CN=aGroupName,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"group1" activeDirectoryRealm.authorizationCachingEnabled = false +activeDirectoryRealm.principalSuffix = @corp.company.net ldapRealm = org.apache.zeppelin.server.LdapGroupRealm # search base for ldap groups (only relevant for LdapGroupRealm): @@ -114,6 +115,7 @@ activeDirectoryRealm.searchBase = CN=Users,DC=SOME_GROUP,DC=COMPANY,DC=COM activeDirectoryRealm.url = ldap://ldap.test.com:389 activeDirectoryRealm.groupRolesMap = "CN=aGroupName,OU=groups,DC=SOME_GROUP,DC=COMPANY,DC=COM":"group1" activeDirectoryRealm.authorizationCachingEnabled = false +activeDirectoryRealm.principalSuffix = @corp.company.net ```
zeppelin git commit: SSL Support for Groovy Interpreter HTTP requests [ZEPPELIN-2443]
Repository: zeppelin
Updated Branches:
refs/heads/master ec8461365 -> 925d09cef
SSL Support for Groovy Interpreter HTTP requests [ZEPPELIN-2443]
### What is this PR for?
Target: Create ability to call http services with custom keystores in a groovy
way.
The following should work:
```groovy
//connect to host xxx.yyy with special keystore
HTTP.get(
url: "https://xxx.yyy/zzz";,
ssl: " HTTP.getKeystoreSSLContext('./xxx_yyy_keystore.jks', 'testpass') "
)
//take context initialization code from groovy interpreter properties
HTTP.get(
url: "https://xxx.yyy/zzz";,
ssl: g.SSL_CONTEXT_FROM_GROOVY_INTERPRET_PROPERTIES
)
//connect to host xxx.yyy with trust all (do not check trust certificates - dev
mode only)
HTTP.get(
url: "https://xxx.yyy/zzz";,
ssl: " HTTP.getNaiveSSLContext() "
)
//
HTTP.get(
url: "https://xxx.yyy/zzz";,
ssl: " MyCustomSSLBuilder.build() "
)
```
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
[ZEPPELIN-2443]
### How should this be tested?
follow the samples above or in documentation
### Questions:
* Does the licenses files need update? NO
* Is there breaking changes for older versions? NO
* Does this needs documentation? YES
Author: dlukyanov
Closes #2287 from dlukyanov/master and squashes the following commits:
4baa22e [dlukyanov] ZEPPELIN-2443
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/925d09ce
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/925d09ce
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/925d09ce
Branch: refs/heads/master
Commit: 925d09cef54e3056ae10ec0e547f46097e639158
Parents: ec84613
Author: dlukyanov
Authored: Wed Apr 26 09:38:05 2017 +0300
Committer: Lee moon soo
Committed: Fri Apr 28 02:52:13 2017 -0700
--
docs/interpreter/groovy.md| 56 +++-
groovy/src/main/resources/HTTP.groovy | 104 +++--
2 files changed, 136 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/925d09ce/docs/interpreter/groovy.md
--
diff --git a/docs/interpreter/groovy.md b/docs/interpreter/groovy.md
index 01074a3..f64cbde 100644
--- a/docs/interpreter/groovy.md
+++ b/docs/interpreter/groovy.md
@@ -39,7 +39,8 @@ def r = HTTP.get(
headers: [
'Accept':'application/json',
//'Authorization:' : g.getProperty('search_auth'),
- ]
+ ],
+ ssl : g.getProperty('search_ssl') // assume groovy interpreter property
search_ssl = HTTP.getNaiveSSLContext()
)
//check response code
if( r.response.code==200 ) {
@@ -76,41 +77,62 @@ g.table(
* `g.angular(String name)`
-Returns angular object by name. Look up notebook scope first and then global
scope.
+ Returns angular object by name. Look up notebook scope first and then
global scope.
* `g.angularBind(String name, Object value)`
-
-Assign a new `value` into angular object `name`
+
+ Assign a new `value` into angular object `name`
* `java.util.Properties g.getProperties()`
-returns all properties defined for this interpreter
+ returns all properties defined for this interpreter
* `String g.getProperty('PROPERTY_NAME')`
-```groovy
-g.PROPERTY_NAME
-g.'PROPERTY_NAME'
-g['PROPERTY_NAME']
-g.getProperties().getProperty('PROPERTY_NAME')
-```
+ ```groovy
+ g.PROPERTY_NAME
+ g.'PROPERTY_NAME'
+ g['PROPERTY_NAME']
+ g.getProperties().getProperty('PROPERTY_NAME')
+ ```
-All above the accessor to named property defined in groovy interpreter.
-In this case with name `PROPERTY_NAME`
+ All above the accessor to named property defined in groovy interpreter.
+ In this case with name `PROPERTY_NAME`
* `groovy.xml.MarkupBuilder g.html()`
-Starts or continues rendering of `%angular` to output and returns
[groovy.xml.MarkupBuilder](http://groovy-lang.org/processing-xml.html#_markupbuilder)
-MarkupBuilder is usefull to generate html (xml)
+ Starts or continues rendering of `%angular` to output and returns
[groovy.xml.MarkupBuilder](http://groovy-lang.org/processing-xml.html#_markupbuilder)
+ MarkupBuilder is usefull to generate html (xml)
* `void g.table(obj)`
-starts or continues rendering table rows.
+ starts or continues rendering table rows.
+
+ obj: List(rows) of List(columns) where first line is a header
+
+
+* `g.input(name, value )`
+
+ Creates `text` input with value specified. The parameter `value` is
optional.
+
+* `g.select(name, default, Map options)`
+
+ Creates `select` input with defined options. The param
zeppelin git commit: [ZEPPELIN-2427] Hide navbar and noteAction bar when scrolling down
Repository: zeppelin
Updated Branches:
refs/heads/master 925d09cef -> bba0a7b47
[ZEPPELIN-2427] Hide navbar and noteAction bar when scrolling down
### What is this PR for?
Hide navbar and noteAction bar when scrolling down to
- **widen view area**
Here are few famous services which hiding their navbar too.
- https://www.kaggle.com/c/titanic
- http://github.com/tj (profile page)
### Implementation Details
Since [headroom](wicky.nillia.ms/headroom.js/) functionality makes integration
tests fail,
we can't use `headroom` for CI build. to resolve this issue,
- created new maven profiles: `web-ci` and `web-dist` (default)
- maven will execute `yarn run build:ci` with the `web-ci` profile which
doesn't include headroom in `app.js`
### What type of PR is it?
[Improvement]
### Todos
* [x] - Add headroom.js
* [x] - Filter out useless dependencies
* [x] - Apply headroom.js
### What is the Jira issue?
[ZEPPELIN-2427](https://issues.apache.org/jira/browse/ZEPPELIN-2427)
### How should this be tested?
1. Open Zeppelin
2. Scroll down, up to see whether navbar and note action bar are hided or not.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update?
* Is there breaking changes for older versions?
* Does this needs documentation?
Author: 1ambda <1am...@gmail.com>
Closes #2265 from
1ambda/ZEPPELIN-2427/hide-navbar-and-noteActionBar-scrolling-down and squashes
the following commits:
32933d8 [1ambda] fix: Download headroom using npm
8930d70 [1ambda] fix: DON'T apply headroom for CI build
5a0219e [1ambda] fix: Remove invalid Gruntfile conf
16a12e6 [1ambda] chore: Add license description
efdd42e [1ambda] fix: Inject headroom to karma
14905be [1ambda] feat: Apply headroom.js
8934d04 [1ambda] fix: Filter out useless deps
e58e357 [1ambda] feat: Add headroom dep
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/bba0a7b4
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/bba0a7b4
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/bba0a7b4
Branch: refs/heads/master
Commit: bba0a7b47f95f35efd692d78cd4a5c3bd0c6b071
Parents: 925d09c
Author: 1ambda <1am...@gmail.com>
Authored: Sun Apr 23 14:57:25 2017 +0900
Committer: Lee moon soo
Committed: Fri Apr 28 02:53:53 2017 -0700
--
.travis.yml | 12 ++---
zeppelin-distribution/src/bin_license/LICENSE | 3 +-
zeppelin-web/Gruntfile.js | 55 +---
zeppelin-web/package.json | 7 ++-
zeppelin-web/pom.xml| 20 ++-
zeppelin-web/src/app/app.js | 15 --
.../src/app/notebook/notebook-actionBar.html| 5 +-
zeppelin-web/src/app/notebook/notebook.css | 11
.../src/assets/styles/looknfeel/default.css | 1 -
zeppelin-web/src/components/navbar/navbar.css | 17 --
zeppelin-web/src/components/navbar/navbar.html | 6 ++-
zeppelin-web/webpack.config.js | 11 +++-
12 files changed, 109 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/bba0a7b4/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 72104db..6130509 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,11 +47,11 @@ matrix:
# Test core modules
- jdk: "oraclejdk7"
- env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pscalding -Phelium-dev -Pexamples -Pscala-2.11" BUILD_FLAG="package
-Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat"
MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtest='!ZeppelinSparkClusterTest,!org.apache.zeppelin.spark.*'
-DfailIfNoTests=false"
+ env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11"
BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify
-Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtest='!ZeppelinSparkClusterTest,!org.apache.zeppelin.spark.*'
-DfailIfNoTests=false"
# Test selenium with spark module for 1.6.3
- jdk: "oraclejdk7"
- env: TEST_SELENIUM="true" SCALA_VER="2.10" SPARK_VER="1.6.3"
HADOOP_VER="2.6" PROFILE="-Pspark-1.6 -Phadoop-2.6 -Phelium-dev -Pexamples"
BUILD_FLAG="package -DskipTests -DskipRat" TEST_FLAG="v
zeppelin git commit: [ZEPPELIN-1711] Create `Dockerfile`s for released bin
Repository: zeppelin
Updated Branches:
refs/heads/master bba0a7b47 -> 5c3291c71
[ZEPPELIN-1711] Create `Dockerfile`s for released bin
### What is this PR for?
Created `Dockerfile` for released bin
- based on **Ubuntu:16.04 (LTS)** for desktop usage
- **JDK 8**
- **R** with basic packages
- **Python 2** with basic packages
- **miniconda2** for `%python.conda`
### Details
We already discussed about using alpine image in
https://github.com/apache/zeppelin/pull/1761.
- However, it's not designed for desktop usage
- Doesn't have some official packages (R, ...)
- Not familiar to users for desktop OS
That the reason why ubuntu is used in base image
```
zeppelin baseb3818f9ae4b111 hours ago
1.67 GB
zeppelin 0.6.2 c0a4d8556f927 hours ago
2.29 GB
zeppelin 0.7.0 c4a5ad0d04bd8 hours ago
2.5 GB
zeppelin 0.7.1 54173b77743b7 hours ago
2.49 GB
```
### What type of PR is it?
[Feature]
### Todos
* [x] - base image
* [x] - script for creating bin images
* [x] - bin image template
### What is the Jira issue?
[ZEPPELIN-1711](https://issues.apache.org/jira/browse/ZEPPELIN-1711)
### How should this be tested?
1. build base image `cd scripts/docker/zeppelin/base; docker build -t
zeppelin:base ./`
2. build bin image `cd scripts/docker/zeppelin/0.7.1; docker build -t
zeppelin:0.7.1 ./`
3. execute docker images
```
docker run -p 8080:8080 --rm --name zeppelin zeppelin:0.7.1
```
since it takes time to build, you can use already [published docker
images](https://hub.docker.com/r/1ambda/docker-zeppelin/)
```
docker run -p 8080:8080 --rm --name zeppelin 1ambda/docker-zeppelin:0.7.1
```
4. should be able to run spark, python and R tutorials
### Screenshots (if appropriate)
NO
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - YES, updated
Author: 1ambda <1am...@gmail.com>
Closes #2264 from 1ambda/ZEPPELIN-1711/bin-dockerfile and squashes the
following commits:
69a0b1f [1ambda] docs: Update docker.md
ced897f [1ambda] fix: DON'T remove /tmp
1f6da76 [1ambda] feat: Dockerfiles for 060, 070, 071
0fc3f75 [1ambda] feat: Add template for bin image
5cba56e [1ambda] feat: Use ubuntu for base image
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5c3291c7
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5c3291c7
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5c3291c7
Branch: refs/heads/master
Commit: 5c3291c71a8c3986f962fa3205577be109db9165
Parents: bba0a7b
Author: 1ambda <1am...@gmail.com>
Authored: Thu Apr 20 00:10:57 2017 +0900
Committer: Lee moon soo
Committed: Fri Apr 28 02:56:04 2017 -0700
--
docs/install/docker.md | 43 --
scripts/docker/zeppelin-base/Dockerfile | 42 -
scripts/docker/zeppelin/0.6.2/Dockerfile| 37
scripts/docker/zeppelin/0.7.0/Dockerfile| 37
scripts/docker/zeppelin/0.7.1/Dockerfile| 37
scripts/docker/zeppelin/base/Dockerfile | 90
scripts/docker/zeppelin/bin-template/Dockerfile | 37
scripts/docker/zeppelin/create-dockerfile.sh| 51 +++
8 files changed, 306 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5c3291c7/docs/install/docker.md
--
diff --git a/docs/install/docker.md b/docs/install/docker.md
index c7b6f69..40be416 100644
--- a/docs/install/docker.md
+++ b/docs/install/docker.md
@@ -27,44 +27,35 @@ limitations under the License.
This document contains instructions about making docker containers for
Zeppelin. It mainly provides guidance into how to create, publish and run
docker images for zeppelin releases.
## Quick Start
+
### Installing Docker
You need to [install docker](https://docs.docker.com/engine/installation/) on
your machine.
-### Creating and Publishing Zeppelin docker image
-* In order to be able to create and/or publish an image, you need to set the
**DockerHub** credentials `DOCKER_USERNAME, DOCKER_PASSWORD, DOCKER_EMAIL`
variables as environment variables.
-
-* To create an image for some release use :
-`create_release.sh `.
-* To publish the created image use :
-`publish_release.sh `
-
-### Running a Zeppelin docker image
+### Running docker image
-* To start Zeppelin, you need to pull the zeppelin release image:
```
-docker pull ${DOCKER_USERNAME}/zeppelin-release:
-
-docker run --rm -it -p 7077:7077 -p 8080:8080
${DOCKER_USERNAME}/zeppeli
zeppelin git commit: [ZEPPELIN-2442] button to create note into folder (navbar)
Repository: zeppelin
Updated Branches:
refs/heads/master 5c3291c71 -> a593a8b35
[ZEPPELIN-2442] button to create note into folder (navbar)
### What is this PR for?
Added button to create new note into folder (navbar)
### What type of PR is it?
Feature
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2442
### 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: Tinkoff DWH
Closes #2275 from tinkoff-dwh/ZEPPELIN-2442 and squashes the following commits:
715520b [Tinkoff DWH] ZEPPELIN-2442 added tooltip
2ae5bdc [Tinkoff DWH] Merge remote-tracking branch 'origin/master' into
ZEPPELIN-2442
39846f4 [Tinkoff DWH] [ZEPPELIN-2442] button to create note into folder (navbar)
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a593a8b3
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a593a8b3
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a593a8b3
Branch: refs/heads/master
Commit: a593a8b3506efcb60063e1fcee189fcef9e61d6f
Parents: 5c3291c
Author: Tinkoff DWH
Authored: Tue Apr 25 16:41:01 2017 +0500
Committer: Lee moon soo
Committed: Fri Apr 28 02:58:25 2017 -0700
--
zeppelin-web/src/app/home/home.css | 3 ++-
.../src/app/home/notebook-template.html | 14 +-
.../expandCollapse/expandCollapse.directive.js | 9 +++
.../components/navbar/navbar-noteList-elem.html | 27
.../src/components/navbar/navbar.controller.js | 12 +
zeppelin-web/src/components/navbar/navbar.html | 8 +++---
6 files changed, 50 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a593a8b3/zeppelin-web/src/app/home/home.css
--
diff --git a/zeppelin-web/src/app/home/home.css
b/zeppelin-web/src/app/home/home.css
index c670f6b..ce30e66 100644
--- a/zeppelin-web/src/app/home/home.css
+++ b/zeppelin-web/src/app/home/home.css
@@ -133,6 +133,7 @@ a.navbar-brand:hover {
.dropdown-menu > .scrollbar-container > li > a,
.dropdown-menu .notebook-list-item {
display: block;
+ text-decoration: none;
padding: 1px 10px;
clear: both;
font-weight: normal;
@@ -294,7 +295,7 @@ a.navbar-brand:hover {
#notebook-list {
position: relative;
overflow: hidden;
- display: inline;
+ display: inline-block;
}
@media (min-width: 768px) {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a593a8b3/zeppelin-web/src/app/home/notebook-template.html
--
diff --git a/zeppelin-web/src/app/home/notebook-template.html
b/zeppelin-web/src/app/home/notebook-template.html
index cf665bb..0456a39 100644
--- a/zeppelin-web/src/app/home/notebook-template.html
+++ b/zeppelin-web/src/app/home/notebook-template.html
@@ -58,14 +58,12 @@ limitations under the License.
{{getNoteName(node)}}
-
-
-
-
-
+
+
+
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a593a8b3/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
--
diff --git
a/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
b/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
index 9e28098..5d51818 100644
--- a/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
+++ b/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
@@ -30,6 +30,15 @@ function expandCollapse () {
}
})
}
+
+let target = event.target
+
+// add note
+if (target.classList !== undefined &&
target.classList.contains('fa-plus') &&
+ target.tagName.toLowerCase() === 'i') {
+ return
+}
+
event.stopPropagation()
})
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a593a8b3/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
--
diff --git a/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
b/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
index b63efd8..d5fb4a1 100644
--- a/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
+++ b/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
@@ -12,20 +12,27 @@ See the License for the specific
zeppelin git commit: [ZEPPELIN-2448] Fix paragraph navigation issue
Repository: zeppelin
Updated Branches:
refs/heads/master a593a8b35 -> d82f42def
[ZEPPELIN-2448] Fix paragraph navigation issue
### What is this PR for?
* Keyboard events are broadcasted to components in lower tree
* Focus was getting transferred to the lower paragraphs, causing a chaining
effect
* Making emit synchronous fixes the problem
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2448
### How should this be tested?
* Open a notebook with three or more paragraphs (A, B, C, D) one below the other
* Hide editor in B and C
* Try to navigate A to D
* The focus is passed through all four paragraphs
### 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: sravan
Closes #2290 from sravan-s/ZEPPELIN-2448 and squashes the following commits:
a01ba7c [sravan] Fix paragraph navigation issue
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d82f42de
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d82f42de
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d82f42de
Branch: refs/heads/master
Commit: d82f42def4bfd659155ff66ce1d087e3c076a501
Parents: a593a8b
Author: sravan
Authored: Wed Apr 26 20:47:45 2017 +0900
Committer: Lee moon soo
Committed: Fri Apr 28 02:59:21 2017 -0700
--
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d82f42de/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 1a92176..3cb8902 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -1331,7 +1331,8 @@ function ParagraphCtrl ($scope, $rootScope, $route,
$window, $routeParams, $loca
$scope.$emit('moveFocusToPreviousParagraph', paragraphId)
} else if (editorHide && (keyCode === 40 || (keyCode === 78 &&
keyEvent.ctrlKey && !keyEvent.altKey))) { // down
// move focus to next paragraph
-$scope.$emit('moveFocusToNextParagraph', paragraphId)
+// $timeout stops chaining effect of focus propogation
+$timeout(() => $scope.$emit('moveFocusToNextParagraph', paragraphId))
} else if (keyEvent.shiftKey && keyCode === 13) { // Shift + Enter
$scope.runParagraphFromShortcut($scope.getEditorValue())
} else if (keyEvent.ctrlKey && keyEvent.altKey && keyCode === 67) { //
Ctrl + Alt + c
zeppelin git commit: [ZEPPELIN-2448] Fix paragraph navigation issue
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 971d17e12 -> c6184b982
[ZEPPELIN-2448] Fix paragraph navigation issue
* Keyboard events are broadcasted to components in lower tree
* Focus was getting transferred to the lower paragraphs, causing a chaining
effect
* Making emit synchronous fixes the problem
[Bug Fix]
* https://issues.apache.org/jira/browse/ZEPPELIN-2448
* Open a notebook with three or more paragraphs (A, B, C, D) one below the other
* Hide editor in B and C
* Try to navigate A to D
* The focus is passed through all four paragraphs
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: sravan
Closes #2290 from sravan-s/ZEPPELIN-2448 and squashes the following commits:
a01ba7c [sravan] Fix paragraph navigation issue
(cherry picked from commit d82f42def4bfd659155ff66ce1d087e3c076a501)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c6184b98
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c6184b98
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c6184b98
Branch: refs/heads/branch-0.7
Commit: c6184b98298ca1efa70329ff6f8f7bff950b9f71
Parents: 971d17e
Author: sravan
Authored: Wed Apr 26 20:47:45 2017 +0900
Committer: Lee moon soo
Committed: Fri Apr 28 03:01:08 2017 -0700
--
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6184b98/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 47d34c6..09d13d7 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -1108,7 +1108,8 @@ function ParagraphCtrl($scope, $rootScope, $route,
$window, $routeParams, $locat
$scope.$emit('moveFocusToPreviousParagraph', paragraphId);
} else if (editorHide && (keyCode === 40 || (keyCode === 78 &&
keyEvent.ctrlKey && !keyEvent.altKey))) { // down
// move focus to next paragraph
-$scope.$emit('moveFocusToNextParagraph', paragraphId);
+// $timeout stops chaining effect of focus propogation
+$timeout(() => $scope.$emit('moveFocusToNextParagraph', paragraphId))
} else if (keyEvent.shiftKey && keyCode === 13) { // Shift + Enter
$scope.run($scope.paragraph, $scope.getEditorValue());
} else if (keyEvent.ctrlKey && keyEvent.altKey && keyCode === 67) { //
Ctrl + Alt + c
zeppelin git commit: [ZEPPELIN-2216] general solution to precode. refactoring jdbc precode
Repository: zeppelin Updated Branches: refs/heads/master d82f42def -> 2c504c44d [ZEPPELIN-2216] general solution to precode. refactoring jdbc precode ### What is this PR for? General solution to execute precode. Refactoring jdbc precode using general solution. Task contains to subtasks: executeAfterOpen, executeBeforeClose. executeBeforeClose not done because we need the context so there is a solution only for executeAfterOpen. ### What type of PR is it? Feature | Refactoring ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-2216 ### How should this be tested? 1. Add parameter zeppelin.PySparkInterpreter.precode `someVar='text'` 2. Execute ``` %pyspark print(someVar) ``` ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Tinkoff DWH Closes #2221 from tinkoff-dwh/ZEPPELIN-2216 and squashes the following commits: 1e3f3f7 [Tinkoff DWH] [ZEPPELIN-2216] fix path e4cf72f [Tinkoff DWH] [ZEPPELIN-2216] added tests 5a482a0 [Tinkoff DWH] [ZEPPELIN-2216] fix tests 3977722 [Tinkoff DWH] Merge remote-tracking branch 'origin/master' into ZEPPELIN-2216 c0436a2 [Tinkoff DWH] [ZEPPELIN-2216] general solution to precode. refactoring jdbc precode Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2c504c44 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2c504c44 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2c504c44 Branch: refs/heads/master Commit: 2c504c44d9f87f383f23fad4075aeabcfec20585 Parents: d82f42d Author: Tinkoff DWH Authored: Mon Apr 24 12:18:55 2017 +0500 Committer: Lee moon soo Committed: Fri Apr 28 03:02:23 2017 -0700 -- .../img/screenshots/interpreter_precode.png | Bin 0 -> 8327 bytes docs/interpreter/jdbc.md| 2 +- docs/manual/interpreters.md | 8 ++ .../apache/zeppelin/jdbc/JDBCInterpreter.java | 22 +++--- .../zeppelin/jdbc/JDBCInterpreterTest.java | 26 --- .../zeppelin/interpreter/Interpreter.java | 13 .../interpreter/LazyOpenInterpreter.java| 8 +- .../remote/RemoteInterpreterServer.java | 15 ++-- .../remote/RemoteInterpreterTest.java | 73 +++ 9 files changed, 136 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2c504c44/docs/assets/themes/zeppelin/img/screenshots/interpreter_precode.png -- diff --git a/docs/assets/themes/zeppelin/img/screenshots/interpreter_precode.png b/docs/assets/themes/zeppelin/img/screenshots/interpreter_precode.png new file mode 100644 index 000..61b79c3 Binary files /dev/null and b/docs/assets/themes/zeppelin/img/screenshots/interpreter_precode.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2c504c44/docs/interpreter/jdbc.md -- diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md index 2c1d2f7..f66ad6d 100644 --- a/docs/interpreter/jdbc.md +++ b/docs/interpreter/jdbc.md @@ -121,7 +121,7 @@ The JDBC interpreter properties are defined by default like below. default.precode -Some SQL which executes while opening connection +Some SQL which executes every time after initialization of the interpreter (see [Binding mode](../manual/interpreters.md#interpreter-binding-mode)) default.completer.schemaFilters http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2c504c44/docs/manual/interpreters.md -- diff --git a/docs/manual/interpreters.md b/docs/manual/interpreters.md index 916d591..51b4991 100644 --- a/docs/manual/interpreters.md +++ b/docs/manual/interpreters.md @@ -113,3 +113,11 @@ interpreter.start() The above code will start interpreter thread inside your process. Once the interpreter is started you can configure zeppelin to connect to RemoteInterpreter by checking **Connect to existing process** checkbox and then provide **Host** and **Port** on which interpreter process is listening as shown in the image below: + +## Precode + +Snippet of code (language of interpreter) that executes after initialization of the interpreter depends on [Binding mode](#interpreter-binding-mode). To configure add parameter with class of interpreter (`zeppelin..precode`) except JDBCInterpreter ([JDBC precode](../interpreter/jdbc.md#usage-precode)). + + + + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2c504c44/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java --
zeppelin git commit: add basic .appveyor.yml
Repository: zeppelin
Updated Branches:
refs/heads/master 129741c2f -> 1ff545321
add basic .appveyor.yml
### What is this PR for?
After appveyor ci is enabled for windows, PR build status shows red cross
because of missing .appveyor.
This PR add skeleton appveyor.yml.
### What type of PR is it?
Feature
### Todos
* [x] - Add .appveyor.yml
### What is the Jira issue?
https://issues.apache.org/jira/browse/INFRA-14019
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo
Closes #2303 from Leemoonsoo/appveyor and squashes the following commits:
5d13259 [Lee moon soo] add basic .appveyor.yml
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1ff54532
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1ff54532
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1ff54532
Branch: refs/heads/master
Commit: 1ff5453210c3a7409b1eeaf99628ead86bde3a1b
Parents: 129741c
Author: Lee moon soo
Authored: Sat Apr 29 08:54:20 2017 -0700
Committer: Lee moon soo
Committed: Mon May 1 07:50:58 2017 -0700
--
.appveyor.yml | 33 +
1 file changed, 33 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1ff54532/.appveyor.yml
--
diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 000..e14cc62
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+version: '1.0.0-dev.{build}'
+
+shallow_clone: true
+
+build: off
+
+os:
+ - Visual Studio 2015
+
+install:
+ - echo "Install"
+
+build_script:
+ - echo "Build"
zeppelin git commit: add basic .appveyor.yml
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 f609719d5 -> 813cda39a
add basic .appveyor.yml
### What is this PR for?
After appveyor ci is enabled for windows, PR build status shows red cross
because of missing .appveyor.
This PR add skeleton appveyor.yml.
### What type of PR is it?
Feature
### Todos
* [x] - Add .appveyor.yml
### What is the Jira issue?
https://issues.apache.org/jira/browse/INFRA-14019
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo
Closes #2303 from Leemoonsoo/appveyor and squashes the following commits:
5d13259 [Lee moon soo] add basic .appveyor.yml
(cherry picked from commit 1ff5453210c3a7409b1eeaf99628ead86bde3a1b)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/813cda39
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/813cda39
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/813cda39
Branch: refs/heads/branch-0.7
Commit: 813cda39af3665644f233b3e891e170b7c9a17d0
Parents: f609719
Author: Lee moon soo
Authored: Sat Apr 29 08:54:20 2017 -0700
Committer: Lee moon soo
Committed: Mon May 1 07:51:19 2017 -0700
--
.appveyor.yml | 33 +
1 file changed, 33 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/813cda39/.appveyor.yml
--
diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 000..e14cc62
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+version: '1.0.0-dev.{build}'
+
+shallow_clone: true
+
+build: off
+
+os:
+ - Visual Studio 2015
+
+install:
+ - echo "Install"
+
+build_script:
+ - echo "Build"
zeppelin git commit: [ZEPPELIN-2468] Enable websocket without Origin if allowed.origins is *
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 4803f8ffb -> a6e33e136
[ZEPPELIN-2468] Enable websocket without Origin if allowed.origins is *
Change-Id: Iaad10a69983036e84b766a22fbc32113b926b60d
### What is this PR for?
With ZEPPELIN-2288 we restored the check of the Origin field for websocket
requests.
Unfortunately the current implementation will deny the request if the Origin
HTTP header is empty, even if the zeppelin.server.allowed.origins is *
This patch enables websocket requests without Origin in the HTTP header if the
zeppelin.server.allowed.origins=*. This fixes the work behind a restrictive
reverse proxy (or behind Apache Knox)
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2468
### How should this be tested?
It could be tested with curl as described in ZEPPELIN-2288, but I added
additional unit test, so the change has been covered on unit test level.
### Screenshots (if appropriate)
N/A
### Questions:
* Does the licenses files need update? NO
* Is there breaking changes for older versions? NO
* Does this needs documentation? NO
Author: Elek, Márton
Closes #2299 from elek/ZEPPELIN-2468 and squashes the following commits:
d95bb41 [Elek, Márton] [ZEPPELIN-2468] Enable websocket without Origin if
allowed.origins is *
(cherry picked from commit 73ae291b0553789fbf00980aa8f283d8570e9e1b)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a6e33e13
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a6e33e13
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a6e33e13
Branch: refs/heads/branch-0.7
Commit: a6e33e1362217b0936aa0d3f1906bad7b99de886
Parents: 4803f8f
Author: Elek, Márton
Authored: Fri Apr 28 14:46:10 2017 +0200
Committer: Lee moon soo
Committed: Wed May 3 10:58:28 2017 -0400
--
.../java/org/apache/zeppelin/utils/SecurityUtils.java | 10 ++
.../org/apache/zeppelin/security/SecurityUtilsTest.java | 6 ++
2 files changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a6e33e13/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
--
diff --git
a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
index 6385a63..dcb5a1f 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
@@ -60,11 +60,13 @@ public class SecurityUtils {
public static Boolean isValidOrigin(String sourceHost, ZeppelinConfiguration
conf)
throws UnknownHostException, URISyntaxException {
-if (sourceHost == null || sourceHost.isEmpty()) {
- return false;
+
+String sourceUriHost = "";
+
+if (sourceHost != null && !sourceHost.isEmpty()) {
+ sourceUriHost = new URI(sourceHost).getHost();
+ sourceUriHost = (sourceUriHost == null) ? "" :
sourceUriHost.toLowerCase();
}
-String sourceUriHost = new URI(sourceHost).getHost();
-sourceUriHost = (sourceUriHost == null) ? "" : sourceUriHost.toLowerCase();
sourceUriHost = sourceUriHost.toLowerCase();
String currentHost =
InetAddress.getLocalHost().getHostName().toLowerCase();
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a6e33e13/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
--
diff --git
a/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
b/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
index 0100bb7..9d902c8 100644
---
a/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
+++
b/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
@@ -71,6 +71,12 @@ public class SecurityUtilsTest {
}
@Test
+ public void nullOriginWithStar() throws URISyntaxException,
UnknownHostException, ConfigurationException {
+assertTrue(SecurityUtils.isValidOrigin(null,
+new
ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site-star.xml";
+ }
+
+ @Test
public void emptyOrigin() throws URISyntaxException, UnknownHostException,
ConfigurationException {
assertFalse(SecurityUtils.isValidOrigin("",
new
ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site.xml";
zeppelin git commit: [ZEPPELIN-2468] Enable websocket without Origin if allowed.origins is *
Repository: zeppelin
Updated Branches:
refs/heads/master 2a06292c1 -> 73ae291b0
[ZEPPELIN-2468] Enable websocket without Origin if allowed.origins is *
Change-Id: Iaad10a69983036e84b766a22fbc32113b926b60d
### What is this PR for?
With ZEPPELIN-2288 we restored the check of the Origin field for websocket
requests.
Unfortunately the current implementation will deny the request if the Origin
HTTP header is empty, even if the zeppelin.server.allowed.origins is *
This patch enables websocket requests without Origin in the HTTP header if the
zeppelin.server.allowed.origins=*. This fixes the work behind a restrictive
reverse proxy (or behind Apache Knox)
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2468
### How should this be tested?
It could be tested with curl as described in ZEPPELIN-2288, but I added
additional unit test, so the change has been covered on unit test level.
### Screenshots (if appropriate)
N/A
### Questions:
* Does the licenses files need update? NO
* Is there breaking changes for older versions? NO
* Does this needs documentation? NO
Author: Elek, Márton
Closes #2299 from elek/ZEPPELIN-2468 and squashes the following commits:
d95bb41 [Elek, Márton] [ZEPPELIN-2468] Enable websocket without Origin if
allowed.origins is *
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/73ae291b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/73ae291b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/73ae291b
Branch: refs/heads/master
Commit: 73ae291b0553789fbf00980aa8f283d8570e9e1b
Parents: 2a06292
Author: Elek, Márton
Authored: Fri Apr 28 14:46:10 2017 +0200
Committer: Lee moon soo
Committed: Wed May 3 10:58:18 2017 -0400
--
.../java/org/apache/zeppelin/utils/SecurityUtils.java | 10 ++
.../org/apache/zeppelin/security/SecurityUtilsTest.java | 6 ++
2 files changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/73ae291b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
--
diff --git
a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
index 6385a63..dcb5a1f 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
@@ -60,11 +60,13 @@ public class SecurityUtils {
public static Boolean isValidOrigin(String sourceHost, ZeppelinConfiguration
conf)
throws UnknownHostException, URISyntaxException {
-if (sourceHost == null || sourceHost.isEmpty()) {
- return false;
+
+String sourceUriHost = "";
+
+if (sourceHost != null && !sourceHost.isEmpty()) {
+ sourceUriHost = new URI(sourceHost).getHost();
+ sourceUriHost = (sourceUriHost == null) ? "" :
sourceUriHost.toLowerCase();
}
-String sourceUriHost = new URI(sourceHost).getHost();
-sourceUriHost = (sourceUriHost == null) ? "" : sourceUriHost.toLowerCase();
sourceUriHost = sourceUriHost.toLowerCase();
String currentHost =
InetAddress.getLocalHost().getHostName().toLowerCase();
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/73ae291b/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
--
diff --git
a/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
b/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
index 0100bb7..9d902c8 100644
---
a/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
+++
b/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java
@@ -71,6 +71,12 @@ public class SecurityUtilsTest {
}
@Test
+ public void nullOriginWithStar() throws URISyntaxException,
UnknownHostException, ConfigurationException {
+assertTrue(SecurityUtils.isValidOrigin(null,
+new
ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site-star.xml";
+ }
+
+ @Test
public void emptyOrigin() throws URISyntaxException, UnknownHostException,
ConfigurationException {
assertFalse(SecurityUtils.isValidOrigin("",
new
ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site.xml";
zeppelin git commit: Some grammar updates.
Repository: zeppelin
Updated Branches:
refs/heads/master 73ae291b0 -> e4f399f1b
Some grammar updates.
### What is this PR for?
Just noticed some grammar inconsistencies that I thought I could clean up while
getting myself started on Zeppelin. Thanks for a great project!
### What type of PR is it?
Documentation
Author: Michael Ressler
Closes #2308 from mressler/master and squashes the following commits:
aa39597 [Michael Ressler] Some grammar updates.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e4f399f1
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e4f399f1
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e4f399f1
Branch: refs/heads/master
Commit: e4f399f1b021d763271eb436410d179719e5ac03
Parents: 73ae291
Author: Michael Ressler
Authored: Tue May 2 10:50:03 2017 -0400
Committer: Lee moon soo
Committed: Wed May 3 10:59:57 2017 -0400
--
docs/install/install.md | 2 +-
docs/manual/dynamicform.md | 6 +++---
docs/quickstart/explorezeppelinui.md | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e4f399f1/docs/install/install.md
--
diff --git a/docs/install/install.md b/docs/install/install.md
index c360538..5064993 100644
--- a/docs/install/install.md
+++ b/docs/install/install.md
@@ -146,7 +146,7 @@ Congratulations, you have successfully installed Apache
Zeppelin! Here are few s
* Manage your [notebook permission](../security/notebook_authorization.html).
* For more informations, go to **More** -> **Security** section.
- Other useful informations ...
+ Other useful information ...
* Learn how [Display System](../displaysystem/basicdisplaysystem.html) works.
* Use [Service Manager](#start-apache-zeppelin-with-a-service-manager) to
start Zeppelin.
* If you're using previous version please see [Upgrade Zeppelin
version](./upgrade.html).
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e4f399f1/docs/manual/dynamicform.md
--
diff --git a/docs/manual/dynamicform.md b/docs/manual/dynamicform.md
index ab85024..b42bd15 100644
--- a/docs/manual/dynamicform.md
+++ b/docs/manual/dynamicform.md
@@ -70,7 +70,7 @@ For multi-selection, you can create a checkbox form using
`${checkbox:formName=d
-Besides, you can specify the delimiter using
`${checkbox(delimiter):formName=...}`:
+You can specify the delimiter using `${checkbox(delimiter):formName=...}`:
@@ -84,9 +84,9 @@ Even if you uncheck this option, still you can run it by
pressing `Enter`.
## Creates Programmatically
-Some language backend uses programmatic way to create form. For example
[ZeppelinContext](../interpreter/spark.html#zeppelincontext) provides form
creation API
+Some language backends can programmatically create forms. For example
[ZeppelinContext](../interpreter/spark.html#zeppelincontext) provides a form
creation API
-Here're some examples.
+Here are some examples:
### Text input form
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e4f399f1/docs/quickstart/explorezeppelinui.md
--
diff --git a/docs/quickstart/explorezeppelinui.md
b/docs/quickstart/explorezeppelinui.md
index 22b2b1c..e6276b4 100644
--- a/docs/quickstart/explorezeppelinui.md
+++ b/docs/quickstart/explorezeppelinui.md
@@ -25,7 +25,7 @@ limitations under the License.
## Main home
-The first time you connect to Zeppelin, you'll land at the main page similar
to the below screen capture.
+The first time you connect to Zeppelin ([default installations start on
http://localhost:8080](http://localhost:8080/)), you'll land at the main page
similar to the below screen capture.
zeppelin git commit: [ZEPPELIN-2484] Fix NullPointerException in check for empty last paragraph
Repository: zeppelin
Updated Branches:
refs/heads/master 6db9929dd -> ae05740b1
[ZEPPELIN-2484] Fix NullPointerException in check for empty last paragraph
### What is this PR for?
Prevent NullPointerException during check to determine whether a new paragraph
needs to added.
The fix is to switch order of null check and trim operation so that null check
is performed before trim()
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2484
### How should this be tested?
This can be tested with a hive interpreter
Create a note and add a paragraph with some query in it.
Run all paragraphs.
A new paragraph is automatically added.
Run all paragraphs again. A NullPointerException is logged in the logs.
### 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: Benoy Antony
Closes #2310 from benoyantony/ZEPPELIN-2484 and squashes the following commits:
1cc2f8b [Benoy Antony] ZEPPELIN-2484 do a Null check before calling trim on
paragraph's text
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ae05740b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ae05740b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ae05740b
Branch: refs/heads/master
Commit: ae05740b1852a4251b66b9559486b62a85af5dd9
Parents: 6db9929
Author: Benoy Antony
Authored: Tue May 2 15:17:44 2017 -0700
Committer: Lee moon soo
Committed: Fri May 5 13:36:25 2017 -0400
--
.../main/java/org/apache/zeppelin/socket/NotebookServer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ae05740b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
--
diff --git
a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index 4a0665b..64a4126 100644
---
a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++
b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -1742,10 +1742,10 @@ public class NotebookServer extends WebSocketServlet
}
private void addNewParagraphIfLastParagraphIsExecuted(Note note, Paragraph
p) {
-// if it's the last paragraph and empty, let's add a new one
+// if it's the last paragraph and not empty, let's add a new one
boolean isTheLastParagraph = note.isLastParagraph(p.getId());
-if (!(p.getText().trim().equals(p.getMagic()) ||
-Strings.isNullOrEmpty(p.getText())) &&
+if (!(Strings.isNullOrEmpty(p.getText()) ||
+p.getText().trim().equals(p.getMagic())) &&
isTheLastParagraph) {
Paragraph newPara = note.addNewParagraph(p.getAuthenticationInfo());
broadcastNewParagraph(note, newPara);
zeppelin git commit: [ZEPPELIN-2479] Fix incorrect tooltip view inside of version control menu
Repository: zeppelin
Updated Branches:
refs/heads/master ae05740b1 -> 8e96d8bd7
[ZEPPELIN-2479] Fix incorrect tooltip view inside of version control menu
### What is this PR for?
This is to fix incorrect appearance of tooltip inside version control menu
### What type of PR is it?
Improvement
### Todos
* [x] - fix/remove tooltip
### What is the Jira issue?
[ZEPPELIN-2479](https://issues.apache.org/jira/browse/ZEPPELIN-2479)
### How should this be tested?
go to `version control` menu in notebook action bar of note
### Screenshots (if appropriate)
before:
https://cloud.githubusercontent.com/assets/1642088/25606467/62f0901c-2f4c-11e7-95ef-c22f1df410be.png";>
after:
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Khalid Huseynov
Closes #2306 from khalidhuseynov/fix/ZEPPELIN-2479 and squashes the following
commits:
ac4e651 [Khalid Huseynov] add css class
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8e96d8bd
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8e96d8bd
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8e96d8bd
Branch: refs/heads/master
Commit: 8e96d8bd7b6e1a01df004800c526d316725a2b62
Parents: ae05740
Author: Khalid Huseynov
Authored: Tue May 2 18:45:11 2017 +0900
Committer: Lee moon soo
Committed: Fri May 5 14:24:17 2017 -0400
--
zeppelin-web/src/app/notebook/notebook-actionBar.html | 2 ++
zeppelin-web/src/app/notebook/notebook.css| 6 --
2 files changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8e96d8bd/zeppelin-web/src/app/notebook/notebook-actionBar.html
--
diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html
b/zeppelin-web/src/app/notebook/notebook-actionBar.html
index 00434c9..10368c8 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -131,6 +131,8 @@ limitations under the License.
ng-hide="viewOnly"
ng-click="checkpointNote(note.checkpoint.message)"
style="margin-left: 4px;"
+tooltip-append-to-body="true"
+tooltip-class="revisionTooltip"
tooltip-placement="bottom" uib-tooltip="Commit this
note">Commit
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8e96d8bd/zeppelin-web/src/app/notebook/notebook.css
--
diff --git a/zeppelin-web/src/app/notebook/notebook.css
b/zeppelin-web/src/app/notebook/notebook.css
index 86a2dd2..1bd0080 100644
--- a/zeppelin-web/src/app/notebook/notebook.css
+++ b/zeppelin-web/src/app/notebook/notebook.css
@@ -51,6 +51,10 @@
border-color: #ccc;
}
+.revisionTooltip {
+ z-index: 10003;
+}
+
.caretSeparator {
height: 22px;
line-height: 9px;
@@ -313,7 +317,6 @@
max-width: 50%;
}
-
.inactivelink {
color: darkgrey;
cursor: default;
@@ -330,4 +333,3 @@
}
.noteAction.headroom--unpinned { top: -100px; }
.noteAction.headroom--pinned { top: 50px; /** `noteAction` top */ }
-
zeppelin git commit: [ZEPPELIN-2479] Fix incorrect tooltip view inside of version control menu
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 a6e33e136 -> 08c1c9fe9
[ZEPPELIN-2479] Fix incorrect tooltip view inside of version control menu
This is to fix incorrect appearance of tooltip inside version control menu
Improvement
* [x] - fix/remove tooltip
[ZEPPELIN-2479](https://issues.apache.org/jira/browse/ZEPPELIN-2479)
go to `version control` menu in notebook action bar of note
before:
https://cloud.githubusercontent.com/assets/1642088/25606467/62f0901c-2f4c-11e7-95ef-c22f1df410be.png";>
after:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Khalid Huseynov
Closes #2306 from khalidhuseynov/fix/ZEPPELIN-2479 and squashes the following
commits:
ac4e651 [Khalid Huseynov] add css class
(cherry picked from commit 8e96d8bd7b6e1a01df004800c526d316725a2b62)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/08c1c9fe
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/08c1c9fe
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/08c1c9fe
Branch: refs/heads/branch-0.7
Commit: 08c1c9fe9f0642f18fe28a668434473042bdf96b
Parents: a6e33e1
Author: Khalid Huseynov
Authored: Tue May 2 18:45:11 2017 +0900
Committer: Lee moon soo
Committed: Fri May 5 14:26:31 2017 -0400
--
zeppelin-web/src/app/notebook/notebook-actionBar.html | 2 ++
zeppelin-web/src/app/notebook/notebook.css| 5 -
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/08c1c9fe/zeppelin-web/src/app/notebook/notebook-actionBar.html
--
diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html
b/zeppelin-web/src/app/notebook/notebook-actionBar.html
index c90c120..71ad299 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -130,6 +130,8 @@ limitations under the License.
ng-hide="viewOnly"
ng-click="checkpointNote(note.checkpoint.message)"
style="margin-left: 4px;"
+tooltip-append-to-body="true"
+tooltip-class="revisionTooltip"
tooltip-placement="bottom" uib-tooltip="Commit this
note">Commit
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/08c1c9fe/zeppelin-web/src/app/notebook/notebook.css
--
diff --git a/zeppelin-web/src/app/notebook/notebook.css
b/zeppelin-web/src/app/notebook/notebook.css
index 8c48528..6e189f8 100644
--- a/zeppelin-web/src/app/notebook/notebook.css
+++ b/zeppelin-web/src/app/notebook/notebook.css
@@ -51,6 +51,10 @@
border-color: #ccc;
}
+.revisionTooltip {
+ z-index: 10003;
+}
+
.caretSeparator {
height: 22px;
line-height: 9px;
@@ -313,7 +317,6 @@
max-width: 50%;
}
-
.inactivelink {
color: darkgrey;
cursor: default;
zeppelin git commit: [ZEPPELIN-2492] Use single Dockerfile for each tag
Repository: zeppelin
Updated Branches:
refs/heads/master d9c4a5f0b -> e90280177
[ZEPPELIN-2492] Use single Dockerfile for each tag
### What is this PR for?
Use single `Dockerfile` for each release since [apache infra uses tag
pushes](https://issues.apache.org/jira/browse/INFRA-12781) to build an image.
- https://issues.apache.org/jira/browse/INFRA-12781
After release process finishes, dockerhub will build using the pushed tag.
### What type of PR is it?
[Improvement]
### What is the Jira issue?
[ZEPPELIN-2492](https://issues.apache.org/jira/browse/ZEPPELIN-2492)
### How should this be tested?
1. `./dev/change_zeppelin_version.sh 0.8.0-SNAPSHOT 0.7.1`
2. Check that version is properly set: `vi
scrtips/docker/zeppelin/bin/Dockerfile`
3. Build docker image `cd scripts/docker/zeppelin/bin; docker build -t
zeppelin:0.7.1 ./`
4. Run the image: `docker run -p 8080:8080 --rm --name zeppelin zeppelin:0.7.1`
### Screenshots (if appropriate)
NONE
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2318 from 1ambda/ZEPPELIN-2492/use-single-dockerfile-for-each-tag and
squashes the following commits:
483bec3 [1ambda] docs: Update README for Dockerfile
5826c8c [1ambda] fix: Use single dockerfile for tag push
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e9028017
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e9028017
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e9028017
Branch: refs/heads/master
Commit: e902801773c5b955be841d8275ea50def4082ae9
Parents: d9c4a5f
Author: 1ambda <1am...@gmail.com>
Authored: Thu May 4 16:29:13 2017 +0900
Committer: Lee moon soo
Committed: Sat May 6 14:57:07 2017 -0400
--
dev/change_zeppelin_version.sh | 7 +-
docs/install/docker.md | 12 +--
scripts/docker/zeppelin/0.6.2/Dockerfile| 37 ---
scripts/docker/zeppelin/0.7.0/Dockerfile| 37 ---
scripts/docker/zeppelin/0.7.1/Dockerfile| 37 ---
scripts/docker/zeppelin/base/Dockerfile | 90
scripts/docker/zeppelin/bin-template/Dockerfile | 37 ---
scripts/docker/zeppelin/bin/Dockerfile | 106 +++
scripts/docker/zeppelin/create-dockerfile.sh| 51 -
9 files changed, 117 insertions(+), 297 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e9028017/dev/change_zeppelin_version.sh
--
diff --git a/dev/change_zeppelin_version.sh b/dev/change_zeppelin_version.sh
index c12dd81..1b7891c 100755
--- a/dev/change_zeppelin_version.sh
+++ b/dev/change_zeppelin_version.sh
@@ -18,8 +18,8 @@
#
usage() {
- echo "usage) $0 [Old version] [New version]"
- echo " ex. $0 0.7.0-SNAPSHOT 0.7.0"
+ echo "usage) $0 [OLD version] [NEW version]"
+ echo " ex. $0 0.8.0-SNAPSHOT 0.8.0"
exit 1
}
@@ -58,6 +58,9 @@ sed -i ''
's/-'"${FROM_VERSION}"'.jar",/-'"${TO_VERSION}"'.jar",/g' zeppelin-exa
sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version":
"'"${TO_VERSION}"'",/g' zeppelin-web/src/app/tabledata/package.json
sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version":
"'"${TO_VERSION}"'",/g' zeppelin-web/src/app/visualization/package.json
+# Change version in Dockerfile
+sed -i '' 's/Z_VERSION="'"${FROM_VERSION}"'"/Z_VERSION="'"${TO_VERSION}"'"/g'
scripts/docker/zeppelin/bin/Dockerfile
+
# When preparing new dev version from release tag, doesn't need to change docs
version
if is_dev_version "${FROM_VERSION}" || ! is_dev_version "${TO_VERSION}"; then
# When prepare new rc for the maintenance release
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e9028017/docs/install/docker.md
--
diff --git a/docs/install/docker.md b/docs/install/docker.md
index 40be416..6b1309a 100644
--- a/docs/install/docker.md
+++ b/docs/install/docker.md
@@ -19,7 +19,7 @@ limitations under the License.
-->
{% include JB/setup %}
-# Apache Zeppelin Releases Docker Images
+# Docker Image for Apache Zeppelin Releases
@@ -34,7 +34,7 @@ You need to [install
docker](https://docs.docker.com/engine/installation/) on yo
### Runni
zeppelin git commit: [ZEPPELIN-2382] Fixed windows compatibility of interpreter binding.
Repository: zeppelin
Updated Branches:
refs/heads/master e90280177 -> fb80bf7dd
[ZEPPELIN-2382] Fixed windows compatibility of interpreter binding.
### What is this PR for?
Fixing ZEPPELIN-2382:
A fresh install of Zeppelin 0.7.1 failed to start on a Windows due to the use
of
[getPosixFilePermissions](https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#getPosixFilePermissions(java.nio.file.Path,%20java.nio.file.LinkOption...))
This method fails on Windows with an UnsupportedOperationException - however,
recovering (that is ignoring the exception) appears to have no negative
effects. (For a discussion on this related to a different project see, e.g.,
https://github.com/GoogleCloudPlatform/google-cloud-intellij/issues/937 )
### What type of PR is it?
[Bug Fix]
### Todos
* [x] - Have the binary distribution checked by the reporter of [ZEPPELIN-2382]
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2382
### How should this be tested?
Check if clean distribution runs on Windows. Important: Ensure that HADOOP_HOME
points to a folder containing bin/winutils.exe since this pull request does not
include a fix for https://issues.apache.org/jira/browse/ZEPPELIN-2438 (which is
part of a separate pull request).
### Screenshots (if appropriate)
N/A
### Questions:
* Does the licenses files need update?
No
* Is there breaking changes for older versions?
No
* Does this needs documentation?
No
Author: Christian Fries
Closes #2305 from cfries/windows-compatiblity-interpreter-binding and squashes
the following commits:
e3b5738 [Christian Fries] Added graceful exception handling if posix permission
is not available
096fed6 [Christian Fries] Merge branch 'master' into apache/master
3635ed8 [Christian Fries] [ZEPPELIN-2375]: Avoid modification of CLASSPATH
variable.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/fb80bf7d
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/fb80bf7d
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/fb80bf7d
Branch: refs/heads/master
Commit: fb80bf7dd9cfe6ca5ff649d249a09c03f09ca166
Parents: e902801
Author: Christian Fries
Authored: Sun Apr 30 21:44:12 2017 +0200
Committer: Lee moon soo
Committed: Sat May 6 15:00:25 2017 -0400
--
.../zeppelin/interpreter/InterpreterSettingManager.java | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fb80bf7d/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 1b05a76..9e7eb79 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
@@ -236,8 +236,13 @@ public class InterpreterSettingManager {
if (!Files.exists(interpreterBindingPath)) {
Files.createFile(interpreterBindingPath);
- Set permissions = EnumSet.of(OWNER_READ,
OWNER_WRITE);
- Files.setPosixFilePermissions(interpreterBindingPath, permissions);
+ try {
+Set permissions = EnumSet.of(OWNER_READ,
OWNER_WRITE);
+Files.setPosixFilePermissions(interpreterBindingPath, permissions);
+ } catch (UnsupportedOperationException e) {
+// File system does not support Posix file permissions (likely
windows) - continue anyway.
+logger.warn("unable to setPosixFilePermissions on '{}'.",
interpreterBindingPath);
+ };
}
FileOutputStream fos = new
FileOutputStream(interpreterBindingPath.toFile(), false);
zeppelin git commit: [ZEPPELIN-2382] Fixed windows compatibility of interpreter binding.
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 08c1c9fe9 -> 2ec379ff6
[ZEPPELIN-2382] Fixed windows compatibility of interpreter binding.
### What is this PR for?
Fixing ZEPPELIN-2382:
A fresh install of Zeppelin 0.7.1 failed to start on a Windows due to the use
of
[getPosixFilePermissions](https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#getPosixFilePermissions(java.nio.file.Path,%20java.nio.file.LinkOption...))
This method fails on Windows with an UnsupportedOperationException - however,
recovering (that is ignoring the exception) appears to have no negative
effects. (For a discussion on this related to a different project see, e.g.,
https://github.com/GoogleCloudPlatform/google-cloud-intellij/issues/937 )
### What type of PR is it?
[Bug Fix]
### Todos
* [x] - Have the binary distribution checked by the reporter of [ZEPPELIN-2382]
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2382
### How should this be tested?
Check if clean distribution runs on Windows. Important: Ensure that HADOOP_HOME
points to a folder containing bin/winutils.exe since this pull request does not
include a fix for https://issues.apache.org/jira/browse/ZEPPELIN-2438 (which is
part of a separate pull request).
### Screenshots (if appropriate)
N/A
### Questions:
* Does the licenses files need update?
No
* Is there breaking changes for older versions?
No
* Does this needs documentation?
No
Author: Christian Fries
Closes #2305 from cfries/windows-compatiblity-interpreter-binding and squashes
the following commits:
e3b5738 [Christian Fries] Added graceful exception handling if posix permission
is not available
096fed6 [Christian Fries] Merge branch 'master' into apache/master
3635ed8 [Christian Fries] [ZEPPELIN-2375]: Avoid modification of CLASSPATH
variable.
(cherry picked from commit fb80bf7dd9cfe6ca5ff649d249a09c03f09ca166)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2ec379ff
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2ec379ff
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2ec379ff
Branch: refs/heads/branch-0.7
Commit: 2ec379ff61d10fb9b8e5b2808170793c86b930d7
Parents: 08c1c9f
Author: Christian Fries
Authored: Sun Apr 30 21:44:12 2017 +0200
Committer: Lee moon soo
Committed: Sat May 6 15:00:36 2017 -0400
--
.../zeppelin/interpreter/InterpreterSettingManager.java | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2ec379ff/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 9b8dbec..9ee8ffb 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
@@ -236,8 +236,13 @@ public class InterpreterSettingManager {
if (!Files.exists(interpreterBindingPath)) {
Files.createFile(interpreterBindingPath);
- Set permissions = EnumSet.of(OWNER_READ,
OWNER_WRITE);
- Files.setPosixFilePermissions(interpreterBindingPath, permissions);
+ try {
+Set permissions = EnumSet.of(OWNER_READ,
OWNER_WRITE);
+Files.setPosixFilePermissions(interpreterBindingPath, permissions);
+ } catch (UnsupportedOperationException e) {
+// File system does not support Posix file permissions (likely
windows) - continue anyway.
+logger.warn("unable to setPosixFilePermissions on '{}'.",
interpreterBindingPath);
+ };
}
FileOutputStream fos = new
FileOutputStream(interpreterBindingPath.toFile(), false);
zeppelin git commit: [ZEPPELIN-2467] Restoring second travis job functionality
Repository: zeppelin
Updated Branches:
refs/heads/master fb80bf7dd -> 15ecbb49d
[ZEPPELIN-2467] Restoring second travis job functionality
### What is this PR for?
Second travis job didn't work correctly. It suppose to test all core unit tests
plus integration test (except for spark related test) but it was doing nothing.
It was because of the exclamation mark in **-Dtest** property:
```
-Dtest='!ZeppelinSparkClusterTest,!org.apache.zeppelin.spark.*'
```
which is not supported by maven-surefire-plugin of version 2.17 (which is used
in Zeppelin). Exclamation mark is supported started from 2.19 but still does
not work properly.
I've added plugin **exclude** configuratin instead of **-Dtest** property.
After travis job was restored I had found that not all core tests were working
properly. I have excluded them from the travis job for now and created jira
issues:
https://issues.apache.org/jira/browse/ZEPPELIN-2469
https://issues.apache.org/jira/browse/ZEPPELIN-2470
https://issues.apache.org/jira/browse/ZEPPELIN-2471
https://issues.apache.org/jira/browse/ZEPPELIN-2473
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
[ZEPPELIN-2467](https://issues.apache.org/jira/browse/ZEPPELIN-2467)
### Questions:
* Does the licenses files need update? **no**
* Is there breaking changes for older versions? **no**
* Does this needs documentation? **no**
Author: Alexander Shoshin
Closes #2300 from AlexanderShoshin/ZEPPELIN-2467 and squashes the following
commits:
78771e9 [Alexander Shoshin] made a comment about excluded tests
dfa332f [Alexander Shoshin] changed -Dtest flag to -Dtests.to.exclude and
excluded unstable tests
0448c4a [Alexander Shoshin] added ability to exclude some unit tests using
command line
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/15ecbb49
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/15ecbb49
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/15ecbb49
Branch: refs/heads/master
Commit: 15ecbb49db17f3938ca0b4d584193354ff243429
Parents: fb80bf7
Author: Alexander Shoshin
Authored: Wed May 3 11:45:15 2017 +0300
Committer: Lee moon soo
Committed: Sat May 6 15:01:43 2017 -0400
--
.travis.yml | 9 -
pom.xml | 6 ++
2 files changed, 14 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/15ecbb49/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 6130509..d6887ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,15 @@ matrix:
env: SCALA_VER="2.11" SPARK_VER="2.0.2" HADOOP_VER="2.6" PROFILE="-Prat"
BUILD_FLAG="clean" TEST_FLAG="org.apache.rat:apache-rat-plugin:check"
TEST_PROJECTS=""
# Test core modules
+#
+# Several tests were excluded from this configuration due to the following
issues:
+# HeliumBundleFactoryTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2469
+# HeliumApplicationFactoryTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2470
+# NotebookTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2471
+# ZeppelinRestApiTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2473
+# After issues are fixed these tests need to be included back by removing
them from the "-Dtests.to.exclude" property
- jdk: "oraclejdk7"
- env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11"
BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify
-Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtest='!ZeppelinSparkClusterTest,!org.apache.zeppelin.spark.*'
-DfailIfNoTests=false"
+ env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11"
BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify
-Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumBundleFactoryTest.java,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java
-DfailIfNoTests=false"
# Test selenium with spark module for 1.6.3
- jdk: "oraclejdk7"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/15ecbb49/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3bede62..87af323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,9 @@
64m
512m
+
+
+
@@ -555,6 +558,9 @@
${plugin.surefire.version}
-Xmx2g -Xms1g -Dfile.encoding=UTF-8
+
+ ${tests.to.exclude}
+
zeppelin git commit: ZEPPELIN-2268. Adding png and jpg support for helium module imports.
Repository: zeppelin
Updated Branches:
refs/heads/master 15ecbb49d -> 246c3d026
ZEPPELIN-2268. Adding png and jpg support for helium module imports.
### What is this PR for?
To allow helium modules to import CSS that contains references to png or jpg
images.
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
* [ZEPPELIN-2268]
### How should this be tested?
The volume-leaflet helium module
[https://github.com/volumeint/helium-volume-leaflet] imports the Leaflet css
file. That css file references a couple of png files. Before this change, the
helium module would fail to enable, after the change it succeeds.
### 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: Thomas Grant
Closes #2313 from volumeint/master and squashes the following commits:
672b789 [Thomas Grant] Merge branch 'master' of
https://github.com/apache/zeppelin
c736dbe [Thomas Grant] Merge branch 'master' of
https://github.com/apache/zeppelin
19500d5 [Thomas Grant] ZEPPELIN-2268. Adding png and jpg support for helium
module imports.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/246c3d02
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/246c3d02
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/246c3d02
Branch: refs/heads/master
Commit: 246c3d0264c9ed8b10ce47f4ea3599d2aebbdc47
Parents: 15ecbb4
Author: Thomas Grant
Authored: Thu May 4 09:47:15 2017 -0400
Committer: Lee moon soo
Committed: Sat May 6 15:02:59 2017 -0400
--
zeppelin-zengine/src/main/resources/helium/webpack.config.js | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/246c3d02/zeppelin-zengine/src/main/resources/helium/webpack.config.js
--
diff --git a/zeppelin-zengine/src/main/resources/helium/webpack.config.js
b/zeppelin-zengine/src/main/resources/helium/webpack.config.js
index 91d9261..e897a16 100644
--- a/zeppelin-zengine/src/main/resources/helium/webpack.config.js
+++ b/zeppelin-zengine/src/main/resources/helium/webpack.config.js
@@ -43,6 +43,8 @@ module.exports = {
{ test: /\.eot(\?\S*)?$/, loader: 'url-loader', }, {
test: /\.ttf(\?\S*)?$/, loader: 'url-loader', }, {
test: /\.svg(\?\S*)?$/, loader: 'url-loader', }, {
+test: /\.png(\?\S*)?$/, loader: 'url-loader', }, {
+test: /\.jpg(\?\S*)?$/, loader: 'url-loader', }, {
test: /\.json$/, loader: 'json-loader' }, ],
}
}
zeppelin git commit: [ZEPPELIN-2388] Improve the keyboard shortcuts dialog
Repository: zeppelin
Updated Branches:
refs/heads/master 8194a5e0a -> 8056bc9b6
[ZEPPELIN-2388] Improve the keyboard shortcuts dialog
## What is this PR for?
This PR is for Improving the keyboard shortcuts dialog form and here is what i
improve.
- change to table shape
- add scrollbar
- fixed that text is misaligned when resizing windows
## What type of PR is it?
[Bug fix | Improvement]
## What is the Jira issue?
* [ZEPPELIN-2388; Prettify Keyboard Shortcut
Dialog](https://issues.apache.org/jira/browse/ZEPPELIN-2388)
## How should this be tested?
1. Click `Keyboard Shortcuts' icon in a paragraph.
2. Check `Keyboard Shortcuts` shape.
3. Check resizing windows.
## Screenshots (if appropriate)
### [Before - 1. default]
### [Before - 2. text is misaligned when resizing windows]
### [Before - 3. not scrollbar]
### [After - 1. default]
### [After - 2. resizing windows (my image is a little broken.)]
### Last improvement dialog shape
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: soralee
Closes #2274 from soralee/ZEPPELIN-2388_shortcut_key and squashes the following
commits:
2428787 [soralee] remove separator and modify tight space
fdcf7f2 [soralee] modify as comments
6d0cee2 [soralee] improve the keyboard shortcuts dialog
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8056bc9b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8056bc9b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8056bc9b
Branch: refs/heads/master
Commit: 8056bc9b6298634464e0a1ab6b74040acac0584c
Parents: 8194a5e
Author: soralee
Authored: Mon Apr 24 13:47:02 2017 +0900
Committer: Lee moon soo
Committed: Sun May 14 07:28:39 2017 -0400
--
.../src/app/notebook/paragraph/paragraph.css| 57 +-
.../modal-shortcut/modal-shortcut.html | 545 ++-
2 files changed, 330 insertions(+), 272 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8056bc9b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css
b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
index 1c5e560..b176dfb 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
@@ -222,16 +222,69 @@ table.dataTable.table-condensed .sorting_desc:after {
cursor: pointer;
}
-.dropdown-menu .shortcut-icon{
+.dropdown-menu .shortcut-icon {
padding-right: 7px;
float: left;
}
-.dropdown-menu .shortcut-keys{
+.dropdown-menu .shortcut-keys {
float: right;
color: #999;
}
+.modal-dialog .table-scroll {
+ max-height: 70vh;
+ min-width: 160px;
+ overflow: auto;
+ overflow-y: scroll;
+}
+
+.shortcut-modal-header {
+ min-height: 16.428571429px;
+ padding: 15px;
+ border-bottom: 1px solid #9cb4c5;
+ background-color: #3071a9;
+ border: 2px solid #3071a9;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
+.shortcut-modal-header .close {
+ color: #cfcfcf;
+ opacity: 1;
+}
+
+.shortcut-modal-title {
+ color: white;
+ margin-top: 2px;
+ margin-bottom: 2px;
+}
+
+table.table-shortcut {
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+}
+
+.table-shortcut > tbody > tr > th {
+ background-color: #d6dde7;
+ border-color: 1px solid #9cb4c5;
+ color: #383a3c;
+ font-size: 15px !important;
+ font-weight: 500;
+}
+
+.table-shortcut > tbody > tr > td {
+ border-top: 0px;
+ padding: 5px;
+ vertical-align: middle;
+ font-size: 14px !important;
+}
+
+.kbd-default {
+ border: 1;
+ font-size: 10px !important;
+}
+
/*
Paragraph Title
*/
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8056bc9b/zeppelin-web/src/components/modal-shortcut/modal-shortcut.html
--
diff --git a/zeppelin-web/src/components/modal-short
zeppelin git commit: [ZEPPELIN-2520] DON'T set bottom margin for markdown table
Repository: zeppelin Updated Branches: refs/heads/master 8056bc9b6 -> ed2422a09 [ZEPPELIN-2520] DON'T set bottom margin for markdown table ### What is this PR for? DON'T set bottom margin for the markdown table. Implementation Details that's because `.paragraph table` overwrites `.markdown-body table`  ### What type of PR is it? [Bug Fix] ### Todos * [x] - Bump version up from 2.4.0 to 2.6.0 * [x] - Update `bin_license/LICENSE` * [x] - Import it using commonjs * [x] - Fix paragraph.css ### What is the Jira issue? [ZEPPELIN-2520](https://issues.apache.org/jira/browse/ZEPPELIN-2520) ### How should this be tested? 1. Build: `mvn clean package -DskipTests;` 2. Execute a paragraph using this text. ```md Colons can be used to align columns. | Tables| Are | Cool | | - |:-:| -:| | col 3 is | right-aligned | $1600 | | col 2 is | centered | $12 | | zebra stripes | are neat |$1 | There must be at least 3 dashes separating each header cell. The outer pipes (|) are optional, and you don't need to make the raw Markdown line up prettily. You can also use inline Markdown. Markdown | Less | Pretty --- | --- | --- *Still* | `renders` | **nicely** 1 | 2 | 3 ``` ### Screenshots (if appropriate) Before  After  ### Questions: * Does the licenses files need update? * Is there breaking changes for older versions? * Does this needs documentation? Author: 1ambda <1am...@gmail.com> Closes #2327 from 1ambda/ZEPPELIN-2520/bottom-margin-for-md-table and squashes the following commits: 2c54b66 [1ambda] fix: use css loader for test 49ea902 [1ambda] fix: DON'T set bottom-margin for markdown table 03bf9a3 [1ambda] fix: Use github-markdown-css 2.6.0 from npm Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ed2422a0 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ed2422a0 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ed2422a0 Branch: refs/heads/master Commit: ed2422a0961fe2c9671b70ab81707c200b969ab0 Parents: 8056bc9 Author: 1ambda <1am...@gmail.com> Authored: Wed May 10 10:47:15 2017 +0900 Committer: Lee moon soo Committed: Sun May 14 07:30:22 2017 -0400 -- zeppelin-distribution/src/bin_license/LICENSE | 2 +- zeppelin-web/bower.json | 1 - zeppelin-web/package.json | 1 + zeppelin-web/src/app/notebook/paragraph/paragraph.css | 2 +- zeppelin-web/src/index.html | 1 - zeppelin-web/src/index.js | 3 +++ zeppelin-web/webpack.config.js| 11 +-- 7 files changed, 11 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ed2422a0/zeppelin-distribution/src/bin_license/LICENSE -- diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index d941093..60fe5c0 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -254,7 +254,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) bcprov-jdk15on v1.51 (org.bouncycastle:bcprov-jdk15on:jar:1.51 - http://www.bouncycastle.org/java.html) - http://www.bouncycastle.org/licence.html (The MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) - https://github.com/bryanbraun/anchorjs/blob/master/README.md#license (The MIT License) moment-duration-format v1.3.0 (https://github.com/jsmreese/moment-duration-format) - https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE -(The MIT License) github-markdown-css 2.4.0 (https://github.com/sindresorhus/github-markdown-css) - https://github.com/sindresorhus/github-markdown-css/blob/gh-pages/license +(The MIT License) github-markdown-css 2.6.0 (https://github.com/sindresorhus/github-markdown-css) - https://github.com/sindresorhus/github-markdown-css/blob/v2.6.0/license (The MIT License) scopt (com.github.scopt:scopt_2.10:3.2.0 - https://github.com/scopt/scopt) (The MIT License) Objenesis (org.objenesis:objenesis:2.1 - https://github.com/easymock/objenesis) - Copyright (c) 2006-2015 the original author and authors (The MIT License) JCL 1.1.1 implemented over SLF4J
zeppelin git commit: [minor] Replace 'SIMPLE' auth with 'simple' auth everywhere in documents
Repository: zeppelin
Updated Branches:
refs/heads/master 5fde8c21d -> 95980c7ac
[minor] Replace 'SIMPLE' auth with 'simple' auth everywhere in documents
### What is this PR for?
This PR fixes a security hole in documentation when 'SIMPLE' authentication
mechanism is defined in Shiro configuration
(http://zeppelin.apache.org/docs/0.8.0-SNAPSHOT/security/shiroauthentication.html).
With that, user can log in without entering his/her password. Zeppelin
documentation should recommend the correct value which is 'simple'.
### What type of PR is it?
Documentation
### What is the Jira issue?
N/A
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? yes
Author: Vipin Rathor
Closes #2331 from VipinRathor/fix-SIMPLE-auth-doc and squashes the following
commits:
a1f0e48 [Vipin Rathor] [minor] Replace 'SIMPLE' auth with 'simple' auth
everywhere in documents
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/95980c7a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/95980c7a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/95980c7a
Branch: refs/heads/master
Commit: 95980c7ac0d3b53bb3068bfed630b5afd61cadaa
Parents: 5fde8c2
Author: Vipin Rathor
Authored: Wed May 10 03:25:51 2017 -0700
Committer: Lee moon soo
Committed: Mon May 15 08:01:58 2017 -0700
--
conf/shiro.ini.template | 2 +-
docs/security/shiroauthentication.md | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/95980c7a/conf/shiro.ini.template
--
diff --git a/conf/shiro.ini.template b/conf/shiro.ini.template
index 8f40d23..0a3187a 100644
--- a/conf/shiro.ini.template
+++ b/conf/shiro.ini.template
@@ -43,7 +43,7 @@ user3 = password4, role2
#ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
#ldapRealm.contextFactory.url = ldap://ldap.test.com:389
#ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
-#ldapRealm.contextFactory.authenticationMechanism = SIMPLE
+#ldapRealm.contextFactory.authenticationMechanism = simple
### A sample PAM configuration
#pamRealm=org.apache.zeppelin.realm.PamRealm
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/95980c7a/docs/security/shiroauthentication.md
--
diff --git a/docs/security/shiroauthentication.md
b/docs/security/shiroauthentication.md
index 452600d..348c438 100644
--- a/docs/security/shiroauthentication.md
+++ b/docs/security/shiroauthentication.md
@@ -85,7 +85,7 @@ ldapRealm = org.apache.zeppelin.server.LdapGroupRealm
ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
ldapRealm.contextFactory.url = ldap://ldap.test.com:389
ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
-ldapRealm.contextFactory.authenticationMechanism = SIMPLE
+ldapRealm.contextFactory.authenticationMechanism = simple
```
also define roles/groups that you want to have in system, like below;
@@ -134,7 +134,7 @@ ldapRealm = org.apache.zeppelin.realm.LdapGroupRealm
ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
ldapRealm.contextFactory.url = ldap://ldap.test.com:389
ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
-ldapRealm.contextFactory.authenticationMechanism = SIMPLE
+ldapRealm.contextFactory.authenticationMechanism = simple
```
### PAM
zeppelin git commit: [minor] Replace 'SIMPLE' auth with 'simple' auth everywhere in documents
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 39e314eb9 -> 4a2aef6a4
[minor] Replace 'SIMPLE' auth with 'simple' auth everywhere in documents
### What is this PR for?
This PR fixes a security hole in documentation when 'SIMPLE' authentication
mechanism is defined in Shiro configuration
(http://zeppelin.apache.org/docs/0.8.0-SNAPSHOT/security/shiroauthentication.html).
With that, user can log in without entering his/her password. Zeppelin
documentation should recommend the correct value which is 'simple'.
### What type of PR is it?
Documentation
### What is the Jira issue?
N/A
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? yes
Author: Vipin Rathor
Closes #2331 from VipinRathor/fix-SIMPLE-auth-doc and squashes the following
commits:
a1f0e48 [Vipin Rathor] [minor] Replace 'SIMPLE' auth with 'simple' auth
everywhere in documents
(cherry picked from commit 95980c7ac0d3b53bb3068bfed630b5afd61cadaa)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4a2aef6a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4a2aef6a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4a2aef6a
Branch: refs/heads/branch-0.7
Commit: 4a2aef6a49cbea7ac007440258d88e6908196182
Parents: 39e314e
Author: Vipin Rathor
Authored: Wed May 10 03:25:51 2017 -0700
Committer: Lee moon soo
Committed: Mon May 15 08:02:10 2017 -0700
--
conf/shiro.ini.template | 2 +-
docs/security/shiroauthentication.md | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4a2aef6a/conf/shiro.ini.template
--
diff --git a/conf/shiro.ini.template b/conf/shiro.ini.template
index 8f40d23..0a3187a 100644
--- a/conf/shiro.ini.template
+++ b/conf/shiro.ini.template
@@ -43,7 +43,7 @@ user3 = password4, role2
#ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
#ldapRealm.contextFactory.url = ldap://ldap.test.com:389
#ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
-#ldapRealm.contextFactory.authenticationMechanism = SIMPLE
+#ldapRealm.contextFactory.authenticationMechanism = simple
### A sample PAM configuration
#pamRealm=org.apache.zeppelin.realm.PamRealm
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4a2aef6a/docs/security/shiroauthentication.md
--
diff --git a/docs/security/shiroauthentication.md
b/docs/security/shiroauthentication.md
index 452600d..348c438 100644
--- a/docs/security/shiroauthentication.md
+++ b/docs/security/shiroauthentication.md
@@ -85,7 +85,7 @@ ldapRealm = org.apache.zeppelin.server.LdapGroupRealm
ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
ldapRealm.contextFactory.url = ldap://ldap.test.com:389
ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
-ldapRealm.contextFactory.authenticationMechanism = SIMPLE
+ldapRealm.contextFactory.authenticationMechanism = simple
```
also define roles/groups that you want to have in system, like below;
@@ -134,7 +134,7 @@ ldapRealm = org.apache.zeppelin.realm.LdapGroupRealm
ldapRealm.contextFactory.environment[ldap.searchBase] = dc=COMPANY,dc=COM
ldapRealm.contextFactory.url = ldap://ldap.test.com:389
ldapRealm.userDnTemplate = uid={0},ou=Users,dc=COMPANY,dc=COM
-ldapRealm.contextFactory.authenticationMechanism = SIMPLE
+ldapRealm.contextFactory.authenticationMechanism = simple
```
### PAM
svn commit: r1795220 [2/2] - in /zeppelin/site/docs/0.8.0-SNAPSHOT: ./ assets/themes/zeppelin/img/screenshots/ displaysystem/ install/ interpreter/ manual/ quickstart/ security/
Modified: zeppelin/site/docs/0.8.0-SNAPSHOT/search_data.json
URL:
http://svn.apache.org/viewvc/zeppelin/site/docs/0.8.0-SNAPSHOT/search_data.json?rev=1795220&r1=1795219&r2=1795220&view=diff
==
--- zeppelin/site/docs/0.8.0-SNAPSHOT/search_data.json (original)
+++ zeppelin/site/docs/0.8.0-SNAPSHOT/search_data.json Mon May 15 15:03:55 2017
@@ -82,7 +82,7 @@
"/displaysystem/back-end-angular.html": {
"title": "Back-end Angular API in Apache Zeppelin",
- "content" : "Back-end Angular API in
Apache ZeppelinOverviewAngular display system treats output as a view template
for AngularJS.It compiles templates and displays them inside of Apache
Zeppelin. Zeppelin provides a gateway between your interpreter and your
compiled AngularJS view templates.Therefore, you can not only update scope
variables from your interpreter but also watch them in the interpreter, which
is JVM process.Basic UsagePrint Angu
larJS viewTo use angular display system, you should start with %angular.Since
name is not defined, Hello will display Hello.Please Note: Display system is
backend independent.Bind / Unbind VariablesThrough ZeppelinContext, you can
bind / unbind variables to AngularJS view. Currently, it only works in Spark
Interpreter ( scala ).// bind my 'object' as angular scope
variable 'name' in current notebook.z.angularBind(String name,
Object object)// bind my 'object' as angular scope variable
'name' in all notebooks related to current
interpreter.z.angularBindGlobal(String name, Object object)// unbind angular
scope variable 'name' in current
notebook.z.angularUnbind(String name)// unbind angular scope variable
'name' in all notebooks related to current
interpreter.z.angularUnbindGlobal(String name)Using the above example,
let's bind world variable to name. Then you can see AngularJs view
is immediately updated.Watch / Unwatch VariablesThrough ZeppelinContext, you
can watch / unwatch variables in AngularJs view. Currently, it only works in
Spark Interpreter ( scala ).// register for angular scope variable
'name' (notebook)z.angularWatch(String name, (before, after)
=> { ... })// unregister watcher for angular variable
'name' (notebook)z.angularUnwatch(String name)// register for
angular scope variable 'name'
(global)z.angularWatchGlobal(String name, (before, after) => { ... })//
unregister watcher for angular variable 'name'
(global)z.angularUnwatchGlobal(String name)Let's make a button. When it
is clicked, the value of run will be increased 1 by
1.z.angularBind("run", 0) will initialize run to zero. And
then, it will be also applied to run in z.angularWatch().When the button is
clicked, you'll see both run and numWatched are incremented by
1.Let's
make it Simpler and more IntuitiveIn this section, we will introduce a
simpler and more intuitive way of using Angular Display System in Zeppelin.Here
are some usages.Import// In notebook scopeimport
org.apache.zeppelin.display.angular.notebookscope._import AngularElem._// In
paragraph scopeimport
org.apache.zeppelin.display.angular.paragraphscope._import AngularElem._Display
Element// automatically convert to string and print with %angular display
system directive in front.<div><div>.displayEvent
Handler// on click<div></div>.onClick(() =>
{ my callback routine}).display// on
change<div></div>.onChange(() => { my
callback routine}).display// arbitrary
event<div></div>.onEvent("ng-click",
() => { my callback routine}).displayBind Model// bind
model<div></div>.model("myModel").display/
/ bind model with initial
value<div></div>.model("myModel",
initialValue).displayInteract with Model// read
modelAngularModel("myModel")()// update
modelAngularModel("myModel",
"newValue")Example: Basic UsageUsing the above basic usages,
you can apply them like below examples.Display Elements<div
style="color:blue"> <h4>Hello Angular
Display System</h4></div>.displayOnClick
Event<div class="btn btn-success"> Click
me</div>.onClick{() => // callback for button
click}.displayBind Model
<div>myModel</div&g
svn commit: r1795220 [1/2] - in /zeppelin/site/docs/0.8.0-SNAPSHOT: ./ assets/themes/zeppelin/img/screenshots/ displaysystem/ install/ interpreter/ manual/ quickstart/ security/
Author: moon
Date: Mon May 15 15:03:55 2017
New Revision: 1795220
URL: http://svn.apache.org/viewvc?rev=1795220&view=rev
Log:
update doc
Added:
zeppelin/site/docs/0.8.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/interpreter_precode.png
(with props)
Modified:
zeppelin/site/docs/0.8.0-SNAPSHOT/atom.xml
zeppelin/site/docs/0.8.0-SNAPSHOT/displaysystem/back-end-angular.html
zeppelin/site/docs/0.8.0-SNAPSHOT/install/docker.html
zeppelin/site/docs/0.8.0-SNAPSHOT/install/install.html
zeppelin/site/docs/0.8.0-SNAPSHOT/interpreter/groovy.html
zeppelin/site/docs/0.8.0-SNAPSHOT/interpreter/jdbc.html
zeppelin/site/docs/0.8.0-SNAPSHOT/manual/dynamicform.html
zeppelin/site/docs/0.8.0-SNAPSHOT/manual/interpreters.html
zeppelin/site/docs/0.8.0-SNAPSHOT/quickstart/explorezeppelinui.html
zeppelin/site/docs/0.8.0-SNAPSHOT/rss.xml
zeppelin/site/docs/0.8.0-SNAPSHOT/search_data.json
zeppelin/site/docs/0.8.0-SNAPSHOT/security/shiroauthentication.html
Added:
zeppelin/site/docs/0.8.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/interpreter_precode.png
URL:
http://svn.apache.org/viewvc/zeppelin/site/docs/0.8.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/interpreter_precode.png?rev=1795220&view=auto
==
Binary file - no diff available.
Propchange:
zeppelin/site/docs/0.8.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/interpreter_precode.png
--
svn:mime-type = application/octet-stream
Modified: zeppelin/site/docs/0.8.0-SNAPSHOT/atom.xml
URL:
http://svn.apache.org/viewvc/zeppelin/site/docs/0.8.0-SNAPSHOT/atom.xml?rev=1795220&r1=1795219&r2=1795220&view=diff
==
--- zeppelin/site/docs/0.8.0-SNAPSHOT/atom.xml (original)
+++ zeppelin/site/docs/0.8.0-SNAPSHOT/atom.xml Mon May 15 15:03:55 2017
@@ -4,7 +4,7 @@
Apache Zeppelin
http://zeppelin.apache.org/"; rel="self"/>
http://zeppelin.apache.org"/>
- 2017-04-17T15:59:29+09:00
+ 2017-05-15T08:03:12-07:00
http://zeppelin.apache.org
The Apache Software Foundation
Modified: zeppelin/site/docs/0.8.0-SNAPSHOT/displaysystem/back-end-angular.html
URL:
http://svn.apache.org/viewvc/zeppelin/site/docs/0.8.0-SNAPSHOT/displaysystem/back-end-angular.html?rev=1795220&r1=1795219&r2=1795220&view=diff
==
--- zeppelin/site/docs/0.8.0-SNAPSHOT/displaysystem/back-end-angular.html
(original)
+++ zeppelin/site/docs/0.8.0-SNAPSHOT/displaysystem/back-end-angular.html Mon
May 15 15:03:55 2017
@@ -304,7 +304,7 @@ When the button is clicked, you'll s
Display Element
// automatically convert to string and print
with %angular display system directive in front.
-<div><div>.display
+<div></div>.display
Event Handler
// on click
Modified: zeppelin/site/docs/0.8.0-SNAPSHOT/install/docker.html
URL:
http://svn.apache.org/viewvc/zeppelin/site/docs/0.8.0-SNAPSHOT/install/docker.html?rev=1795220&r1=1795219&r2=1795220&view=diff
==
--- zeppelin/site/docs/0.8.0-SNAPSHOT/install/docker.html (original)
+++ zeppelin/site/docs/0.8.0-SNAPSHOT/install/docker.html Mon May 15 15:03:55
2017
@@ -217,7 +217,7 @@ See the License for the specific languag
limitations under the License.
-->
-Apache Zeppelin Releases Docker Images
+Docker Image for Apache Zeppelin Releases
@@ -231,47 +231,27 @@ limitations under the License.
You need to https://docs.docker.com/engine/installation/";>install
docker on your machine.
-Creating and Publishing Zeppelin docker image
-
-
-In order to be able to create and/or publish an image, you need to set
the DockerHub credentials DOCKER_USERNAME,
DOCKER_PASSWORD, DOCKER_EMAIL variables as environment
variables.
-To create an image for some release use :
-create_release.sh <release-version>
<git-tag>.
-To publish the created image use :
-publish_release.sh <release-version>
<git-tag>
-
-
-Running a Zeppelin docker image
-
+Running docker image
+docker run -p 8080:8080 --rm --name zeppelin
apache/zeppelin:<release-version>
+
-To start Zeppelin, you need to pull the zeppelin release image:
-```
-docker pull ${DOCKER_USERNAME}/zeppelin-release:
+Zeppelin will run at http://localhost:8080.
-docker run --rm -it -p 7077:7077 -p 8080:8080
${DOCKER_USERNAME}/zeppelin-release: -c bash
-``
-* Then a docker container will start with a Zeppelin release on path :
-/usr/local/zeppelin/`
-
-
-Run zeppelin inside docker:
-
-/usr/local/zeppelin/bin/zeppelin.sh
-
-To Run Zeppelin in daemon mode
-Mounting logs and notebooks zeppelin to folders on your host machine
-
-docker run -p 7077:
zeppelin git commit: [ZEPPELIN-2463] Avoid Locking interpreterSettings during Notebook deletion
Repository: zeppelin
Updated Branches:
refs/heads/master 95980c7ac -> d37684403
[ZEPPELIN-2463] Avoid Locking interpreterSettings during Notebook deletion
### What is this PR for?
Deletion of a notebook requires locking interpreterSettings. If the deletion is
delayed , then lock is not released. At that point, we cannot run any notebook
because everything is waiting to lock interpreterSettings.
Looking at the code, there is no reason to lock the InterpreterSettings object
in InterpreterSettingManager.removeNoteInterpreterSettingBinding.
Similarly in InterpreterSettingManager.getNoteInterpreterSettingBinding only
interpreterSettingBinding is accessed and its already a thread safe object. So
we can remove synchronization on InterpreterSettings
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2463
### How should this be tested?
Being a concurrency issue, it is difficult to test.
Please see the comments in the jira to see the issue experienced on a
production zeppelin server.
### Questions:
* Does the licenses files need update? NO
* Is there breaking changes for older versions? NO
* Does this needs documentation? NO
Author: Benoy Antony
Closes #2296 from benoyantony/ZEPPELIN-2463 and squashes the following commits:
6f28d74 [Benoy Antony] replace check and remove with remove
0e0bb60 [Benoy Antony] fix checkstyle warnings
67f1514 [Benoy Antony] ZEPPELIN-2463 Avoid Locking interpreterSettings during
Notebook deletion
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d3768440
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d3768440
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d3768440
Branch: refs/heads/master
Commit: d37684403af045b343b1008977bcf6deef06e1d5
Parents: 95980c7
Author: Benoy Antony
Authored: Wed May 3 21:26:58 2017 -0700
Committer: Lee moon soo
Committed: Mon May 15 08:05:48 2017 -0700
--
.../interpreter/InterpreterSettingManager.java | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d3768440/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 9e7eb79..5034e33 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
@@ -460,11 +460,9 @@ public class InterpreterSettingManager {
private List getNoteInterpreterSettingBinding(String noteId) {
LinkedList bindings = new LinkedList<>();
-synchronized (interpreterSettings) {
- List settingIds = interpreterBindings.get(noteId);
- if (settingIds != null) {
-bindings.addAll(settingIds);
- }
+List settingIds = interpreterBindings.get(noteId);
+if (settingIds != null) {
+ bindings.addAll(settingIds);
}
return bindings;
}
@@ -893,18 +891,16 @@ public class InterpreterSettingManager {
}
public void removeNoteInterpreterSettingBinding(String user, String noteId)
throws IOException {
-synchronized (interpreterSettings) {
- List settingIds = (interpreterBindings.containsKey(noteId) ?
- interpreterBindings.remove(noteId) :
- Collections.emptyList());
+List settingIds = interpreterBindings.remove(noteId);
+if (settingIds != null) {
for (String settingId : settingIds) {
InterpreterSetting setting = get(settingId);
if (setting != null) {
this.removeInterpretersForNote(setting, user, noteId);
}
}
- saveToFile();
}
+saveToFile();
}
/**
zeppelin git commit: [ZEPPELIN-2463] Avoid Locking interpreterSettings during Notebook deletion
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 4a2aef6a4 -> b04900194
[ZEPPELIN-2463] Avoid Locking interpreterSettings during Notebook deletion
Deletion of a notebook requires locking interpreterSettings. If the deletion is
delayed , then lock is not released. At that point, we cannot run any notebook
because everything is waiting to lock interpreterSettings.
Looking at the code, there is no reason to lock the InterpreterSettings object
in InterpreterSettingManager.removeNoteInterpreterSettingBinding.
Similarly in InterpreterSettingManager.getNoteInterpreterSettingBinding only
interpreterSettingBinding is accessed and its already a thread safe object. So
we can remove synchronization on InterpreterSettings
Bug Fix
https://issues.apache.org/jira/browse/ZEPPELIN-2463
Being a concurrency issue, it is difficult to test.
Please see the comments in the jira to see the issue experienced on a
production zeppelin server.
* Does the licenses files need update? NO
* Is there breaking changes for older versions? NO
* Does this needs documentation? NO
Author: Benoy Antony
Closes #2296 from benoyantony/ZEPPELIN-2463 and squashes the following commits:
6f28d74 [Benoy Antony] replace check and remove with remove
0e0bb60 [Benoy Antony] fix checkstyle warnings
67f1514 [Benoy Antony] ZEPPELIN-2463 Avoid Locking interpreterSettings during
Notebook deletion
(cherry picked from commit d37684403af045b343b1008977bcf6deef06e1d5)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b0490019
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b0490019
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b0490019
Branch: refs/heads/branch-0.7
Commit: b04900194d1a17d25120f104ff88f4b133d7e2f7
Parents: 4a2aef6
Author: Benoy Antony
Authored: Wed May 3 21:26:58 2017 -0700
Committer: Lee moon soo
Committed: Mon May 15 08:10:05 2017 -0700
--
.../interpreter/InterpreterSettingManager.java | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b0490019/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 9ee8ffb..1d3dc88 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
@@ -460,11 +460,9 @@ public class InterpreterSettingManager {
private List getNoteInterpreterSettingBinding(String noteId) {
LinkedList bindings = new LinkedList<>();
-synchronized (interpreterSettings) {
- List settingIds = interpreterBindings.get(noteId);
- if (settingIds != null) {
-bindings.addAll(settingIds);
- }
+List settingIds = interpreterBindings.get(noteId);
+if (settingIds != null) {
+ bindings.addAll(settingIds);
}
return bindings;
}
@@ -891,15 +889,14 @@ public class InterpreterSettingManager {
saveToFile();
}
- public void removeNoteInterpreterSettingBinding(String user, String noteId) {
-synchronized (interpreterSettings) {
- List settingIds = (interpreterBindings.containsKey(noteId) ?
- interpreterBindings.remove(noteId) :
- Collections.emptyList());
+ public void removeNoteInterpreterSettingBinding(String user, String noteId)
throws IOException {
+List settingIds = interpreterBindings.remove(noteId);
+if (settingIds != null) {
for (String settingId : settingIds) {
this.removeInterpretersForNote(get(settingId), user, noteId);
}
}
+saveToFile();
}
/**
zeppelin git commit: [ZEPPELIN-2516] Set offset, tolerance for navbar, actionbar hiding
Repository: zeppelin Updated Branches: refs/heads/master d37684403 -> e857070f3 [ZEPPELIN-2516] Set offset, tolerance for navbar, actionbar hiding ### What is this PR for? Set offset, tolerance for navbar, actionbar hiding. See the attached screenshots. ### What type of PR is it? [Bug Fix] ### Todos NONE ### What is the Jira issue? [ZEPPELIN-2516](https://issues.apache.org/jira/browse/ZEPPELIN-2516) ### How should this be tested? Refer the screenshots. ### Screenshots (if appropriate) Before  After  ### Questions: * Does the licenses files need update? - NO * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <1am...@gmail.com> Closes #2325 from 1ambda/ZEPPELIN-2516/set-offset-tolerance and squashes the following commits: 5d9317c [1ambda] fix: Set offset, tolerance Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e857070f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e857070f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e857070f Branch: refs/heads/master Commit: e857070f3bd71f1a9e0413b8c0eaebba1f6f7772 Parents: d376844 Author: 1ambda <1am...@gmail.com> Authored: Tue May 9 15:46:31 2017 +0900 Committer: Lee moon soo Committed: Mon May 15 08:11:36 2017 -0700 -- zeppelin-web/src/app/notebook/notebook-actionBar.html | 2 +- zeppelin-web/src/components/navbar/navbar.html| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e857070f/zeppelin-web/src/app/notebook/notebook-actionBar.html -- diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html index 10368c8..e83e05e 100644 --- a/zeppelin-web/src/app/notebook/notebook-actionBar.html +++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html @@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e857070f/zeppelin-web/src/components/navbar/navbar.html -- diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html index 7d33c02..2cae91b 100644 --- a/zeppelin-web/src/components/navbar/navbar.html +++ b/zeppelin-web/src/components/navbar/navbar.html @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -
zeppelin git commit: [ZEPPELIN-2491] fix: Bump spell package version too
Repository: zeppelin
Updated Branches:
refs/heads/master e857070f3 -> d92d14aae
[ZEPPELIN-2491] fix: Bump spell package version too
### What is this PR for?
[ZEPPELIN-2491] fix: Bump spell package version too
### What type of PR is it?
[Bug Fix]
### Todos
NONE
### What is the Jira issue?
[ZEPPELIN-2491](https://issues.apache.org/jira/browse/ZEPPELIN-2491)
### How should this be tested?
1. ` ./dev/change_zeppelin_version.sh 0.8.0-SNAPSHOT 0.8.0`
2. Check `/zeppelin-web/src/app/spell/package.json`
### Screenshots (if appropriate)
NONE
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2315 from 1ambda/ZEPPELIN-2491/bump-spell-package-version-too and
squashes the following commits:
20a8fae [1ambda] fix: Bump spell package version too
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d92d14aa
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d92d14aa
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d92d14aa
Branch: refs/heads/master
Commit: d92d14aae8678bba8b01d19abc8bbf875585e0ea
Parents: e857070
Author: 1ambda <1am...@gmail.com>
Authored: Thu May 4 13:36:57 2017 +0900
Committer: Lee moon soo
Committed: Mon May 15 08:14:04 2017 -0700
--
dev/change_zeppelin_version.sh | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d92d14aa/dev/change_zeppelin_version.sh
--
diff --git a/dev/change_zeppelin_version.sh b/dev/change_zeppelin_version.sh
index 1b7891c..cb9c017 100755
--- a/dev/change_zeppelin_version.sh
+++ b/dev/change_zeppelin_version.sh
@@ -57,6 +57,7 @@ mvn versions:set -DnewVersion="${TO_VERSION}"
-DgenerateBackupPoms=false > /dev/
sed -i '' 's/-'"${FROM_VERSION}"'.jar",/-'"${TO_VERSION}"'.jar",/g'
zeppelin-examples/zeppelin-example-clock/zeppelin-example-clock.json
sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version":
"'"${TO_VERSION}"'",/g' zeppelin-web/src/app/tabledata/package.json
sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version":
"'"${TO_VERSION}"'",/g' zeppelin-web/src/app/visualization/package.json
+sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version":
"'"${TO_VERSION}"'",/g' zeppelin-web/src/app/spell/package.json
# Change version in Dockerfile
sed -i '' 's/Z_VERSION="'"${FROM_VERSION}"'"/Z_VERSION="'"${TO_VERSION}"'"/g'
scripts/docker/zeppelin/bin/Dockerfile
zeppelin git commit: [ZEPPELIN-2512] Prevent slow note, interpreter search. (master, branch-0.7)
Repository: zeppelin Updated Branches: refs/heads/master d92d14aae -> 164db0794 [ZEPPELIN-2512] Prevent slow note, interpreter search. (master, branch-0.7) ### What is this PR for? Use debounce in search input to avoid the slow search. See more:  ### What type of PR is it? [Improvement] ### Todos NONE ### What is the Jira issue? [ZEPPELIN-2512](https://issues.apache.org/jira/browse/ZEPPELIN-2512) ### How should this be tested? 1. Create many notes with different names. (50+) 2. Search using note name filter in home and navbar. 3. Do the same thing for interpreters in the interpreter page ### Screenshots (if appropriate) NONE ### Questions: * Does the licenses files need update? - NO * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <1am...@gmail.com> Closes #2324 from 1ambda/ZEPPELIN-2512/add-debounce-for-search-inputs and squashes the following commits: 20292fb [1ambda] feat: Add debounce for interpreter search input b792ee5 [1ambda] feat: Add debounce for note name filter Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/164db079 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/164db079 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/164db079 Branch: refs/heads/master Commit: 164db0794fea1cf289068de71af2b62ae6811cfd Parents: d92d14a Author: 1ambda <1am...@gmail.com> Authored: Tue May 9 01:35:38 2017 +0900 Committer: Lee moon soo Committed: Mon May 15 08:15:03 2017 -0700 -- zeppelin-web/src/app/interpreter/interpreter.html| 5 - .../src/components/filterNoteNames/filter-note-names.html| 8 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/164db079/zeppelin-web/src/app/interpreter/interpreter.html -- diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html index 90dc0f8..a9c932e 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.html +++ b/zeppelin-web/src/app/interpreter/interpreter.html @@ -41,7 +41,10 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/164db079/zeppelin-web/src/components/filterNoteNames/filter-note-names.html -- diff --git a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html index 1aede1e..071cba4 100644 --- a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html +++ b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html @@ -11,5 +11,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - +
zeppelin git commit: [ZEPPELIN-2512] Prevent slow note, interpreter search. (master, branch-0.7)
Repository: zeppelin Updated Branches: refs/heads/branch-0.7 b04900194 -> d21bf4c31 [ZEPPELIN-2512] Prevent slow note, interpreter search. (master, branch-0.7) ### What is this PR for? Use debounce in search input to avoid the slow search. See more:  ### What type of PR is it? [Improvement] ### Todos NONE ### What is the Jira issue? [ZEPPELIN-2512](https://issues.apache.org/jira/browse/ZEPPELIN-2512) ### How should this be tested? 1. Create many notes with different names. (50+) 2. Search using note name filter in home and navbar. 3. Do the same thing for interpreters in the interpreter page ### Screenshots (if appropriate) NONE ### Questions: * Does the licenses files need update? - NO * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <1am...@gmail.com> Closes #2324 from 1ambda/ZEPPELIN-2512/add-debounce-for-search-inputs and squashes the following commits: 20292fb [1ambda] feat: Add debounce for interpreter search input b792ee5 [1ambda] feat: Add debounce for note name filter (cherry picked from commit 164db0794fea1cf289068de71af2b62ae6811cfd) Signed-off-by: Lee moon soo Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d21bf4c3 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d21bf4c3 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d21bf4c3 Branch: refs/heads/branch-0.7 Commit: d21bf4c31ae595a595427c80be9f5eb1ced20fd8 Parents: b049001 Author: 1ambda <1am...@gmail.com> Authored: Tue May 9 01:35:38 2017 +0900 Committer: Lee moon soo Committed: Mon May 15 08:15:12 2017 -0700 -- zeppelin-web/src/app/interpreter/interpreter.html| 5 - .../src/components/filterNoteNames/filter-note-names.html| 8 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d21bf4c3/zeppelin-web/src/app/interpreter/interpreter.html -- diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html index 90dc0f8..a9c932e 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.html +++ b/zeppelin-web/src/app/interpreter/interpreter.html @@ -41,7 +41,10 @@ limitations under the License. - + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d21bf4c3/zeppelin-web/src/components/filterNoteNames/filter-note-names.html -- diff --git a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html index 1aede1e..071cba4 100644 --- a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html +++ b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html @@ -11,5 +11,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - +
zeppelin git commit: [ZEPPELIN-2521] fix: Confusing axis description in advanced-transformation
Repository: zeppelin
Updated Branches:
refs/heads/master 164db0794 -> 56cee76a7
[ZEPPELIN-2521] fix: Confusing axis description in advanced-transformation
### What is this PR for?
Fixed confusing axis descriptions in advanced-transformation.
### What type of PR is it?
[Improvement]
### Todos
NONE
### What is the Jira issue?
[ZEPPELIN-2521](https://issues.apache.org/jira/browse/ZEPPELIN-2521)
### How should this be tested?
1. Install any helium visualization package written with
advanced-transformation. For example ultimate-heatmap-chart.
2. Open the `setting` menu.
### Screenshots (if appropriate)
Before
https://cloud.githubusercontent.com/assets/4968473/25875376/0c327874-3552-11e7-883e-3667e198e180.png";>
After
https://cloud.githubusercontent.com/assets/4968473/25875379/0f603de2-3552-11e7-8c50-2ac0b783b704.png";>
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2328 from 1ambda/ZEPPELIN-2521/confusing-desc-for-axis-in-adtr and
squashes the following commits:
78a39b2 [1ambda] fix: Remove sep desc for axis type
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/56cee76a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/56cee76a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/56cee76a
Branch: refs/heads/master
Commit: 56cee76a7468d6a6f90fb3c2e4f6c0028dcd91ab
Parents: 164db07
Author: 1ambda <1am...@gmail.com>
Authored: Wed May 10 07:19:34 2017 +0900
Committer: Lee moon soo
Committed: Mon May 15 08:16:36 2017 -0700
--
.../src/app/tabledata/advanced-transformation-setting.html | 8 ++--
zeppelin-web/src/app/tabledata/advanced-transformation.js| 4 ++--
2 files changed, 4 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/56cee76a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
--
diff --git
a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
b/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
index 8393bf3..107580a 100644
--- a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
+++ b/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
@@ -86,15 +86,11 @@ limitations under the License.
{{getAxisAnnotation(axisSpec)}}
-
-{{getAxisTypeAnnotation(axisSpec)}}
-
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/56cee76a/zeppelin-web/src/app/tabledata/advanced-transformation.js
--
diff --git a/zeppelin-web/src/app/tabledata/advanced-transformation.js
b/zeppelin-web/src/app/tabledata/advanced-transformation.js
index 051bb99..8650de5 100644
--- a/zeppelin-web/src/app/tabledata/advanced-transformation.js
+++ b/zeppelin-web/src/app/tabledata/advanced-transformation.js
@@ -100,7 +100,7 @@ export default class AdvancedTransformation extends
Transformation {
},
getAxisTypeAnnotation: (axisSpec) => {
- let anno = `${axisSpec.axisType}`
+ let anno = ''
let minAxisCount = axisSpec.minAxisCount
let maxAxisCount = axisSpec.maxAxisCount
@@ -121,7 +121,7 @@ export default class AdvancedTransformation extends
Transformation {
return anno
},
-getAxisTypeAnnotationColor: (axisSpec) => {
+getAxisAnnotationColor: (axisSpec) => {
if (isAggregatorAxis(axisSpec)) {
return { 'background-color': '#5782bd' }
} else if (isGroupAxis(axisSpec)) {
zeppelin git commit: [ZEPPELIN-2437] Executions of notebooks are blocked after running 50 different notebooks under SparkInterpreter scoped mode
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.6 662b7d684 -> b8f4fb902
[ZEPPELIN-2437] Executions of notebooks are blocked after running 50 different
notebooks under SparkInterpreter scoped mode
### What is this PR for?
Removes Scheduler when RemoteInterpreterServer close an interpreter.
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Cherry-Picks modifications from #2175 to fix "escaped interpreters" on
RemoteInterpreterServer side(Need to be done in another PR)
* [x] - Removes Scheduler when calling RemoteInterpreterServer.close()
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2437
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: z0621
Closes #2319 from hammertank/ZEPPELIN-2437 and squashes the following commits:
118e138 [z0621] Remove Scheduler when Interpreter is closed
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b8f4fb90
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b8f4fb90
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b8f4fb90
Branch: refs/heads/branch-0.6
Commit: b8f4fb90273dc1c6607eccd36c493590ad0486cb
Parents: 662b7d6
Author: z0621
Authored: Mon May 8 18:19:26 2017 +0800
Committer: Lee moon soo
Committed: Mon May 15 18:09:51 2017 -0700
--
.../interpreter/remote/RemoteInterpreterServer.java | 11 +++
1 file changed, 11 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b8f4fb90/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
index c8e5f1e..ddd1394 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -39,6 +39,7 @@ import org.apache.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.scheduler.JobListener;
import org.apache.zeppelin.scheduler.JobProgressPoller;
import org.apache.zeppelin.scheduler.Scheduler;
+import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -226,10 +227,20 @@ public class RemoteInterpreterServer
Interpreter inp = it.next();
if (inp.getClassName().equals(className)) {
inp.close();
+
+Scheduler scheduler = inp.getScheduler();
+if (scheduler != null) {
+
SchedulerFactory.singleton().removeScheduler(scheduler.getName());
+}
+
it.remove();
break;
}
}
+
+if (interpreters.isEmpty()) {
+ interpreterGroup.remove(noteId);
+}
}
}
}
zeppelin git commit: [ZEPPELIN-2430] The xAxis text in the line and area chart overlaps
Repository: zeppelin
Updated Branches:
refs/heads/master 07a5b15d1 -> fcd3aa75c
[ZEPPELIN-2430] The xAxis text in the line and area chart overlaps
### What is this PR for?
Like in the #2133 case, the xAxis text of area chart and line chart is
overlapping.
For reusing form, I created a html template file for how to show xLabel and, in
`rotate` button checked, show up `input` box for set value of rotate degree
(default value is -45).
### What type of PR is it?
[Bug Fix | Improvement]
### What is the Jira issue?
* [ZEPPELIN-2430 - The xlabel text in the line and area graph
overlaps](https://issues.apache.org/jira/browse/ZEPPELIN-2430)
### How should this be tested?
1. Click `settings` button in the barChart
2. Check to whether there are `default`, `rotate`, `hide` button or not.
3. Test to click each button and whether it works well or not for each
situation.
4. In rotate button checked, check to set value and showing xAixs rotate degree
properly.
5. In the areaChart and lineChart, test with above steps.
### Screenshots (if appropriate)
[Before]
[After]
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: soralee
Closes #2339 from soralee/ZEPPELIN-2430_overlap_line_area and squashes the
following commits:
fe0b30b [soralee] remove annotation
e8e2e39 [soralee] removed ng-include about single template url
5383c93 [soralee] create template and apply area and line chart
14cfbdf [soralee] fix area chart
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/fcd3aa75
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/fcd3aa75
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/fcd3aa75
Branch: refs/heads/master
Commit: fcd3aa75cd411aceb235bea23f8d2968976db6a7
Parents: 07a5b15
Author: soralee
Authored: Mon May 15 19:03:34 2017 +0900
Committer: Lee moon soo
Committed: Tue May 16 07:42:59 2017 -0700
--
.../paragraph/result/result.controller.js | 1 +
.../app/notebook/paragraph/result/result.css| 19 -
.../builtins/visualization-areachart.js | 78
.../builtins/visualization-barchart.js | 53 ++---
.../builtins/visualization-displayXAxis.html| 52 +
.../builtins/visualization-linechart.js | 61 ++-
6 files changed, 227 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fcd3aa75/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
--
diff --git
a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
index 0ed5753..4c9ad84 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
@@ -528,6 +528,7 @@ function ResultCtrl ($scope, $rootScope, $route, $window,
$routeParams, $locatio
builtInViz.instance._emitter = emitter
builtInViz.instance._compile = $compile
builtInViz.instance._createNewScope = createNewScope
+ builtInViz.instance._templateRequest = $templateRequest
const transformation = builtInViz.instance.getTransformation()
transformation._emitter = emitter
transformation._templateRequest = $templateRequest
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fcd3aa75/zeppelin-web/src/app/notebook/paragraph/result/result.css
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.css
b/zeppelin-web/src/app/notebook/paragraph/result/result.css
index 97eab53..3e864ef 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/result.css
+++ b/zeppelin-web/src/app/notebook/paragraph/result/result.css
@@ -13,10 +13,10 @@
*/
.result-chart-selector {
-margin-bottom: 10px;
-position: relative;
-display: inline-block;
-vertical-align: middle;
+ margin-bottom: 10px;
+ position: relative;
+ display: inline-block;
+ vertical-align: middle;
}
.result-chart-selector button {
@@ -46,3 +46,14 @@
border: 1px solid transparent;
border-radius: 4px;
}
+
+
+.input-rotate {
+ width: 30px;
+ height: 20px;
+ line-height: 10px;
+ font-family: 'Roboto', sans-s
zeppelin git commit: [ZEPPELIN-2467] Restore travis second job functionality
Repository: zeppelin
Updated Branches:
refs/heads/master fcd3aa75c -> 9cf09cce8
[ZEPPELIN-2467] Restore travis second job functionality
### What is this PR for?
issue ZEPPELIN-2467 has resolved by
https://github.com/apache/zeppelin/pull/2300. However
https://github.com/apache/zeppelin/commit/8194a5e0af0e1b926b27ea9e0d12bdf9d0e43b4b
reverts #2300.
This PR apply #2300 again with two more test exclusion:
- SecurityRestApiTest (https://issues.apache.org/jira/browse/ZEPPELIN-2545)
- NotebookSecurityRestApiTest
(https://issues.apache.org/jira/browse/ZEPPELIN-2546)
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2467
### How should this be tested?
CI becomes green
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Alexander Shoshin
Author: Lee moon soo
Closes #2342 from Leemoonsoo/fix_ci2 and squashes the following commits:
1a8f24b [Lee moon soo] exclude SecurityRestApiTest and
NotebookSecurityRestApiTest
4f82243 [Alexander Shoshin] made a comment about excluded tests
95eb7be [Alexander Shoshin] changed -Dtest flag to -Dtests.to.exclude and
excluded unstable tests
41af70f [Alexander Shoshin] added ability to exclude some unit tests using
command line
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9cf09cce
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9cf09cce
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9cf09cce
Branch: refs/heads/master
Commit: 9cf09cce87d529f086c3560db230b6bfac9042d0
Parents: fcd3aa7
Author: Alexander Shoshin
Authored: Sun May 14 18:05:41 2017 -0400
Committer: Lee moon soo
Committed: Wed May 17 14:47:48 2017 -0400
--
.travis.yml | 11 ++-
pom.xml | 6 ++
2 files changed, 16 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9cf09cce/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 6130509..1a38468 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,17 @@ matrix:
env: SCALA_VER="2.11" SPARK_VER="2.0.2" HADOOP_VER="2.6" PROFILE="-Prat"
BUILD_FLAG="clean" TEST_FLAG="org.apache.rat:apache-rat-plugin:check"
TEST_PROJECTS=""
# Test core modules
+#
+# Several tests were excluded from this configuration due to the following
issues:
+# HeliumBundleFactoryTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2469
+# HeliumApplicationFactoryTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2470
+# NotebookTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2471
+# ZeppelinRestApiTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2473
+# SecurityRestApiTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2545
+# NotebookSecurityRestApiTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2546
+# After issues are fixed these tests need to be included back by removing
them from the "-Dtests.to.exclude" property
- jdk: "oraclejdk7"
- env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11"
BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify
-Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtest='!ZeppelinSparkClusterTest,!org.apache.zeppelin.spark.*'
-DfailIfNoTests=false"
+ env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11"
BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify
-Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumBundleFactoryTest.java,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java,**/SecurityRestApiTest.java,**/NotebookSecurityRestApiTest.java
-DfailIfNoTests=false"
# Test selenium with spark module for 1.6.3
- jdk: "oraclejdk7"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9cf09cce/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3bede62..87af323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,9 @@
64m
512m
+
+
+
@@ -555,6 +558,9 @@
${plugin.surefire.version}
-Xmx2g -Xms1g -Dfile.encoding=UTF-8
+
+ ${tests.to.exclude}
+
zeppelin git commit: [ZEPPELIN-2545] [ZEPPELIN-2546] SecurityRestApiTest, NotebookSecurityRestApiTest fails on travis
Repository: zeppelin
Updated Branches:
refs/heads/master 9cf09cce8 -> 2f03469bc
[ZEPPELIN-2545] [ZEPPELIN-2546] SecurityRestApiTest,
NotebookSecurityRestApiTest fails on travis
### What is this PR for?
shiro returns multiple JSESSIONID on login request in integration test.
```bash
moon$ curl -v -XPOST -H "Origin: http://localhost:8080/api"; -H "Host:
localhost:8080" --data "userName=admin&password=password1"
'http://localhost:8080/api/login'
* Trying ::1...
* Connected to localhost (::1) port 8080 (#0)
> POST /api/login HTTP/1.1
> Host: localhost:8080
> User-Agent: curl/7.43.0
> Accept: */*
> Origin: http://localhost:8080/api
> Content-Length: 33
> Content-Type: application/x-www-form-urlencoded
>
* upload completely sent off: 33 out of 33 bytes
< HTTP/1.1 200 OK
< Date: Mon, 15 May 2017 14:24:10 GMT
< Access-Control-Allow-Origin: http://localhost:8080/api
< Access-Control-Allow-Credentials: true
< Access-Control-Allow-Headers: authorization,Content-Type
< Access-Control-Allow-Methods: POST, GET, OPTIONS, PUT, HEAD, DELETE
< Date: Monday, May 15, 2017 7:24:10 AM PDT
< Set-Cookie: rememberMe=deleteMe; Path=/; Max-Age=0; Expires=Sun, 14-May-2017
14:24:10 GMT
< Set-Cookie: JSESSIONID=2c0062db-99f0-438c-a5f6-6fdffa4eb7ae; Path=/; HttpOnly
< Set-Cookie: JSESSIONID=deleteMe; Path=/; Max-Age=0; Expires=Sun, 14-May-2017
14:24:10 GMT
< Set-Cookie: JSESSIONID=6bb25285-6cb0-47ea-8bb6-e268110a6034; Path=/; HttpOnly
< Set-Cookie: rememberMe=deleteMe; Path=/; Max-Age=0; Expires=Sun, 14-May-2017
14:24:10 GMT
< Content-Type: application/json
< Date: Mon, 15 May 2017 14:24:10 GMT
< Content-Length: 123
< Server: Jetty(9.2.15.v20160210)
<
* Connection #0 to host localhost left intact
```
Later one is valid JSESSIONID. This PR changes test code to use last JSESSIONID.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2545
https://issues.apache.org/jira/browse/ZEPPELIN-2546
### How should this be tested?
After https://github.com/apache/zeppelin/pull/2342 is merged, this PR will be
rebased. Then CI should be green.
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo
Closes #2344 from Leemoonsoo/ZEPPELIN-2545 and squashes the following commits:
ed43ce9 [Lee moon soo] enable SecurityRestApiTest, NotebookSecurityRestApiTest
70915a2 [Lee moon soo] use last JSESSIONID
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2f03469b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2f03469b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2f03469b
Branch: refs/heads/master
Commit: 2f03469bce6191fc39b2e9021223ecbb3df84cfc
Parents: 9cf09cc
Author: Lee moon soo
Authored: Wed May 17 15:19:40 2017 -0400
Committer: Lee moon soo
Committed: Thu May 18 08:26:57 2017 -0400
--
.travis.yml | 4 +---
.../org/apache/zeppelin/rest/AbstractTestRestApi.java | 10 --
2 files changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2f03469b/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 1a38468..d6887ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,11 +52,9 @@ matrix:
# HeliumApplicationFactoryTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2470
# NotebookTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2471
# ZeppelinRestApiTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2473
-# SecurityRestApiTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2545
-# NotebookSecurityRestApiTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2546
# After issues are fixed these tests need to be included back by removing
them from the "-Dtests.to.exclude" property
- jdk: "oraclejdk7"
- env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11"
BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify
-Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumBundleFactoryTest.java,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java,**/SecurityRestApiTest.java,**/NotebookSecurityRestApiTest.java
-DfailIfNoTests=false"
+ env: SCAL
zeppelin git commit: [ZEPPELIN-2502] RemoteInterpreterServer hang forever during shutdown
Repository: zeppelin
Updated Branches:
refs/heads/master 05af3bf4b -> c7c9aa1cc
[ZEPPELIN-2502] RemoteInterpreterServer hang forever during shutdown
### What is this PR for?
There is the chance to have a RemoteServerInterpreter hang forever during
shutdown
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
[ZEPPELIN-2502]
### How should this be tested?
Unit test provided for the fix.
### Questions:
* Is there breaking changes for older versions?
* Does this needs documentation?
Author: andrea
Closes #2322 from andreaTP/processHang and squashes the following commits:
e58483e [andrea] [ZEPPELIN-2502] RemoteInterpreterServer hang forever during
shutdown
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c7c9aa1c
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c7c9aa1c
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c7c9aa1c
Branch: refs/heads/master
Commit: c7c9aa1ccb14b8394cc01d91976f6ba61458f378
Parents: 05af3bf
Author: andrea
Authored: Thu May 4 13:52:22 2017 +0100
Committer: Lee moon soo
Committed: Sat May 20 15:07:47 2017 -0400
--
.../remote/RemoteInterpreterEventClient.java| 7 ++-
.../remote/RemoteInterpreterServer.java | 7 ++-
.../remote/RemoteInterpreterServerTest.java | 63
3 files changed, 73 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c7c9aa1c/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
index bb6de31..2cdbf39 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
@@ -477,15 +477,18 @@ public class RemoteInterpreterEventClient implements
ResourcePoolConnector {
/**
* Wait for eventQueue becomes empty
*/
- public void waitForEventQueueBecomesEmpty() {
+ public void waitForEventQueueBecomesEmpty(long atMost) {
+long startTime = System.currentTimeMillis();
synchronized (eventQueue) {
- while (!eventQueue.isEmpty()) {
+ while (!eventQueue.isEmpty() && (System.currentTimeMillis() - startTime)
< atMost) {
try {
eventQueue.wait(100);
} catch (InterruptedException e) {
// ignore exception
}
}
+ if (!eventQueue.isEmpty())
+eventQueue.clear();
}
}
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c7c9aa1c/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
index 50881ca..719d2dd 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -80,6 +80,8 @@ public class RemoteInterpreterServer
private Map remoteWorksResponsePool;
private ZeppelinRemoteWorksController remoteWorksController;
+ private final long DEFAULT_SHUTDOWN_TIMEOUT = 2000;
+
public RemoteInterpreterServer(int port) throws TTransportException {
this.port = port;
@@ -99,7 +101,7 @@ public class RemoteInterpreterServer
@Override
public void shutdown() throws TException {
-eventClient.waitForEventQueueBecomesEmpty();
+eventClient.waitForEventQueueBecomesEmpty(DEFAULT_SHUTDOWN_TIMEOUT);
if (interpreterGroup != null) {
interpreterGroup.close();
}
@@ -111,7 +113,8 @@ public class RemoteInterpreterServer
// this case, need to force kill the process
long startTime = System.currentTimeMillis();
-while (System.currentTimeMillis() - startTime < 2000 &&
server.isServing()) {
+while (System.currentTimeMillis() - startTime < DEFAULT_SHUTDOWN_TIMEOUT &&
+server.isServing()) {
try {
Thread.sleep(300);
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c7c9aa1c/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/rem
zeppelin git commit: [ZEPPELIN-2502] RemoteInterpreterServer hang forever during shutdown
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 9cccd8677 -> 95bf6172b
[ZEPPELIN-2502] RemoteInterpreterServer hang forever during shutdown
### What is this PR for?
There is the chance to have a RemoteServerInterpreter hang forever during
shutdown
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
[ZEPPELIN-2502]
### How should this be tested?
Unit test provided for the fix.
### Questions:
* Is there breaking changes for older versions?
* Does this needs documentation?
Author: andrea
Closes #2322 from andreaTP/processHang and squashes the following commits:
e58483e [andrea] [ZEPPELIN-2502] RemoteInterpreterServer hang forever during
shutdown
(cherry picked from commit c7c9aa1ccb14b8394cc01d91976f6ba61458f378)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/95bf6172
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/95bf6172
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/95bf6172
Branch: refs/heads/branch-0.7
Commit: 95bf6172b0ce9f8336490d42194114182fd64828
Parents: 9cccd86
Author: andrea
Authored: Thu May 4 13:52:22 2017 +0100
Committer: Lee moon soo
Committed: Sat May 20 15:08:03 2017 -0400
--
.../remote/RemoteInterpreterEventClient.java| 7 ++-
.../remote/RemoteInterpreterServer.java | 7 ++-
.../remote/RemoteInterpreterServerTest.java | 63
3 files changed, 73 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/95bf6172/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
index 900d1ac..05c57a0 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
@@ -330,15 +330,18 @@ public class RemoteInterpreterEventClient implements
ResourcePoolConnector {
/**
* Wait for eventQueue becomes empty
*/
- public void waitForEventQueueBecomesEmpty() {
+ public void waitForEventQueueBecomesEmpty(long atMost) {
+long startTime = System.currentTimeMillis();
synchronized (eventQueue) {
- while (!eventQueue.isEmpty()) {
+ while (!eventQueue.isEmpty() && (System.currentTimeMillis() - startTime)
< atMost) {
try {
eventQueue.wait(100);
} catch (InterruptedException e) {
// ignore exception
}
}
+ if (!eventQueue.isEmpty())
+eventQueue.clear();
}
}
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/95bf6172/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
index 2c20f32..eec8cf9 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -79,6 +79,8 @@ public class RemoteInterpreterServer
private Map remoteWorksResponsePool;
private ZeppelinRemoteWorksController remoteWorksController;
+ private final long DEFAULT_SHUTDOWN_TIMEOUT = 2000;
+
public RemoteInterpreterServer(int port) throws TTransportException {
this.port = port;
@@ -98,7 +100,7 @@ public class RemoteInterpreterServer
@Override
public void shutdown() throws TException {
-eventClient.waitForEventQueueBecomesEmpty();
+eventClient.waitForEventQueueBecomesEmpty(DEFAULT_SHUTDOWN_TIMEOUT);
if (interpreterGroup != null) {
interpreterGroup.close();
}
@@ -110,7 +112,8 @@ public class RemoteInterpreterServer
// this case, need to force kill the process
long startTime = System.currentTimeMillis();
-while (System.currentTimeMillis() - startTime < 2000 &&
server.isServing()) {
+while (System.currentTimeMillis() - startTime < DEFAULT_SHUTDOWN_TIMEOUT &&
+server.isServing()) {
try {
Thread.sleep(300);
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/95bf6172/zeppelin-
zeppelin git commit: [ZEPPELIN-2411] Improve Table
tableOption immediately f83c070 [1ambda] fix: Commit graph config when closing 6db38ae [1ambda] feat: Add missing change events 911c0e7 [1ambda] fix: Prevent recursive emitting d47ccc8 [1ambda] feat: Persist grid state b433d7f [1ambda] refactor: Add getGrid* funcs 1480841 [1ambda] fix: Remove refresh in menu actions 35d99e9 [1ambda] fix: enable scroll in col menus 25a72fe [1ambda] feat: Add types to menu acc38cf [1ambda] feat: Add paginiation table opts 8793d8f [1ambda] fix: set valid pagination opts 744dc66 [1ambda] docs: Update desc for table option 8bd8256 [1ambda] fix: persist initial config 78cec42 [1ambda] feat: resetTableOption 475bc31 [1ambda] feat: Add table option fc0abd4 [1ambda] feat: Use tabledata 85cdd8e [1ambda] feat: render setting for table 5ee6a2e [1ambda] fix: Remove handsonhelper while using moment form npm 2444855 [1ambda] refactor: variable name ed17862 [1ambda] fix: Remove unused css 1f61260 [1ambda] refactor: extract table related css to display-table.css Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/bed82eb4 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/bed82eb4 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/bed82eb4 Branch: refs/heads/master Commit: bed82eb4bdf20db5c89ccaed8a8631846997 Parents: c7c9aa1 Author: 1ambda <1am...@gmail.com> Authored: Fri May 19 00:43:23 2017 +0900 Committer: Lee moon soo Committed: Sat May 20 15:10:20 2017 -0400 -- zeppelin-distribution/src/bin_license/LICENSE | 6 +- .../zeppelin/integration/SparkParagraphIT.java | 14 +- zeppelin-web/bower.json | 2 - zeppelin-web/karma.conf.js | 5 - zeppelin-web/package.json | 7 +- zeppelin-web/src/app/app.js | 13 + .../src/app/handsontable/handsonHelper.js | 201 -- .../src/app/jobmanager/jobs/job.controller.js | 2 + .../src/app/notebook/notebook-actionBar.html| 2 +- .../src/app/notebook/notebook.controller.js | 9 +- .../notebook/paragraph/paragraph.controller.js | 20 +- .../src/app/notebook/paragraph/paragraph.css| 103 - .../notebook/paragraph/result/display-table.css | 49 +++ .../paragraph/result/result-chart-selector.html | 2 +- .../paragraph/result/result.controller.js | 21 +- .../app/notebook/paragraph/result/result.html | 4 +- .../visualization-table-grid-filter.html| 27 ++ .../builtins/visualization-table-setting.html | 84 .../builtins/visualization-table.js | 385 +-- .../builtins/visualization-util.js | 172 + .../components/editor/codeEditor.directive.js | 2 +- .../websocketEvents/websocketEvents.factory.js | 3 +- zeppelin-web/src/index.html | 8 +- zeppelin-web/src/index.js | 1 - zeppelin-web/webpack.config.js | 1 - 25 files changed, 774 insertions(+), 369 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/bed82eb4/zeppelin-distribution/src/bin_license/LICENSE -- diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index 60fe5c0..7dd1fb3 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -244,9 +244,9 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) lodash v3.9.3 (https://lodash.com/) - https://github.com/lodash/lodash/blob/3.9.3/LICENSE.txt (The MIT License) angular-filter v0.5.4 (https://github.com/a8m/angular-filter) - https://github.com/a8m/angular-filter/blob/v0.5.4/license.md (The MIT License) ngToast v2.0.0 (http://tamerayd.in/ngToast/) - http://tameraydin.mit-license.org/ -(The MIT License) Handsontable v0.24.2 (https://github.com/handsontable/handsontable) - https://github.com/handsontable/handsontable/blob/master/LICENSE -(The MIT License) Zeroclipboard v2.2.0 (https://github.com/zeroclipboard/zeroclipboard) - https://github.com/zeroclipboard/zeroclipboard/blob/v2.2.0/LICENSE -(The MIT License) Moment v2.9.0 (https://github.com/moment/moment) - https://github.com/moment/moment/blob/2.9.0/LICENSE +(The MIT License) moment v2.18.1 (https://github.com/moment/moment) - https://github.com/moment/moment/blob/2.18.1/LICENSE +(The MIT License) moment-duration-format v1.3.0 (https://github.com/jsmreese/moment-duration-format) - https://github.com/jsmreese/moment-duration-format/blob/1.3.0/LICENSE +(The MIT License) angular-ui-grid v4.0.4 (https://github.com/angular-ui/ui-grid) - https://github.com/angular-ui/ui-grid/blob/v4.0.4/LICEN
zeppelin git commit: [ZEPPELIN-2570] fix: indistinguishable directory icon color
Repository: zeppelin
Updated Branches:
refs/heads/master bed82eb4b -> c3b708746
[ZEPPELIN-2570] fix: indistinguishable directory icon color
### What is this PR for?
Fixed indistinguishable directory icon color. See the attached screenshots.
Problem is that it's hard to
- recognize directory is opened not not
- distinguish whether it is a note is or a directory
### What type of PR is it?
[Improvement]
### Todos
DONE
### What is the Jira issue?
[ZEPPELIN-2570](https://issues.apache.org/jira/browse/ZEPPELIN-2570)
### How should this be tested?
- Open Directory
### Screenshots (if appropriate)
Before
https://cloud.githubusercontent.com/assets/4968473/26232541/f7881b94-3c91-11e7-8914-b01c358d781b.png";>
https://cloud.githubusercontent.com/assets/4968473/26232542/f8e1474a-3c91-11e7-891c-84a5d2579f06.png";>
After
https://cloud.githubusercontent.com/assets/4968473/26232533/ef4eea16-3c91-11e7-831a-084865b126d8.png";>
https://cloud.githubusercontent.com/assets/4968473/26232536/f0cf7d74-3c91-11e7-8b62-2b13f3767ed6.png";>
### Questions:
* Does the licenses files need update?
* Is there breaking changes for older versions?
* Does this needs documentation?
Author: 1ambda <1am...@gmail.com>
Closes #2352 from 1ambda/ZEPPELIN-2570/change-directory-color and squashes the
following commits:
7079ce3 [1ambda] feat: Make dir color distingusible
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c3b70874
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c3b70874
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c3b70874
Branch: refs/heads/master
Commit: c3b7087463822a2ed96d377413f47370391e17c1
Parents: bed82eb
Author: 1ambda <1am...@gmail.com>
Authored: Fri May 19 12:43:00 2017 +0900
Committer: Lee moon soo
Committed: Sat May 20 15:13:15 2017 -0400
--
zeppelin-web/src/app/home/notebook-template.html | 2 +-
.../src/components/expandCollapse/expandCollapse.directive.js| 4 ++--
zeppelin-web/src/components/navbar/navbar-noteList-elem.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c3b70874/zeppelin-web/src/app/home/notebook-template.html
--
diff --git a/zeppelin-web/src/app/home/notebook-template.html
b/zeppelin-web/src/app/home/notebook-template.html
index 0456a39..4c287de 100644
--- a/zeppelin-web/src/app/home/notebook-template.html
+++ b/zeppelin-web/src/app/home/notebook-template.html
@@ -56,7 +56,7 @@ limitations under the License.
- {{getNoteName(node)}}
+ {{getNoteName(node)}}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c3b70874/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
--
diff --git
a/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
b/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
index 5d51818..c71fae0 100644
--- a/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
+++ b/zeppelin-web/src/components/expandCollapse/expandCollapse.directive.js
@@ -21,12 +21,12 @@ function expandCollapse () {
angular.element(element).click(function (event) {
if (angular.element(element).find('.expandable:visible').length > 1) {
angular.element(element).find('.expandable:visible').slideUp('slow')
-
angular.element(element).find('i.icon-folder-alt').toggleClass('icon-folder
icon-folder-alt')
+
angular.element(element).find('i.fa-folder-open').toggleClass('fa-folder
fa-folder-open')
} else {
angular.element(element).find('.expandable').first().slideToggle('200',
function () {
// do not toggle trash folder
if (angular.element(element).find('.fa-trash-o').length === 0) {
-
angular.element(element).find('i').first().toggleClass('icon-folder
icon-folder-alt')
+
angular.element(element).find('i').first().toggleClass('fa-folder
fa-folder-open')
}
})
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c3b70874/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
--
diff --git a/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
b/zeppelin-web/src/components/navbar/navbar-noteList-elem.html
index d5fb4a1..6
zeppelin git commit: [ZEPPELIN-2493] Visualization class should throw an error if an abstract method is not implemented
Repository: zeppelin
Updated Branches:
refs/heads/master f12bc26bb -> 4beeae844
[ZEPPELIN-2493] Visualization class should throw an error if an abstract method
is not implemented
### What is this PR for?
`Visualization` class should throw an error if an abstract method is not
implemented just like
[`SpellBase`](https://github.com/apache/zeppelin/blob/master/zeppelin-web/src/app/spell/spell-base.js#L25)
does.
And I added some comments. In my opinion, though `Visualization` has [a good
example](http://zeppelin.apache.org/docs/0.8.0-SNAPSHOT/development/writingzeppelinvisualization.html),
it needs an API documentation page (`Spell` as well). `Visualization` class
has methods which can be overridden (e.g. `refresh`, `destroy`, etc.), but the
example doesn't mention them. Therefore, users don't know what and how to
implement easily!
### What type of PR is it?
Improvement
### What is the Jira issue?
[ZEPPELIN-2493](https://issues.apache.org/jira/browse/ZEPPELIN-2493)
### How should this be tested?
* Inherit `Visualization`
* Don't implement any abstract method
* Run `getTransformation()` and `render()`
* Check they print appropriate errors
### Questions:
* Does the licenses files need update? NO
* Is there breaking changes for older versions? NO
* Does this needs documentation? NO
Author: Jun Kim
Closes #2317 from tae-jun/viz-abstract-error and squashes the following commits:
3fec6d3 [Jun Kim] Throw error if Visualization class is not implemented and
make doc more concrete
d994b8a [Jun Kim] Throw error if an abstract method is not implemented
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4beeae84
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4beeae84
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4beeae84
Branch: refs/heads/master
Commit: 4beeae84413c4dca01674f3f2f991a7fc08c0097
Parents: f12bc26
Author: Jun Kim
Authored: Thu May 4 14:34:21 2017 +0900
Committer: Lee moon soo
Committed: Tue May 23 10:26:26 2017 +0900
--
.../src/app/visualization/visualization.js | 25
1 file changed, 15 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4beeae84/zeppelin-web/src/app/visualization/visualization.js
--
diff --git a/zeppelin-web/src/app/visualization/visualization.js
b/zeppelin-web/src/app/visualization/visualization.js
index ec89882..82704e3 100644
--- a/zeppelin-web/src/app/visualization/visualization.js
+++ b/zeppelin-web/src/app/visualization/visualization.js
@@ -13,7 +13,7 @@
*/
/**
- * Base class for visualization
+ * Base class for visualization.
*/
export default class Visualization {
constructor (targetEl, config) {
@@ -25,17 +25,22 @@ export default class Visualization {
}
/**
- * get transformation
+ * Get transformation.
+ * @abstract
+ * @return {Transformation}
*/
getTransformation () {
// override this
+throw new TypeError('Visualization.getTransformation() should be
overrided')
}
/**
- * Method will be invoked when data or configuration changed
+ * Method will be invoked when data or configuration changed.
+ * @abstract
*/
render (tableData) {
// override this
+throw new TypeError('Visualization.render() should be overrided')
}
/**
@@ -46,7 +51,7 @@ export default class Visualization {
}
/**
- * method will be invoked when visualization need to be destroyed.
+ * Method will be invoked when visualization need to be destroyed.
* Don't need to destroy this.targetEl.
*/
destroy () {
@@ -64,7 +69,7 @@ export default class Visualization {
}
/**
- * Activate. invoked when visualization is selected
+ * Activate. Invoked when visualization is selected.
*/
activate () {
if (!this._active || this._dirty) {
@@ -75,21 +80,21 @@ export default class Visualization {
}
/**
- * Activate. invoked when visualization is de selected
+ * Deactivate. Invoked when visualization is de selected.
*/
deactivate () {
this._active = false
}
/**
- * Is active
+ * Is active.
*/
isActive () {
return this._active
}
/**
- * When window or paragraph is resized
+ * When window or paragraph is resized.
*/
resize () {
if (this.isActive()) {
@@ -100,7 +105,7 @@ export default class Visualization {
}
/**
- * Set new config
+ * Set new config.
*/
setConfig (config) {
this.config = config
@@ -119,7 +124,7 @@ export default class Visualization {
}
/**
- * render setting
+ * Render setting.
*/
renderSetting (targetEl) {
let setting = this.getSetting()
zeppelin git commit: [ZEPPELIN-2131] Restrict `shift + arrow` key in focused cell
Repository: zeppelin
Updated Branches:
refs/heads/master 4beeae844 -> a1c5e99a5
[ZEPPELIN-2131] Restrict `shift + arrow` key in focused cell
### What is this PR for?
Selection of text in cell by Shift-Arrow should be restricted to focussed cell.
### What type of PR is it?
[Improvement]
### Todos
DONE
### What is the Jira issue?
[ZEPPELIN-2131](https://issues.apache.org/jira/browse/ZEPPELIN-2131)
### How should this be tested?
1. Create multiple paragraphs.
2. Move cursors using `shift + arrow` (up, down)
3. Should keep focus on the current paragraph.
### Screenshots (if appropriate)
Before
After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2361 from 1ambda/ZEPPELIN-2131/restrict-shift-arrow-in-cell and
squashes the following commits:
4d401a5 [1ambda] fix: Restrict shift + arrow in current cell
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a1c5e99a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a1c5e99a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a1c5e99a
Branch: refs/heads/master
Commit: a1c5e99a55fcfd60ab887a165b0b91d1d5badf35
Parents: 4beeae8
Author: 1ambda <1am...@gmail.com>
Authored: Mon May 22 14:33:55 2017 +0900
Committer: Lee moon soo
Committed: Thu May 25 15:37:20 2017 +0900
--
.../src/app/notebook/paragraph/paragraph.controller.js | 12
1 file changed, 4 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a1c5e99a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 3d75676..fd21467 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -818,20 +818,16 @@ function ParagraphCtrl ($scope, $rootScope, $route,
$window, $routeParams, $loca
switch (keyCode) {
case 38:
- keyBindingEditorFocusAction(ROW_UP)
+ if (!e.shiftKey) { keyBindingEditorFocusAction(ROW_UP) }
break
case 80:
- if (e.ctrlKey && !e.altKey) {
-keyBindingEditorFocusAction(ROW_UP)
- }
+ if (e.ctrlKey && !e.altKey) {
keyBindingEditorFocusAction(ROW_UP) }
break
case 40:
- keyBindingEditorFocusAction(ROW_DOWN)
+ if (!e.shiftKey) { keyBindingEditorFocusAction(ROW_DOWN) }
break
case 78:
- if (e.ctrlKey && !e.altKey) {
-keyBindingEditorFocusAction(ROW_DOWN)
- }
+ if (e.ctrlKey && !e.altKey) {
keyBindingEditorFocusAction(ROW_DOWN) }
break
}
}
zeppelin git commit: [ZEPPELIN-2469] HeliumBundleFactoryTest fails on Travis
Repository: zeppelin
Updated Branches:
refs/heads/master a1c5e99a5 -> 9af85d8cc
[ZEPPELIN-2469] HeliumBundleFactoryTest fails on Travis
### What is this PR for?
There are 6 errors occuring with error: "yarn config set cache-folder
/tmp/ZeppelinLTest_1494573109020/helium-bundle/yarn-cache
--registry=http://registry.npmjs.org/' failed."
The failures seem to occur because the "yarnCacheDir" directory is not created.
For this, I have added code to create the directory before the absolute path is
stored in yarnCacheDirPath.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2469
### How should this be tested?
The tests should pass on the CI
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: pravin-dsilva
Closes #2362 from pravin-dsilva/ZEPPELIN-2469 and squashes the following
commits:
19fd231 [pravin-dsilva] update travis.yml
1939013 [pravin-dsilva] [ZEPPELIN-2469] HeliumBundleFactoryTest fails on Travis
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9af85d8c
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9af85d8c
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9af85d8c
Branch: refs/heads/master
Commit: 9af85d8ccff184891c42302ba63239189ae663ab
Parents: a1c5e99
Author: pravin-dsilva
Authored: Mon May 22 11:39:19 2017 +
Committer: Lee moon soo
Committed: Thu May 25 15:38:59 2017 +0900
--
.travis.yml | 3 +--
.../main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9af85d8c/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index d6887ef..5135ce7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,13 +48,12 @@ matrix:
# Test core modules
#
# Several tests were excluded from this configuration due to the following
issues:
-# HeliumBundleFactoryTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2469
# HeliumApplicationFactoryTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2470
# NotebookTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2471
# ZeppelinRestApiTest -
https://issues.apache.org/jira/browse/ZEPPELIN-2473
# After issues are fixed these tests need to be included back by removing
them from the "-Dtests.to.exclude" property
- jdk: "oraclejdk7"
- env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11"
BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify
-Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumBundleFactoryTest.java,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java
-DfailIfNoTests=false"
+ env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6"
PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11"
BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify
-Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}"
TEST_PROJECTS="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java
-DfailIfNoTests=false"
# Test selenium with spark module for 1.6.3
- jdk: "oraclejdk7"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9af85d8c/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
index bf2804e..ef032bd 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
@@ -129,6 +129,7 @@ public class HeliumBundleFactory {
YarnInstaller yarnInstaller =
frontEndPluginFactory.getYarnInstaller(getProxyConfig());
yarnInstaller.setYarnVersion(YARN_VERSION);
yarnInstaller.install();
+ yarnCacheDir.mkdirs();
String yarnCacheDirPath = yarnCacheDir.getAbsolutePath();
yarnCommand(frontEndPluginFactory, "config set cache-folder " +
yarnCacheDirPath);
zeppelin git commit: [ZEPPELIN-2574] Improve `about` dialog style
Repository: zeppelin
Updated Branches:
refs/heads/master 9af85d8cc -> 336d86cdd
[ZEPPELIN-2574] Improve `about` dialog style
### What is this PR for?
Improve `about` dialog style. See the attached screenshots.
### What type of PR is it?
[Improvement]
### Todos
DONE
### What is the Jira issue?
[ZEPPELIN-2574](https://issues.apache.org/jira/browse/ZEPPELIN-2574)
### How should this be tested?
1. Build: `mvn clean package -DskipTests; ./bin/zeppelin-daemon.sh restart`
2. Run Zeppelin and open browser: `localhost:8080`
3. Click the `About Zeppelin` button
### Screenshots (if appropriate)
Before
After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2360 from 1ambda/improve-about-dialgo and squashes the following
commits:
5dfc3bd [1ambda] feat: style about dialog
0361918 [1ambda] refactor: Move about related css into navbar.css
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/336d86cd
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/336d86cd
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/336d86cd
Branch: refs/heads/master
Commit: 336d86cddb7101b1afc87e3c6301cecfab2f3bf0
Parents: 9af85d8
Author: 1ambda <1am...@gmail.com>
Authored: Sun May 21 09:31:42 2017 +0900
Committer: Lee moon soo
Committed: Thu May 25 15:42:03 2017 +0900
--
zeppelin-web/src/app/home/home.css | 25 ---
zeppelin-web/src/components/navbar/navbar.css | 48 +
zeppelin-web/src/components/navbar/navbar.html | 19
3 files changed, 57 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/336d86cd/zeppelin-web/src/app/home/home.css
--
diff --git a/zeppelin-web/src/app/home/home.css
b/zeppelin-web/src/app/home/home.css
index ce30e66..3be17af 100644
--- a/zeppelin-web/src/app/home/home.css
+++ b/zeppelin-web/src/app/home/home.css
@@ -824,28 +824,3 @@ This part should be removed when new version of bootstrap
handles this issue.
.bootstrap-dialog.type-primary .modal-header {
background: #3071a9;
}
-
-/* About Zeppelin */
-.about {
- height: 200px;
- padding: 25px;
-}
-
-.about .logo {
- padding-top: 30px;
-}
-
-.about .logo img {
- width: 95%;
-}
-
-.about .content {
- text-align: center;
-}
-
-.about .content h3 {
- font-family: 'Patua One';
- color: #3071A9;
- font-size: 30px;
- margin: 0 auto;
-}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/336d86cd/zeppelin-web/src/components/navbar/navbar.css
--
diff --git a/zeppelin-web/src/components/navbar/navbar.css
b/zeppelin-web/src/components/navbar/navbar.css
index 5592e7d..ebd813c 100644
--- a/zeppelin-web/src/components/navbar/navbar.css
+++ b/zeppelin-web/src/components/navbar/navbar.css
@@ -41,3 +41,51 @@
}
.navbar-fixed-top.headroom--unpinned { top: -100px; }
.navbar-fixed-top.headroom--pinned { top: 0; /** `navbar` top */ }
+
+/* About Dialog */
+
+.modal-header-about {
+ background-color: #3071a9;
+ border: 2px solid #3071a9;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
+.modal-header-about > .close {
+ color: #cfcfcf;
+ opacity: 1;
+}
+
+.modal-header-about > .modal-title {
+ font-weight: 300;
+ font-size: 20px;
+ color: #e8e8e8;
+}
+
+.modal-body-about-version {
+ font-weight: 500;
+}
+
+.modal-body-about {
+ height: 250px;
+ padding: 50px;
+}
+
+.modal-body-about .logo {
+ padding-top: 30px;
+}
+
+.modal-body-about .logo img {
+ width: 95%;
+}
+
+.modal-body-about .content {
+ text-align: center;
+}
+
+.modal-body-about .content h3 {
+ font-family: 'Patua One';
+ color: #3071A9;
+ font-size: 30px;
+ margin: 0 auto;
+}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/336d86cd/zeppelin-web/src/components/navbar/navbar.html
--
diff --git a/zeppelin-web/src/components/navbar/navbar.html
b/zeppelin-web/src/components/navbar/navbar.html
index 2cae91b..a766ea9 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -112,19
zeppelin git commit: [ZEPPELIN-2575] Improve `rename note` dialog style
Repository: zeppelin
Updated Branches:
refs/heads/master 336d86cdd -> 5deb53f97
[ZEPPELIN-2575] Improve `rename note` dialog style
### What is this PR for?
Improve `rename notebook` dialog style. See the attached screenshots.
### What type of PR is it?
[Improvement]
### Todos
DONE
### What is the Jira issue?
[ZEPPELIN-2575](https://issues.apache.org/jira/browse/ZEPPELIN-2575)
### How should this be tested?
1. Build: `mvn clean package -DskipTests; ./bin/zeppelin-daemon.sh restart`
2. Run Zeppelin and open browser: `localhost:8080`
3. `rename notebook` functionality should work as like before.
### Screenshots (if appropriate)
Before
After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2359 from 1ambda/improve-rename-dialog and squashes the following
commits:
0e863d7 [1ambda] fix: Use ng-enter
0fa0caa [1ambda] fix: RAT issue
d310174 [1ambda] feat: Style rename dialog body
ff9721a [1ambda] style: Reformat html
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5deb53f9
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5deb53f9
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5deb53f9
Branch: refs/heads/master
Commit: 5deb53f97847493c4fbb8beb827ce78c99b91b2f
Parents: 336d86c
Author: 1ambda <1am...@gmail.com>
Authored: Mon May 22 18:11:42 2017 +0900
Committer: Lee moon soo
Committed: Thu May 25 15:43:51 2017 +0900
--
.../src/components/rename/rename.controller.js | 2 ++
zeppelin-web/src/components/rename/rename.css | 38
zeppelin-web/src/components/rename/rename.html | 19 +-
3 files changed, 50 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5deb53f9/zeppelin-web/src/components/rename/rename.controller.js
--
diff --git a/zeppelin-web/src/components/rename/rename.controller.js
b/zeppelin-web/src/components/rename/rename.controller.js
index 305c519..2682b6e 100644
--- a/zeppelin-web/src/components/rename/rename.controller.js
+++ b/zeppelin-web/src/components/rename/rename.controller.js
@@ -12,6 +12,8 @@
* limitations under the License.
*/
+import './rename.css'
+
angular.module('zeppelinWebApp').controller('RenameCtrl', RenameCtrl)
function RenameCtrl ($scope) {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5deb53f9/zeppelin-web/src/components/rename/rename.css
--
diff --git a/zeppelin-web/src/components/rename/rename.css
b/zeppelin-web/src/components/rename/rename.css
new file mode 100644
index 000..45d4710
--- /dev/null
+++ b/zeppelin-web/src/components/rename/rename.css
@@ -0,0 +1,38 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.modal-header-rename {
+ background-color: #3071a9;
+ border: 2px solid #3071a9;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
+.modal-header-rename .close {
+ color: #cfcfcf;
+ opacity: 1;
+}
+
+.modal-header-rename .modal-title {
+ color: white;
+ font-size: 20px;
+ font-weight: 300;
+}
+
+.modal-body-rename label {
+ font-size: 17px;
+ font-weight: 400;
+ margin-top: 5px;
+ margin-bottom: 15px;
+}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5deb53f9/zeppelin-web/src/components/rename/rename.html
--
diff --git a/zeppelin-web/src/components/rename/rename.html
b/zeppelin-web/src/components/rename/rename.html
index 723c6aa..71caa76 100644
--- a/zeppelin-web/src/components/rename/rename.html
+++ b/zeppelin-web/src/components/rename/rename.html
@@ -11,28 +11,29 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
See the License for the specific
zeppelin git commit: [ZEPPELIN-2428] Improve `create new note` dialog style
Repository: zeppelin
Updated Branches:
refs/heads/master 5deb53f97 -> 018ab3ac1
[ZEPPELIN-2428] Improve `create new note` dialog style
### What is this PR for?
Improve `create new notebook` dialog style. See the attached screenshots.
### What type of PR is it?
[Improvement]
### Todos
DONE
### What is the Jira issue?
[ZEPPELIN-2428](https://issues.apache.org/jira/browse/ZEPPELIN-2428)
### How should this be tested?
1. Build: `mvn clean package -DskipTests; ./bin/zeppelin-daemon.sh restart`
2. Run Zeppelin and open browser: `localhost:8080`
3. `create new notebook` functionality should work as like before.
### Screenshots (if appropriate)
Before
After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2358 from 1ambda/improve-create-note-dialog and squashes the following
commits:
c4981a9 [1ambda] fix: RAT issue
71ed709 [1ambda] feat: Style note name dialog modal-body
21fa982 [1ambda] feat: Style panel desc
d6f78d9 [1ambda] feat: label style for note name dialog
c97d68f [1ambda] refactor: format note-name-dialog
774c99e [1ambda] feat: style modal-footer for note name dialog
abe90c6 [1ambda] feat: Style modal-header
dddb5d9 [1ambda] style: Reformat note-name-dialog.html
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/018ab3ac
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/018ab3ac
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/018ab3ac
Branch: refs/heads/master
Commit: 018ab3ac1b5728f2de1b589dcc16de92a67ada7c
Parents: 5deb53f
Author: 1ambda <1am...@gmail.com>
Authored: Sun May 21 16:42:32 2017 +0900
Committer: Lee moon soo
Committed: Thu May 25 15:45:31 2017 +0900
--
.../noteName-create/note-name-dialog.css| 49
.../noteName-create/note-name-dialog.html | 80
.../noteName-create/notename.controller.js | 2 +
3 files changed, 98 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/018ab3ac/zeppelin-web/src/components/noteName-create/note-name-dialog.css
--
diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.css
b/zeppelin-web/src/components/noteName-create/note-name-dialog.css
new file mode 100644
index 000..22249ad
--- /dev/null
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.css
@@ -0,0 +1,49 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.modal-header-note-name {
+ background-color: #3071a9;
+ border: 2px solid #3071a9;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
+.modal-header-note-name > .modal-title {
+ font-weight: 300;
+ font-size: 20px;
+ color: white;
+}
+
+.modal-header-note-name > .close {
+ color: #cfcfcf;
+ opacity: 1;
+}
+
+.modal-body-note-name label {
+ font-size: 17px;
+ font-weight: 400;
+}
+
+.note-name-create-input {
+ margin-top: 5px;
+}
+
+.note-name-desc-panel {
+ margin-top: 20px;
+ margin-bottom: 4px;
+}
+
+.default-interpreter-select {
+ margin-top: 12px;
+}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/018ab3ac/zeppelin-web/src/components/noteName-create/note-name-dialog.html
--
diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index 44d1c01..6b20d3a 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -11,42 +11,56 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY K
zeppelin git commit: [ZEPPELIN-2429] Improve `import notebook` dialog style
Repository: zeppelin
Updated Branches:
refs/heads/master 018ab3ac1 -> 116005659
[ZEPPELIN-2429] Improve `import notebook` dialog style
### What is this PR for?
Improve `import notebook` dialog style. See the attached screenshots.
### What type of PR is it?
[Improvement]
### Todos
DONE
### What is the Jira issue?
[ZEPPELIN-2429](https://issues.apache.org/jira/browse/ZEPPELIN-2429)
### How should this be tested?
1. Build: `mvn clean package -DskipTests; ./bin/zeppelin-daemon.sh restart`
2. Run Zeppelin and open browser: `localhost:8080`
3. `import notebook` functionality should work as like before.
### Screenshots (if appropriate)
Before
After
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2357 from 1ambda/improve-import-dialog and squashes the following
commits:
8b966af [1ambda] fix: Set padding, border radius
95666b4 [1ambda] fix: RAT issue
8425113 [1ambda] fix: Use uppercase for placeholder
df702c4 [1ambda] feat: Style import dialog body
2c868c7 [1ambda] feat: Style note import dialog header
85ecc10 [1ambda] style: Reformat note import dialog html
c46516b [1ambda] feat: Use note-import-dialog.css
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/11600565
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/11600565
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/11600565
Branch: refs/heads/master
Commit: 11600565975fbc8791e41b3febece6585860a07e
Parents: 018ab3a
Author: 1ambda <1am...@gmail.com>
Authored: Mon May 22 18:29:16 2017 +0900
Committer: Lee moon soo
Committed: Thu May 25 15:46:52 2017 +0900
--
zeppelin-web/src/app/home/home.css | 34 ---
.../noteName-import/note-import-dialog.css | 91 +
.../noteName-import/note-import-dialog.html | 101 +--
.../notenameImport.controller.js| 2 +
4 files changed, 143 insertions(+), 85 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/11600565/zeppelin-web/src/app/home/home.css
--
diff --git a/zeppelin-web/src/app/home/home.css
b/zeppelin-web/src/app/home/home.css
index 3be17af..6c82253 100644
--- a/zeppelin-web/src/app/home/home.css
+++ b/zeppelin-web/src/app/home/home.css
@@ -455,40 +455,6 @@ This part should be removed when new version of bootstrap
handles this issue.
z-index: 10003 !important;
}
-#noteImportModal .modal-body {
- min-height: 420px;
- overflow: hidden;
-}
-
-#noteImportModal .modal-footer {
- min-height: 65px;
-}
-
-#noteImportModal .display-inline a {
- background: #fff;
- border: 1px solid #ddd;
- border-radius: 5px;
- color: #999;
- cursor: pointer;
- display: block;
- float: left;
- font-size: 98px;
- height: 240px;
- margin: 0 10px 16px;
- padding-top: 60px;
- text-align: center;
- text-decoration: none;
- width: 264px;
-}
-
-#noteImportModal .display-inline a:hover {
- background: #eee;
-}
-
-#noteImportModal .display-inline a p {
- font-size: 14px;
-}
-
/* --- */
/* Slide Top
/* --- */
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/11600565/zeppelin-web/src/components/noteName-import/note-import-dialog.css
--
diff --git a/zeppelin-web/src/components/noteName-import/note-import-dialog.css
b/zeppelin-web/src/components/noteName-import/note-import-dialog.css
new file mode 100644
index 000..81e276a
--- /dev/null
+++ b/zeppelin-web/src/components/noteName-import/note-import-dialog.css
@@ -0,0 +1,91 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.modal-header-import {
+ background-color: #3071a9;
+ b
zeppelin git commit: [ZEPPELIN-2122] Add execution time for Spell
Repository: zeppelin
Updated Branches:
refs/heads/master 116005659 -> 1a3ae4265
[ZEPPELIN-2122] Add execution time for Spell
### What is this PR for?
Add execution time for spell results. See the screenshot section.
### What type of PR is it?
[Improvement]
### Todos
NONE
### What is the Jira issue?
[ZEPPELIN-2122](https://issues.apache.org/jira/browse/ZEPPELIN-2122)
### How should this be tested?
1. Install any spell (e.g the eco spell)
2. Execute and check that the paragraph has valid execution time.
### 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: 1ambda <1am...@gmail.com>
Closes #2338 from 1ambda/ZEPPEILN-2122/add-execution-time-for-spell and
squashes the following commits:
2417428 [1ambda] fix: Set dateStarted in run* func
0996865 [1ambda] fix: Use string instead of moment obj
bb895a5 [1ambda] fix: Set dateStarted
9fb388e [1ambda] fix: Use ISO 8601
55f8d23 [1ambda] fix: rollback Job class
c2ab88b [1ambda] feat: Persist, display execution time for spell
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1a3ae426
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1a3ae426
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1a3ae426
Branch: refs/heads/master
Commit: 1a3ae426579a58267ad06d4cb33afb29ac822725
Parents: 1160056
Author: 1ambda <1am...@gmail.com>
Authored: Fri May 12 05:39:00 2017 +0900
Committer: Lee moon soo
Committed: Thu May 25 15:54:15 2017 +0900
--
.../java/org/apache/zeppelin/scheduler/Job.java | 8 ++
.../apache/zeppelin/socket/NotebookServer.java | 29 ++--
.../notebook/paragraph/paragraph.controller.js | 29 +---
.../websocketEvents/websocketMsg.service.js | 11 +---
4 files changed, 60 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1a3ae426/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
index 549811c..d0025d8 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
@@ -259,10 +259,18 @@ public abstract class Job {
return dateStarted;
}
+ public synchronized void setDateStarted(Date startedAt) {
+dateStarted = startedAt;
+ }
+
public synchronized Date getDateFinished() {
return dateFinished;
}
+ public synchronized void setDateFinished(Date finishedAt) {
+dateFinished = finishedAt;
+ }
+
public abstract void setResult(Object results);
public synchronized String getErrorMessage() {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1a3ae426/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
--
diff --git
a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index 87d0009..5588be0 100644
---
a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++
b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -19,15 +19,9 @@ package org.apache.zeppelin.socket;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.regex.Matcher;
@@ -1696,6 +1690,23 @@ public class NotebookServer extends WebSocketServlet
p.setErrorMessage((String) fromMessage.get("errorMessage"));
p.setStatusWithoutNotification(status);
+// Spell uses ISO 8601 formatted string generated from moment
+String dateStarted = (String) fromMessage.get("dateStarted");
+String dateFinished = (St
zeppelin git commit: ZEPPELIN-2543: Add ability to change the log level at runtime
Repository: zeppelin
Updated Branches:
refs/heads/master 1a3ae4265 -> be9c1e84d
ZEPPELIN-2543: Add ability to change the log level at runtime
### What is this PR for?
Add ability to change the log level at runtime
### What type of PR is it?
Improvement
### Todos
* [x] - Update/Add the interpreter rest API documentation(edited: added a new
Zeppelin server API doc page)
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2543
### How should this be tested?
>â ~ curl -X PUT http://localhost:8080/api/log/level/debug
{"status":"OK"}
>â ~ curl -X PUT http://localhost:8080/api/log/level/adx
{"status":"NOT_ACCEPTABLE","message":"Not a valid LOG level"}
### Screenshots (if appropriate) NA
### Questions:
* Does the licenses files need update? NA
* Is there breaking changes for older versions? No
* Does this needs documentation? Yes(Will need to the interpreter Rest api
doc, if the approach looks fine)
Author: Karup
Closes #2341 from karuppayya/ZEPPELIN-2543 and squashes the following commits:
4017a83 [Karup] Add documenation, fix response message
e4782c3 [Karup] Add abitiy to change the log level at runtime
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/be9c1e84
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/be9c1e84
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/be9c1e84
Branch: refs/heads/master
Commit: be9c1e84d73ba4ebaf0b9463193aef61cc0cd9f1
Parents: 1a3ae42
Author: Karup
Authored: Sun May 21 15:58:46 2017 +0530
Committer: Lee moon soo
Committed: Thu May 25 15:57:04 2017 +0900
--
docs/_includes/themes/zeppelin/_navigation.html | 1 +
docs/index.md | 1 +
docs/rest-api/rest-configuration.md | 1 -
docs/rest-api/rest-zeppelin-server.md | 78
.../apache/zeppelin/rest/ZeppelinRestApi.java | 27 +++
5 files changed, 107 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/be9c1e84/docs/_includes/themes/zeppelin/_navigation.html
--
diff --git a/docs/_includes/themes/zeppelin/_navigation.html
b/docs/_includes/themes/zeppelin/_navigation.html
index 4e49a1a..caa1627 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -105,6 +105,7 @@
MongoDB
Storage
REST API
+Zeppelin Server
API
Interpreter API
Notebook API
Notebook Repository
API
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/be9c1e84/docs/index.md
--
diff --git a/docs/index.md b/docs/index.md
index 043538d..7477070 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -161,6 +161,7 @@ Join to our [Mailing
list](https://zeppelin.apache.org/community.html) and repor
* [Azure Storage](./storage/storage.html#notebook-storage-in-azure)
* [ZeppelinHub Storage](./storage/storage.html#storage-in-zeppelinhub)
* REST API: available REST API list in Apache Zeppelin
+ * [Zeppelin server API](./rest-api/rest-zeppelin-server.html)
* [Interpreter API](./rest-api/rest-interpreter.html)
* [Notebook API](./rest-api/rest-notebook.html)
* [Notebook Repository API](./rest-api/rest-notebookRepo.html)
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/be9c1e84/docs/rest-api/rest-configuration.md
--
diff --git a/docs/rest-api/rest-configuration.md
b/docs/rest-api/rest-configuration.md
index 47c65f1..6bfa62e 100644
--- a/docs/rest-api/rest-configuration.md
+++ b/docs/rest-api/rest-configuration.md
@@ -29,7 +29,6 @@ All REST APIs are available starting with the following
endpoint `http://[zeppel
Note that Apache Zeppelin REST APIs receive or return JSON objects, it is
recommended for you to install some JSON viewers such as
[JSONView](https://chrome.google.com/webstore/detail/jsonview/chklaanhfefbnpoihckbnefhakgolnmc).
If you work with Apache Zeppelin and find a need for an additional REST API,
please [file an issue or send us an
email](http://zeppelin.apache.org/community.html).
-nd a need for an additional REST API, please [file an issue or send us
mail](../../community.html).
## Configuration REST API list
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/be9c1e84/docs/rest-api/rest-zeppelin-server.md
--
diff --git a/docs/rest-api/rest-zeppelin-server.md
b/docs/rest-api/rest-zeppelin-server.md
new file mode 100644
i
zeppelin git commit: [ZEPPELIN-2519] Disable watchers not in viewport
Repository: zeppelin
Updated Branches:
refs/heads/master be9c1e84d -> 21e702c65
[ZEPPELIN-2519] Disable watchers not in viewport
### What is this PR for?
Currently all the watchers are enabled by default. I came across this github
project https://github.com/wix/angular-viewport-watch to disable watchers not
in viewport. This reduces number of watchers in notebooks with large number of
paragraphs.
### What type of PR is it?
[Improvement]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2519
### How should this be tested?
Outline the steps to test the PR here.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update?
Not sure of this part. This is under MIT license. [Project
link](https://github.com/wix/angular-viewport-watch)
* Is there breaking changes for older versions?
No
* Does this needs documentation?
No
Author: vipulm
Closes #2326 from vipul1409/ZEPPELIN-2519 and squashes the following commits:
497413b [vipulm] Fixing build issues
21c03d6 [vipulm] Merging master and resolving conflicts
b982db4 [vipulm] Trigger build
175dd17 [vipulm] Merge master
99b19a5 [vipulm] Move pacakg to npm
d698d06 [vipulm] Add license file
7142578 [vipulm] Trigger notification
329e33a [vipulm] Disable watchers not in viewport
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/21e702c6
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/21e702c6
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/21e702c6
Branch: refs/heads/master
Commit: 21e702c657d0dc84a8cdf52b34084d11452a5def
Parents: be9c1e8
Author: vipulm
Authored: Sun May 21 09:56:57 2017 +0530
Committer: Lee moon soo
Committed: Thu May 25 15:58:05 2017 +0900
--
zeppelin-distribution/src/bin_license/LICENSE | 1 +
zeppelin-web/package.json | 1 +
zeppelin-web/src/app/app.js | 2 ++
zeppelin-web/src/app/notebook/notebook.html | 3 ++-
4 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/21e702c6/zeppelin-distribution/src/bin_license/LICENSE
--
diff --git a/zeppelin-distribution/src/bin_license/LICENSE
b/zeppelin-distribution/src/bin_license/LICENSE
index 7dd1fb3..32822c5 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -271,6 +271,7 @@ The text of each license is also included at
licenses/LICENSE-[project]-[version
(The MIT License) Unirest 1.4.9 (com.mashape.unirest:unirest-java:1.4.9 -
https://github.com/Mashape/unirest-java)
(The MIT License) ngclipboard v1.1.1
(https://github.com/sachinchoolur/ngclipboard) -
https://github.com/sachinchoolur/ngclipboard/blob/1.1.1/LICENSE
(The MIT License) headroom.js 0.9.3
(https://github.com/WickyNilliams/headroom.js) -
https://github.com/WickyNilliams/headroom.js/blob/master/LICENSE
+(The MIT License) angular-viewport-watch 0.135
(https://github.com/wix/angular-viewport-watch) -
https://github.com/wix/angular-viewport-watch/blob/master/LICENSE
BSD-style licenses
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/21e702c6/zeppelin-web/package.json
--
diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
index 39b230a..74e3d4d 100644
--- a/zeppelin-web/package.json
+++ b/zeppelin-web/package.json
@@ -21,6 +21,7 @@
"test": "karma start karma.conf.js"
},
"dependencies": {
+"angular-viewport-watch": "github:shahata/angular-viewport-watch",
"github-markdown-css": "2.6.0",
"angular-ui-grid": "^4.0.4",
"grunt-angular-templates": "^0.5.7",
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/21e702c6/zeppelin-web/src/app/app.js
--
diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js
index 427d340..f14766b 100644
--- a/zeppelin-web/src/app/app.js
+++ b/zeppelin-web/src/app/app.js
@@ -17,6 +17,7 @@
import 'headroom.js'
import 'headroom.js/dist/angular.headroom'
+import 'angular-viewport-watch/angular-viewport-watch.js'
import 'angular-ui-grid/ui-grid.css'
import 'angular-ui-grid'
@@ -40,6 +41,7 @@ const requiredModules = [
'focus-if',
'ngResource',
'ngclipboard',
+ 'angularViewportWatch',
'ui.grid',
'ui.grid.exporter',
'ui.grid.edit', '
zeppelin git commit: [ZEPPELIN-2573] Improve navbar style
Repository: zeppelin
Updated Branches:
refs/heads/master 21e702c65 -> c70f29b2c
[ZEPPELIN-2573] Improve navbar style
### What is this PR for?
Improved navbar style. Refer the screenshots for detail.
### What type of PR is it?
[Improvement]
### Todos
* [x] - Fix nav brand text font-size
* [x] - Fix nav menu text font-weight
* [x] - Removed icon for search input
* [x] - Fix bug in notebook menu (focus state remains after it's closed)
### What is the Jira issue?
[ZEPPELIN-2573](https://issues.apache.org/jira/browse/ZEPPELIN-2573)
### How should this be tested?
1. Build Zeppelin: ` mvn clean package -DskipTests; ./bin/zeppelin-daemon.sh
restart`
2. Open the main page
### Screenshots (if appropriate)
Before: Navbar Style
After: Navbar Style
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1am...@gmail.com>
Closes #2355 from 1ambda/ZEPPELIN-2573/improve-navbar and squashes the
following commits:
a470b94 [1ambda] fix: Set proper css for navbar in small browser
75f9980 [1ambda] fix: Add username comment in navbar.css
a880268 [1ambda] fix: DON'T use :focus for notebook menu
4ae922a [1ambda] fix: Move username related css into navbar
05f63f3 [1ambda] fix: Update search input in navbar
1e574f0 [1ambda] feat: Set font style in navbar
f563d9e [1ambda] fix: Move navbar related style to navbar.css
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c70f29b2
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c70f29b2
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c70f29b2
Branch: refs/heads/master
Commit: c70f29b2c065bcc8b818840e80e40d3c979c6877
Parents: 21e702c
Author: 1ambda <1am...@gmail.com>
Authored: Thu May 25 18:24:38 2017 +0900
Committer: Lee moon soo
Committed: Sun May 28 09:30:36 2017 +0900
--
zeppelin-web/src/app/home/home.css | 107 +-
zeppelin-web/src/components/navbar/navbar.css | 154 +++-
zeppelin-web/src/components/navbar/navbar.html | 63
3 files changed, 184 insertions(+), 140 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c70f29b2/zeppelin-web/src/app/home/home.css
--
diff --git a/zeppelin-web/src/app/home/home.css
b/zeppelin-web/src/app/home/home.css
index 6c82253..03ae4c1 100644
--- a/zeppelin-web/src/app/home/home.css
+++ b/zeppelin-web/src/app/home/home.css
@@ -32,14 +32,14 @@ body {
background: white;
}
-.displayNavBar {
- display: inline !important;
-}
-
body.asIframe {
padding-top: 0;
}
+.displayNavBar {
+ display: inline !important;
+}
+
body .navbar {
margin-bottom: 0;
}
@@ -59,58 +59,6 @@ body .navbar {
text-decoration: none;
}
-.navbar-inverse {
- background: #3071a9;
- color: #fff;
- border-color: #3071a9;
- font-size: 18px;
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
- color: #fff;
- background: #3071a9;
-}
-
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
- background: #3071a9;
-}
-
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
- color: #fff;
- background: rgba(0, 0, 0, 0.2);
-
-}
-
-.navbar-inverse .navbar-toggle {
- border-color: #FF;
-}
-
-.navbar-inverse .navbar-nav > .active > a,
-.navbar-inverse .navbar-nav > .active > a:hover,
-.navbar-inverse .navbar-nav > .active > a:focus {
- color: #fff;
- background: #080808;
-}
-
-.navbar-inverse .navbar-nav > li > a {
- color: #FF;
-}
-
-.navbar-inverse .navbar-brand {
- color: #fff;
- text-decoration: none;
- font-family: 'Patua One', cursive;
- font-size: 32px;
-}
-
-a.navbar-brand:hover {
- color: #fff !important;
-}
-
/* Css for the Notebook Dropdown */
.expandable ul {
@@ -248,45 +196,6 @@ a.navbar-brand:hover {
border-radius:6px 0 6px 6px;
}
-@media (max-width: 767px) {
- .navbar-inverse .navbar-nav .open .dropdown-menu > li > a,
- #notebook-list li a {
-color: #D3D3D3;
- }
-
- .navbar-nav .open .dropdown-menu > .scrollbar-container > li > a,
- #notebook-list li a {
-padding: 5px 15px 5px 25px;
-line-height: 20px;
- }
-
- .navbar-inverse .navbar-nav .open .dropdown-menu > .scrollbar-container > li
> a {
-color: #D3D3D3;
- }
zeppelin git commit: [ZEPPELIN-2544] clean task doesn't work in zeppelin-web
Repository: zeppelin Updated Branches: refs/heads/master c70f29b2c -> cc0839efd [ZEPPELIN-2544] clean task doesn't work in zeppelin-web ### What is this PR for? `prebuild` task in package.json doesn't work for `build:*` tasks in zeppelin-web otherwise we will get overwritten result, if previous build for zeppelin-web failed like ``` [INFO] Running "cacheBust:taskName" (cacheBust) task [INFO] Warning: Unable to write "/Users/jl/local/src/g/zeppelin/zeppelin-web/dist/styles/vendor.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.e7906afb60fa5267.css" file (Error code: ENAMETOOLONG). Use --force to continue. ``` ### What type of PR is it? [Bug Fix] ### Todos DONE ### What is the Jira issue? [ZEPPELIN-2544](https://issues.apache.org/jira/browse/ZEPPELIN-2544) ### How should this be tested? - `cd zeppelin-web` - `npm run build:dist` Then, check the console output whether `prebuild` is applied or not. ### Screenshots (if appropriate) ``` ## Before $ zeppelin-web git:(ZEPPELIN-2544/prebuild-does-not-work) npm run build:dist > zeppelin-web0.0.0 build:dist > /Users/1ambda/github/apache/apache-zeppelin/zeppelin-master/zeppelin-web > grunt pre-webpack-dist && webpack && grunt post-webpack-dist ## After zeppelin-web git:(ZEPPELIN-2544/prebuild-does-not-work) â npm run build:dist > zeppelin-web0.0.0 build:dist > /Users/1ambda/github/apache/apache-zeppelin/zeppelin-master/zeppelin-web > npm-run-all prebuild && grunt pre-webpack-dist && webpack && grunt > post-webpack-dist ``` ### Questions: * Does the licenses files need update? - NO * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <1am...@gmail.com> Closes #2351 from 1ambda/ZEPPELIN-2544/prebuild-does-not-work and squashes the following commits: 47d4f87 [1ambda] fix: Use prebuild in pcakage.json Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/cc0839ef Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/cc0839ef Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/cc0839ef Branch: refs/heads/master Commit: cc0839efdec69173831ea72358a4829c5b8ba658 Parents: c70f29b Author: 1ambda <1am...@gmail.com> Authored: Fri May 19 01:15:27 2017 +0900 Committer: Lee moon soo Committed: Sun May 28 09:31:59 2017 +0900 -- zeppelin-web/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cc0839ef/zeppelin-web/package.json -- diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index 74e3d4d..b6685b0 100644 --- a/zeppelin-web/package.json +++ b/zeppelin-web/package.json @@ -9,8 +9,8 @@ "clean": "rimraf dist && rimraf .tmp", "postinstall": "bower install --silent", "prebuild": "npm-run-all clean lint:once", -"build:dist": "grunt pre-webpack-dist && webpack && grunt post-webpack-dist", -"build:ci": "grunt pre-webpack-ci && webpack && grunt post-webpack-dist", +"build:dist": "npm-run-all prebuild && grunt pre-webpack-dist && webpack && grunt post-webpack-dist", +"build:ci": "npm-run-all prebuild && grunt pre-webpack-ci && webpack && grunt post-webpack-dist", "lint:watch": "esw --watch src", "lint:once": "eslint src", "predev": "grunt pre-webpack-dev",
zeppelin git commit: [ZEPPELIN-2460] Highlight active line in editor
Repository: zeppelin
Updated Branches:
refs/heads/master cc0839efd -> ecb688f45
[ZEPPELIN-2460] Highlight active line in editor
### What is this PR for?
Highlight active line.
### What type of PR is it?
[Improvement]
### Todos
* [x] - Added ui-ace option
* [x] - Fix css for paragraph control not to be overrided by active line
### What is the Jira issue?
[ZEPPELIN-2460](https://issues.apache.org/jira/browse/ZEPPELIN-2460)
### How should this be tested?
1. Build: `mvn clean package -DskipTests; ./bin/zeppelin-daemon.sh restart`
2. Open a note and write some text.
### 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: 1ambda <1am...@gmail.com>
Closes #2356 from 1ambda/ZEPPELIN-2460/highlight-active-line and squashes the
following commits:
2809093 [1ambda] fix: xpath for select, checkbox DOM
087942b [1ambda] fix: Use ng-if for title
e60f9a2 [1ambda] feat: Display title, control in the same line
bfa2fed [1ambda] fix: Set active line when note is created
ade9179 [1ambda] fix: Use blue-light color for active line
0366948 [1ambda] fix: Show single active line in a note
dfcb8aa [1ambda] fix: Control setting CSS not to overwrite active line
6424db5 [1ambda] feat: Highlight active line in editor
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ecb688f4
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ecb688f4
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ecb688f4
Branch: refs/heads/master
Commit: ecb688f45397be8c2e879663908b95c8a35964ec
Parents: cc0839e
Author: 1ambda <1am...@gmail.com>
Authored: Mon May 22 08:14:25 2017 +0900
Committer: Lee moon soo
Committed: Sun May 28 09:34:12 2017 +0900
--
.../integration/ParagraphActionsIT.java | 16
.../src/app/notebook/notebook.controller.js | 6 ++-
.../notebook/paragraph/paragraph-control.html | 7 ++--
.../notebook/paragraph/paragraph.controller.js | 9 +++--
.../src/app/notebook/paragraph/paragraph.css| 35 +
.../src/app/notebook/paragraph/paragraph.html | 41 +++-
.../components/editor/ace.editor.directive.html | 5 +--
7 files changed, 64 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ecb688f4/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
--
diff --git
a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
index add23ac..414460b 100644
---
a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
+++
b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
@@ -253,7 +253,6 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
} catch (Exception e) {
handleException("Exception in ParagraphActionsIT while
testDisableParagraphRunButton ", e);
}
-
}
@Test
@@ -263,7 +262,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
}
try {
String xpathToRunOnSelectionChangeCheckbox = getParagraphXPath(1) +
"//ul/li/form/input[contains(@ng-checked, 'true')]";
- String xpathToDropdownMenu = getParagraphXPath(1) + "//select";
+ String xpathToDropdownMenu = "(" + (getParagraphXPath(1) +
"//select)[2]");
String xpathToResultText = getParagraphXPath(1) +
"//div[contains(@id,\"_html\")]";
createNewNote();
@@ -593,7 +592,8 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
driver.findElement(By.xpath(getParagraphXPath(1) +
"//div[contains(@class, 'text plainTextContent')]")).getText(),
CoreMatchers.equalTo("Howdy "));
- Select dropDownMenu = new Select(driver.findElement(By.xpath("(" +
(getParagraphXPath(1) + "//select)[1]";
+ Select dropDownMenu = new Select(driver.findElement(By.xpath("(" +
(getParagraphXPath(1) + "//select)[2]";
+
dropDownMenu.selectByVisibleText("Alice");
collector.checkThat("After selection in drop down menu, output should
display the newly selected option",
driver.findElement(By.xpath(getParagraphXPath(1) +
"//div[contains(@class, 'text plainTextContent')]")).getText()
zeppelin git commit: [ZEPPELIN-2152] Added proxy config support in Helium bundle factory
Repository: zeppelin
Updated Branches:
refs/heads/master ecb688f45 -> 87480056a
[ZEPPELIN-2152] Added proxy config support in Helium bundle factory
### What is this PR for?
Proxy configuration implementation in Helium bundle factory. Used by Node, NPM
and YarnPkg installers.
### What type of PR is it?
[Improvement]
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2152
### How should this be tested?
Trigger Helium plugins behind proxy
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Nelson Costa
Closes #2363 from necosta/zeppelin2152 and squashes the following commits:
f681e73 [Nelson Costa] [ZEPPELIN-2152] Added documentation
5e29cca [Nelson Costa] [ZEPPELIN-2152] Fixed format issues
f55e6e2 [Nelson Costa] [ZEPPELIN-2152] Fixed bug in secure/insecure proxy.
Added proxy for HeliumOnlineRegistry
d9a086a [Nelson Costa] [ZEPPELIN-2152] Added proxy config support in Helium
bundle factory
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/87480056
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/87480056
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/87480056
Branch: refs/heads/master
Commit: 87480056a0b10effaf5556d000f8d0c5186848d0
Parents: ecb688f
Author: Nelson Costa
Authored: Wed May 24 17:03:53 2017 +0100
Committer: Lee moon soo
Committed: Sun May 28 09:35:53 2017 +0900
--
docs/_includes/themes/zeppelin/_navigation.html | 1 +
docs/index.md | 1 +
docs/security/helium_authorization.md | 28
.../zeppelin/helium/HeliumBundleFactory.java| 71 +---
.../zeppelin/helium/HeliumOnlineRegistry.java | 32 -
.../helium/HeliumBundleFactoryTest.java | 2 +-
6 files changed, 124 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/87480056/docs/_includes/themes/zeppelin/_navigation.html
--
diff --git a/docs/_includes/themes/zeppelin/_navigation.html
b/docs/_includes/themes/zeppelin/_navigation.html
index caa1627..296be25 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -117,6 +117,7 @@
Shiro
Authentication
Notebook
Authorization
Data Source
Authorization
+Helium
Authorization
Helium Framework
(Experimental)
Writing
Zeppelin Application
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/87480056/docs/index.md
--
diff --git a/docs/index.md b/docs/index.md
index 7477070..bbb 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -173,6 +173,7 @@ Join to our [Mailing
list](https://zeppelin.apache.org/community.html) and repor
* [Shiro Authentication](./security/shiroauthentication.html)
* [Notebook Authorization](./security/notebook_authorization.html)
* [Data Source Authorization](./security/datasource_authorization.html)
+ * [Helium Authorization](./security/helium_authorization.html)
* Helium Framework (Experimental)
* [Writing Zeppelin
Application](./development/writingzeppelinapplication.html)
* [Writing Zeppelin Spell](./development/writingzeppelinspell.html)
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/87480056/docs/security/helium_authorization.md
--
diff --git a/docs/security/helium_authorization.md
b/docs/security/helium_authorization.md
new file mode 100644
index 000..fdfb435
--- /dev/null
+++ b/docs/security/helium_authorization.md
@@ -0,0 +1,28 @@
+---
+layout: page
+title: "Helium Authorization in Apache Zeppelin"
+description: "Apache Zeppelin supports Helium plugins which fetch required
installer packages from remote registry/repositories"
+group: security
+---
+
+{% include JB/setup %}
+
+# Helium Authorization in Apache Zeppelin
+
+
+
+## How to configure proxies?
+
+Set **http_proxy** and **https_proxy** env variables to allow connection to
npm registry behind a corporate firewall.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/87480056/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
index ef032bd..c585567 100644
---
a/zeppeli
zeppelin git commit: [ZEPPELIN-2152] Added proxy config support in Helium bundle factory
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 57f14bc97 -> 2b82aec52
[ZEPPELIN-2152] Added proxy config support in Helium bundle factory
Proxy configuration implementation in Helium bundle factory. Used by Node, NPM
and YarnPkg installers.
[Improvement]
* https://issues.apache.org/jira/browse/ZEPPELIN-2152
Trigger Helium plugins behind proxy
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Nelson Costa
Closes #2363 from necosta/zeppelin2152 and squashes the following commits:
f681e73 [Nelson Costa] [ZEPPELIN-2152] Added documentation
5e29cca [Nelson Costa] [ZEPPELIN-2152] Fixed format issues
f55e6e2 [Nelson Costa] [ZEPPELIN-2152] Fixed bug in secure/insecure proxy.
Added proxy for HeliumOnlineRegistry
d9a086a [Nelson Costa] [ZEPPELIN-2152] Added proxy config support in Helium
bundle factory
(cherry picked from commit 87480056a0b10effaf5556d000f8d0c5186848d0)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2b82aec5
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2b82aec5
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2b82aec5
Branch: refs/heads/branch-0.7
Commit: 2b82aec5250aa3a05626e1e6d3d87c257f46e19d
Parents: 57f14bc
Author: Nelson Costa
Authored: Wed May 24 17:03:53 2017 +0100
Committer: Lee moon soo
Committed: Sun May 28 10:58:00 2017 +0900
--
docs/_includes/themes/zeppelin/_navigation.html | 1 +
docs/index.md | 1 +
docs/security/helium_authorization.md | 28 +
.../helium/HeliumVisualizationFactory.java | 60 ++--
4 files changed, 84 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2b82aec5/docs/_includes/themes/zeppelin/_navigation.html
--
diff --git a/docs/_includes/themes/zeppelin/_navigation.html
b/docs/_includes/themes/zeppelin/_navigation.html
index 401c691..a53036b 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -114,6 +114,7 @@
Shiro
Authentication
Notebook
Authorization
Data Source
Authorization
+Helium
Authorization
Advanced
Zeppelin on Vagrant
VM
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2b82aec5/docs/index.md
--
diff --git a/docs/index.md b/docs/index.md
index 543242a..b7cf8db 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -172,6 +172,7 @@ Join to our [Mailing
list](https://zeppelin.apache.org/community.html) and repor
* [Shiro Authentication](./security/shiroauthentication.html)
* [Notebook Authorization](./security/notebook_authorization.html)
* [Data Source Authorization](./security/datasource_authorization.html)
+ * [Helium Authorization](./security/helium_authorization.html)
* Advanced
* [Apache Zeppelin on Vagrant VM](./install/virtual_machine.html)
* [Zeppelin on Spark Cluster Mode (Standalone via
Docker)](./install/spark_cluster_mode.html#spark-standalone-mode)
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2b82aec5/docs/security/helium_authorization.md
--
diff --git a/docs/security/helium_authorization.md
b/docs/security/helium_authorization.md
new file mode 100644
index 000..fdfb435
--- /dev/null
+++ b/docs/security/helium_authorization.md
@@ -0,0 +1,28 @@
+---
+layout: page
+title: "Helium Authorization in Apache Zeppelin"
+description: "Apache Zeppelin supports Helium plugins which fetch required
installer packages from remote registry/repositories"
+group: security
+---
+
+{% include JB/setup %}
+
+# Helium Authorization in Apache Zeppelin
+
+
+
+## How to configure proxies?
+
+Set **http_proxy** and **https_proxy** env variables to allow connection to
npm registry behind a corporate firewall.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2b82aec5/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
index 9f63bd9..d185c79 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
+++
b/zeppelin-zengine/src/main/java/org
zeppelin git commit: [ZEPPELIN-2152] Fix for npe in Helium loading when no proxies are set
Repository: zeppelin
Updated Branches:
refs/heads/master 87480056a -> 88c5c3ccd
[ZEPPELIN-2152] Fix for npe in Helium loading when no proxies are set
### What is this PR for?
Emergency fix for npe when calling Helium and with no proxies env variables set.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2152
### How should this be tested?
* clone new zeppelin repository
* unset http_proxy/https_proxy env variables (if set)
* build ` mvn clean package -DskipTests;`
* start zeppelin instance
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Nelson Costa
Closes #2380 from necosta/zeppelin2152-patch and squashes the following commits:
cb25cd7 [Nelson Costa] [ZEPPELIN-2152] Fix for npe in Helium loading when no
proxies are set
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/88c5c3cc
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/88c5c3cc
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/88c5c3cc
Branch: refs/heads/master
Commit: 88c5c3ccd9e346d48637d3c63c8dff5ba53c8d8e
Parents: 8748005
Author: Nelson Costa
Authored: Wed May 31 12:20:27 2017 +0100
Committer: Lee moon soo
Committed: Wed May 31 11:18:05 2017 -0700
--
.../java/org/apache/zeppelin/helium/HeliumBundleFactory.java | 5 +++--
.../org/apache/zeppelin/helium/HeliumOnlineRegistry.java | 8
2 files changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/88c5c3cc/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
index c585567..52e4f6d 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
@@ -164,9 +164,10 @@ public class HeliumBundleFactory {
System.getenv("HTTPS_PROXY") : System.getenv("https_proxy");
try {
- if (isSecure)
+ if (isSecure && StringUtils.isNotBlank(httpsProxy))
proxies.add(generateProxy("secure", new URI(httpsProxy)));
- else proxies.add(generateProxy("insecure", new URI(httpProxy)));
+ else if (!isSecure && StringUtils.isNotBlank(httpProxy))
+proxies.add(generateProxy("insecure", new URI(httpProxy)));
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/88c5c3cc/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
index 165d70a..1ea1982 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
@@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory;
import java.io.*;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -119,17 +118,18 @@ public class HeliumOnlineRegistry extends HeliumRegistry {
try {
String scheme = new URI(uri).getScheme();
- if (scheme.toLowerCase().startsWith("https")) {
+ if (scheme.toLowerCase().startsWith("https") &&
StringUtils.isNotBlank(httpsProxy)) {
URI httpsProxyUri = new URI(httpsProxy);
return new HttpHost(httpsProxyUri.getHost(),
httpsProxyUri.getPort(), httpsProxyUri.getScheme());
}
- else {
+ else if (scheme.toLowerCase().startsWith("http") &&
StringUtils.isNotBlank(httpProxy)){
URI httpProxyUri = new URI(httpProxy);
return new HttpHost(httpProxyUri.getHost(),
httpProxyUri.getPort(), httpProxyUri.getScheme());
}
-} catch (URISyntaxException ex) {
+ else return null;
+} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
return null;
}
zeppelin git commit: [ZEPPELIN-2152] Fix for npe in Helium loading when no proxies are set
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 2b82aec52 -> a386253b7
[ZEPPELIN-2152] Fix for npe in Helium loading when no proxies are set
Emergency fix for npe when calling Helium and with no proxies env variables set.
Bug Fix
https://issues.apache.org/jira/browse/ZEPPELIN-2152
* clone new zeppelin repository
* unset http_proxy/https_proxy env variables (if set)
* build ` mvn clean package -DskipTests;`
* start zeppelin instance
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Nelson Costa
Closes #2380 from necosta/zeppelin2152-patch and squashes the following commits:
cb25cd7 [Nelson Costa] [ZEPPELIN-2152] Fix for npe in Helium loading when no
proxies are set
(cherry picked from commit 88c5c3ccd9e346d48637d3c63c8dff5ba53c8d8e)
Signed-off-by: Lee moon soo
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a386253b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a386253b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a386253b
Branch: refs/heads/branch-0.7
Commit: a386253b7fec7547fd4ee68c2c48be201ffe025d
Parents: 2b82aec
Author: Nelson Costa
Authored: Wed May 31 12:20:27 2017 +0100
Committer: Lee moon soo
Committed: Wed May 31 11:21:15 2017 -0700
--
.../org/apache/zeppelin/helium/HeliumVisualizationFactory.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a386253b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
--
diff --git
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
index d185c79..acbc515 100644
---
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
+++
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumVisualizationFactory.java
@@ -122,9 +122,10 @@ public class HeliumVisualizationFactory {
System.getenv("HTTPS_PROXY") : System.getenv("https_proxy");
try {
- if (isSecure)
+ if (isSecure && StringUtils.isNotBlank(httpsProxy))
proxies.add(generateProxy("secure", new URI(httpsProxy)));
- else proxies.add(generateProxy("insecure", new URI(httpProxy)));
+ else if (!isSecure && StringUtils.isNotBlank(httpsProxy))
+proxies.add(generateProxy("insecure", new URI(httpProxy)));
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
