zeppelin git commit: [ZEPPELIN-3723] Pre-Loader for Zeppelin UI
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 1b868e8e9 -> cb3b0f4b3
[ZEPPELIN-3723] Pre-Loader for Zeppelin UI
Given the size of vendor.js (2.6MB) alone, and the project has various other
CSS and JS as well.
I think it makes sense to have a pre-loader screen if in case Zeppelin was
running behind a slow network/proxy.
[Improvement]
* [ZEPPELIN-3723](https://issues.apache.org/jira/browse/ZEPPELIN-3723)
* Check Screenshots
* Does the licenses files need update? N/A
* Is there breaking changes for older versions? N/A
* Does this needs documentation? N/A
Author: Prabhjyot Singh
Closes #3144 from prabhjyotsingh/ZEPPELIN-3723 and squashes the following
commits:
43a8d986e [Prabhjyot Singh] Align color with Zeppelin color theme
cbc44b074 [Prabhjyot Singh] ZEPPELIN-3723: Pre-Loader for Zeppelin UI
Change-Id: Id18224b14317ad6625fccc24d70389e9f1417404
(cherry picked from commit cdbdfd573ea7b1951cb2ace53aeeb6d632b131b5)
Signed-off-by: Prabhjyot Singh
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/cb3b0f4b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/cb3b0f4b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/cb3b0f4b
Branch: refs/heads/branch-0.8
Commit: cb3b0f4b382ee76d3d7a2ed5c273be8f0327e222
Parents: 1b868e8
Author: Prabhjyot Singh
Authored: Fri Aug 17 13:27:23 2018 +0530
Committer: Prabhjyot Singh
Committed: Sat Aug 18 09:40:58 2018 +0530
--
zeppelin-web/src/app/app.js | 1 +
.../src/components/loader/loader.service.js | 27
zeppelin-web/src/index.html | 44
zeppelin-web/src/index.js | 1 +
4 files changed, 73 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cb3b0f4b/zeppelin-web/src/app/app.js
--
diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js
index 64ceff0..826829a 100644
--- a/zeppelin-web/src/app/app.js
+++ b/zeppelin-web/src/app/app.js
@@ -173,6 +173,7 @@ let zeppelinWebApp = angular.module('zeppelinWebApp',
requiredModules)
function auth() {
let $http = angular.injector(['ng']).get('$http');
let baseUrlSrv = angular.injector(['zeppelinWebApp']).get('baseUrlSrv');
+ angular.injector(['zeppelinWebApp']).get('loaderSrv').hideLoader();
// withCredentials when running locally via grunt
$http.defaults.withCredentials = true;
jQuery.ajaxSetup({
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cb3b0f4b/zeppelin-web/src/components/loader/loader.service.js
--
diff --git a/zeppelin-web/src/components/loader/loader.service.js
b/zeppelin-web/src/components/loader/loader.service.js
new file mode 100644
index 000..589bb76
--- /dev/null
+++ b/zeppelin-web/src/components/loader/loader.service.js
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+angular.module('zeppelinWebApp').service('loaderSrv', LoaderService);
+
+function LoaderService() {
+ 'ngInject';
+
+ this.showLoader = function() {
+angular.element('#pre-loader').fadeIn();
+ };
+
+ this.hideLoader = function() {
+angular.element('#pre-loader').fadeOut();
+ };
+}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cb3b0f4b/zeppelin-web/src/index.html
--
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 6e9cabb..ca1c56f 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -68,8 +68,52 @@ limitations under the License.
+
+
+ /* This is kept here puropsly to show preloader */
+ #pre-loader {
+height: 100%;
+min-height: 100%;
+background-color: #ECF0F1;
+width: 100%;
+position: fixed;
+top: 0px;
+margin-left: -8px;
+z-index: 99
+ }
+
+ .pre-loader-content {
+position: absolute;
+top: 45%;
+left: 50%
+ }
+
+ .loader {
+border: 4px solid #66;
+border-top:
zeppelin git commit: [ZEPPELIN-3723] Pre-Loader for Zeppelin UI
Repository: zeppelin
Updated Branches:
refs/heads/master 48193d92a -> cdbdfd573
[ZEPPELIN-3723] Pre-Loader for Zeppelin UI
Given the size of vendor.js (2.6MB) alone, and the project has various other
CSS and JS as well.
I think it makes sense to have a pre-loader screen if in case Zeppelin was
running behind a slow network/proxy.
[Improvement]
* [ZEPPELIN-3723](https://issues.apache.org/jira/browse/ZEPPELIN-3723)
* Check Screenshots
* Does the licenses files need update? N/A
* Is there breaking changes for older versions? N/A
* Does this needs documentation? N/A
Author: Prabhjyot Singh
Closes #3144 from prabhjyotsingh/ZEPPELIN-3723 and squashes the following
commits:
43a8d986e [Prabhjyot Singh] Align color with Zeppelin color theme
cbc44b074 [Prabhjyot Singh] ZEPPELIN-3723: Pre-Loader for Zeppelin UI
Change-Id: Id18224b14317ad6625fccc24d70389e9f1417404
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/cdbdfd57
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/cdbdfd57
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/cdbdfd57
Branch: refs/heads/master
Commit: cdbdfd573ea7b1951cb2ace53aeeb6d632b131b5
Parents: 48193d9
Author: Prabhjyot Singh
Authored: Fri Aug 17 13:27:23 2018 +0530
Committer: Prabhjyot Singh
Committed: Sat Aug 18 09:40:27 2018 +0530
--
zeppelin-web/src/app/app.js | 1 +
.../src/components/loader/loader.service.js | 27
zeppelin-web/src/index.html | 44
zeppelin-web/src/index.js | 1 +
4 files changed, 73 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cdbdfd57/zeppelin-web/src/app/app.js
--
diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js
index 64ceff0..826829a 100644
--- a/zeppelin-web/src/app/app.js
+++ b/zeppelin-web/src/app/app.js
@@ -173,6 +173,7 @@ let zeppelinWebApp = angular.module('zeppelinWebApp',
requiredModules)
function auth() {
let $http = angular.injector(['ng']).get('$http');
let baseUrlSrv = angular.injector(['zeppelinWebApp']).get('baseUrlSrv');
+ angular.injector(['zeppelinWebApp']).get('loaderSrv').hideLoader();
// withCredentials when running locally via grunt
$http.defaults.withCredentials = true;
jQuery.ajaxSetup({
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cdbdfd57/zeppelin-web/src/components/loader/loader.service.js
--
diff --git a/zeppelin-web/src/components/loader/loader.service.js
b/zeppelin-web/src/components/loader/loader.service.js
new file mode 100644
index 000..589bb76
--- /dev/null
+++ b/zeppelin-web/src/components/loader/loader.service.js
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+angular.module('zeppelinWebApp').service('loaderSrv', LoaderService);
+
+function LoaderService() {
+ 'ngInject';
+
+ this.showLoader = function() {
+angular.element('#pre-loader').fadeIn();
+ };
+
+ this.hideLoader = function() {
+angular.element('#pre-loader').fadeOut();
+ };
+}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/cdbdfd57/zeppelin-web/src/index.html
--
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index ee707c1..fb831c8 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -69,8 +69,52 @@ limitations under the License.
+
+
+ /* This is kept here puropsly to show preloader */
+ #pre-loader {
+height: 100%;
+min-height: 100%;
+background-color: #ECF0F1;
+width: 100%;
+position: fixed;
+top: 0px;
+margin-left: -8px;
+z-index: 99
+ }
+
+ .pre-loader-content {
+position: absolute;
+top: 45%;
+left: 50%
+ }
+
+ .loader {
+border: 4px solid #66;
+border-top: 4px solid #3071A9;
+border-radius: 50%;
+width: 30px;
+height: 30px;
+
zeppelin git commit: ZEPPELIN-3699. Remove the logic of converting single result to multiple results
Repository: zeppelin
Updated Branches:
refs/heads/master f290c8016 -> 48193d92a
ZEPPELIN-3699. Remove the logic of converting single result to multiple results
### What is this PR for?
It is a refactoring PR. Zeppelin introduce multiple interpreter result in 0.7,
and also introduce logic of converting single result to multiple results. I
think it it good time to remove that for 0.9, as I believe no one is using
zeppelin before 0.7 for now.
### What type of PR is it?
[Refactoring]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3699
### How should this be tested?
* CI pass
### 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: Jeff Zhang
Closes #3136 from zjffdu/ZEPPELIN-3699 and squashes the following commits:
e6298c786 [Jeff Zhang] ZEPPELIN-3699. Remove the logic of converting single
result to multiple results
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/48193d92
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/48193d92
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/48193d92
Branch: refs/heads/master
Commit: 48193d92a89da866de4b4bbf363da83f9e45add1
Parents: f290c80
Author: Jeff Zhang
Authored: Fri Aug 10 12:39:46 2018 +0800
Committer: Jeff Zhang
Committed: Sat Aug 18 10:54:59 2018 +0800
--
.../java/org/apache/zeppelin/scheduler/Job.java | 1 -
.../git/src/test/resources/2A94M5J1Z/note.json | 70 +--
.../git/src/test/resources/2A94M5J2Z/note.json | 20 --
.../notebook/repo/GitHubNotebookRepoTest.java | 1 +
.../src/test/resources/2A94M5J1Z/note.json | 70 +--
.../src/test/resources/2A94M5J2Z/note.json | 20 --
.../apache/zeppelin/socket/NotebookServer.java | 2 +-
.../org/apache/zeppelin/notebook/Notebook.java | 73
.../org/apache/zeppelin/notebook/Paragraph.java | 39 ---
.../org/apache/zeppelin/notebook/NoteTest.java | 2 +-
.../apache/zeppelin/notebook/NotebookTest.java | 25 +--
.../apache/zeppelin/notebook/ParagraphTest.java | 6 +-
12 files changed, 148 insertions(+), 181 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/48193d92/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 3020c60..d16a8ba 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
@@ -38,7 +38,6 @@ import java.util.Map;
* Changing/adding/deleting non transitive field name need consideration of
that.
*/
public abstract class Job {
-
private static Logger LOGGER = LoggerFactory.getLogger(Job.class);
private static SimpleDateFormat JOB_DATE_FORMAT = new
SimpleDateFormat("MMdd-HHmmss");
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/48193d92/zeppelin-plugins/notebookrepo/git/src/test/resources/2A94M5J1Z/note.json
--
diff --git
a/zeppelin-plugins/notebookrepo/git/src/test/resources/2A94M5J1Z/note.json
b/zeppelin-plugins/notebookrepo/git/src/test/resources/2A94M5J1Z/note.json
index 785ccea..ff3d52d 100644
--- a/zeppelin-plugins/notebookrepo/git/src/test/resources/2A94M5J1Z/note.json
+++ b/zeppelin-plugins/notebookrepo/git/src/test/resources/2A94M5J1Z/note.json
@@ -21,10 +21,14 @@
},
"jobName": "paragraph_1423836981412_-1007008116",
"id": "20150213-231621_168813393",
- "result": {
+ "results": {
"code": "SUCCESS",
-"type": "HTML",
-"msg": "\u003ch2\u003eWelcome to
Zeppelin.\u003c/h2\u003e\n\u003ch5\u003eThis is a live tutorial, you can run
the code yourself. (Shift-Enter to Run)\u003c/h5\u003e\n"
+"msg": [
+ {
+"type": "HTML",
+"data": "\u003ch2\u003eWelcome to
Zeppelin.\u003c/h2\u003e\n\u003ch5\u003eThis is a live tutorial, you can run
the code yourself. (Shift-Enter to Run)\u003c/h5\u003e\n"
+ }
+]
},
"dateCreated": "Feb 13, 2015 11:16:21 PM",
"dateStarted": "Apr 1, 2015 9:11:09 PM",
@@ -54,10 +58,14 @@
},
"jobName": "paragraph_1423500779206_-1502780787",
"id": "20150210-015259_1403135953",
- "result": {
+ "results": {
"code": "SUCCESS",
-"type": "TEXT",
-"msg": "import org.apache.commons.io.IOUtils\nimport
zeppelin git commit: ZEPPELIN-3703. Introduce ConfigurationService
Repository: zeppelin
Updated Branches:
refs/heads/master 1267e33a0 -> f290c8016
ZEPPELIN-3703. Introduce ConfigurationService
### What is this PR for?
This is sub task of ZEPPELIN-3288.
* Code refactoring of ZeppelinConfiguration, use Java 8 lambda
function`Predicate` instead of ConfigurationKeyPredicate
* Introduce `AbstractRestApi` which has the common functions
### What type of PR is it?
[Refactoring]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3703
### How should this be tested?
* CI pass
### 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: Jeff Zhang
Closes #3134 from zjffdu/ZEPPELIN-3703 and squashes the following commits:
9858d34d5 [Jeff Zhang] ZEPPELIN-3703. Introduce ConfigurationService
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f290c801
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f290c801
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f290c801
Branch: refs/heads/master
Commit: f290c8016fa9add3eba2f6579e8bf308d71c61bb
Parents: 1267e33
Author: Jeff Zhang
Authored: Mon Aug 13 12:32:30 2018 +0800
Committer: Jeff Zhang
Committed: Fri Aug 17 21:02:15 2018 +0800
--
.../zeppelin/conf/ZeppelinConfiguration.java| 30 +++-
.../apache/zeppelin/rest/AbstractRestApi.java | 52 +
.../zeppelin/rest/ConfigurationsRestApi.java| 67 ++---
.../apache/zeppelin/rest/NotebookRestApi.java | 25 +--
.../apache/zeppelin/server/ZeppelinServer.java | 4 +-
.../zeppelin/service/ConfigurationService.java | 62
.../apache/zeppelin/socket/NotebookServer.java | 33 +
.../service/ConfigurationServiceTest.java | 77
8 files changed, 250 insertions(+), 100 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f290c801/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
--
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index 6392a29..df74283 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -23,6 +23,8 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Predicate;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.tree.ConfigurationNode;
@@ -634,43 +636,35 @@ public class ZeppelinConfiguration extends
XMLConfiguration {
return getRelativeDir(ConfVars.ZEPPELIN_SEARCH_TEMP_PATH);
}
- public Map dumpConfigurations(ZeppelinConfiguration conf,
-ConfigurationKeyPredicate
predicate) {
-Map configurations = new HashMap<>();
+ public Map dumpConfigurations(Predicate predicate) {
+Map properties = new HashMap<>();
for (ConfVars v : ConfVars.values()) {
String key = v.getVarName();
- if (!predicate.apply(key)) {
+ if (!predicate.test(key)) {
continue;
}
ConfVars.VarType type = v.getType();
Object value = null;
if (type == ConfVars.VarType.BOOLEAN) {
-value = conf.getBoolean(v);
+value = getBoolean(v);
} else if (type == ConfVars.VarType.LONG) {
-value = conf.getLong(v);
+value = getLong(v);
} else if (type == ConfVars.VarType.INT) {
-value = conf.getInt(v);
+value = getInt(v);
} else if (type == ConfVars.VarType.FLOAT) {
-value = conf.getFloat(v);
+value = getFloat(v);
} else if (type == ConfVars.VarType.STRING) {
-value = conf.getString(v);
+value = getString(v);
}
if (value != null) {
-configurations.put(key, value.toString());
+properties.put(key, value.toString());
}
}
-return configurations;
- }
-
- /**
- * Predication whether key/value pair should be included or not
- */
- public interface ConfigurationKeyPredicate {
-boolean apply(String key);
+return properties;
}
/**
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f290c801/zeppelin-server/src/main/java/org/apache/zeppelin/rest/AbstractRestApi.java
--
diff --git
zeppelin git commit: [ZEPPELIN-3701].Missing first several '0' and losing digital accuracy in result table
Repository: zeppelin
Updated Branches:
refs/heads/master 09d44d504 -> 1267e33a0
[ZEPPELIN-3701].Missing first several '0' and losing digital accuracy in result
table
### What is this PR for?
Improvements:
-Datas like '00058806' will be displayed correctly instead of '58806'.
-Datas like '5880658806' will be displayed correctly instead of '5.880659E9'.
### What type of PR is it?
[Refactoring]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3701
### How should this be tested?
* CI pass
### 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: heguozi
Author: åæå <>
Closes #3132 from Deegue/master and squashes the following commits:
f539a9a [åæå] add '+' validation
09fc45d [åæå] hardcoding fixed
a5f9a8a [åæå] [ZEPPELIN-3701].Missing first several '0' and losing
digital accuracy in result table
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1267e33a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1267e33a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1267e33a
Branch: refs/heads/master
Commit: 1267e33a0ce1bfc7b38bddaa066f89a5f98e8857
Parents: 09d44d5
Author: åæå <>
Authored: Mon Aug 13 18:52:50 2018 +0800
Committer: Felix Cheung
Committed: Thu Aug 16 23:49:03 2018 -0700
--
zeppelin-web/src/app/tabledata/tabledata.js | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1267e33a/zeppelin-web/src/app/tabledata/tabledata.js
--
diff --git a/zeppelin-web/src/app/tabledata/tabledata.js
b/zeppelin-web/src/app/tabledata/tabledata.js
index 1f01bca..67c47be 100644
--- a/zeppelin-web/src/app/tabledata/tabledata.js
+++ b/zeppelin-web/src/app/tabledata/tabledata.js
@@ -36,6 +36,7 @@ export default class TableData extends Dataset {
let textRows = paragraphResult.msg.split('\n');
let comment = '';
let commentRow = false;
+const float64MaxDigits = 16;
for (let i = 0; i < textRows.length; i++) {
let textRow = textRows[i];
@@ -60,8 +61,10 @@ export default class TableData extends Dataset {
columnNames.push({name: col, index: j, aggr: 'sum'});
} else {
let valueOfCol;
- if (!isNaN(valueOfCol = parseFloat(col)) && isFinite(col)) {
-col = valueOfCol;
+ if (!(col[0] === '0' || col[0] === '+' || col.length >
float64MaxDigits)) {
+if (!isNaN(valueOfCol = parseFloat(col)) && isFinite(col)) {
+ col = valueOfCol;
+}
}
cols.push(col);
cols2.push({key: (columnNames[i]) ? columnNames[i].name : undefined,
value: col});
