zeppelin git commit: [ZEPPELIN-3447] Bump up version of jackson-databind
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 1b4d37639 -> 15090d3be
[ZEPPELIN-3447] Bump up version of jackson-databind
This is to upgrade the package jackson-databind libary to 2.27
[Improvement]
*
[ZEPPELIN-3447](https://issues.apache.org/jira/projects/ZEPPELIN/issues/ZEPPELIN-3447)
* Does the licenses files need an update? N?A
* Is there breaking changes for older versions? N?A
* Does this needs documentation? N?A
Author: Prabhjyot Singh
Closes #2962 from prabhjyotsingh/ZEPPELIN-3447 and squashes the following
commits:
a9d2abcdf [Prabhjyot Singh] ZEPPELIN-3447: Bump up version of jackson-databind
Change-Id: I5f8ff956ba147d24e43af81076e3e869de1bbab0
(cherry picked from commit c1aeb620bb0030638624daf19d711a2bec8eab69)
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/15090d3b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/15090d3b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/15090d3b
Branch: refs/heads/branch-0.8
Commit: 15090d3bef8540af41184b0a1a8f0fd0a4d94c97
Parents: 1b4d376
Author: Prabhjyot Singh
Authored: Tue May 8 14:18:35 2018 +0530
Committer: Prabhjyot Singh
Committed: Fri May 11 09:42:14 2018 +0530
--
zeppelin-server/pom.xml | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/15090d3b/zeppelin-server/pom.xml
--
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index c11bc42..165123c 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -36,10 +36,10 @@
4.3.6
-2.22.2
+2.27
2.2.1
1.13
-2.0.1
+2.1
1.8
4.1.0
@@ -143,9 +143,23 @@
com.fasterxml.jackson.core
jackson-annotations
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.8.11.1
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ ${jersey.version}
+
+
org.glassfish.jersey.core
jersey-server
${jersey.version}
@@ -205,7 +219,7 @@
com.fasterxml.jackson.core
jackson-annotations
- 2.5.4
+ 2.8.0
zeppelin git commit: [ZEPPELIN-3447] Bump up version of jackson-databind
Repository: zeppelin
Updated Branches:
refs/heads/master 941ccbbbd -> c1aeb620b
[ZEPPELIN-3447] Bump up version of jackson-databind
This is to upgrade the package jackson-databind libary to 2.27
[Improvement]
*
[ZEPPELIN-3447](https://issues.apache.org/jira/projects/ZEPPELIN/issues/ZEPPELIN-3447)
* Does the licenses files need an update? N?A
* Is there breaking changes for older versions? N?A
* Does this needs documentation? N?A
Author: Prabhjyot Singh
Closes #2962 from prabhjyotsingh/ZEPPELIN-3447 and squashes the following
commits:
a9d2abcdf [Prabhjyot Singh] ZEPPELIN-3447: Bump up version of jackson-databind
Change-Id: I5f8ff956ba147d24e43af81076e3e869de1bbab0
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c1aeb620
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c1aeb620
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c1aeb620
Branch: refs/heads/master
Commit: c1aeb620bb0030638624daf19d711a2bec8eab69
Parents: 941ccbb
Author: Prabhjyot Singh
Authored: Tue May 8 14:18:35 2018 +0530
Committer: Prabhjyot Singh
Committed: Fri May 11 09:41:52 2018 +0530
--
zeppelin-server/pom.xml | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c1aeb620/zeppelin-server/pom.xml
--
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 46cdd65..f91f6da 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -36,10 +36,10 @@
4.3.6
-2.22.2
+2.27
2.2.1
1.13
-2.0.1
+2.1
1.8
4.1.0
@@ -143,9 +143,23 @@
com.fasterxml.jackson.core
jackson-annotations
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.8.11.1
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ ${jersey.version}
+
+
org.glassfish.jersey.core
jersey-server
${jersey.version}
@@ -205,7 +219,7 @@
com.fasterxml.jackson.core
jackson-annotations
- 2.5.4
+ 2.8.0
zeppelin git commit: [Zeppelin 3388] Correcting documentation link to zeppelin-context documentation
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 de1a25c73 -> 1b4d37639
[Zeppelin 3388] Correcting documentation link to zeppelin-context documentation
### What is this PR for?
A small change was needed in the documentation of the JDBC interpreter also,
but had been missed.
The change required is the same as the change made in the documentation of the
Shell interpreter (as seen
[here](https://github.com/apache/zeppelin/commit/0c3260e91f4c1ec58e67856d466ea9cba89d0085#diff-5a017ebfb7e890a2b475f9c8c7844fb0))
### What type of PR is it?
[Documentation]
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-3388
### How should this be tested?
Documentation only.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No, this _is_ documentation.
Author: Sanjay Dasgupta
Closes #2960 from sanjaydasgupta/z-3388-jdbc and squashes the following commits:
b43ff21 [Sanjay Dasgupta] Correcting link to zeppelin-context documentation
(cherry picked from commit 941ccbbbdb6c2ca11f09f54bf0ddd31d6ba25d1c)
Signed-off-by: Felix Cheung
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1b4d3763
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1b4d3763
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1b4d3763
Branch: refs/heads/branch-0.8
Commit: 1b4d376394b7a2d3345394c1fcf2f776c1bab5d7
Parents: de1a25c
Author: Sanjay Dasgupta
Authored: Sat May 5 08:31:14 2018 +0530
Committer: Felix Cheung
Committed: Thu May 10 20:52:05 2018 -0700
--
docs/interpreter/jdbc.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1b4d3763/docs/interpreter/jdbc.md
--
diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md
index 2f64da9..aee9c4e 100644
--- a/docs/interpreter/jdbc.md
+++ b/docs/interpreter/jdbc.md
@@ -753,7 +753,7 @@ z.put("country_code", "KR")
Object interpolation is disabled by default, and can be enabled for all
instances of the JDBC interpreter by
setting the value of the property `zeppelin.jdbc.interpolation` to `true` (see
_More Properties_ above).
More details of this feature can be found in the Spark interpreter
documentation under
-[Object Interpolation](spark.html#object-interpolation)
+[Zeppelin-Context](../usage/other_features/zeppelin_context.html)
## Bug reporting
If you find a bug using JDBC interpreter, please create a
[JIRA](https://issues.apache.org/jira/browse/ZEPPELIN) ticket.
zeppelin git commit: [Zeppelin 3388] Correcting documentation link to zeppelin-context documentation
Repository: zeppelin
Updated Branches:
refs/heads/master 3712ce697 -> 941ccbbbd
[Zeppelin 3388] Correcting documentation link to zeppelin-context documentation
### What is this PR for?
A small change was needed in the documentation of the JDBC interpreter also,
but had been missed.
The change required is the same as the change made in the documentation of the
Shell interpreter (as seen
[here](https://github.com/apache/zeppelin/commit/0c3260e91f4c1ec58e67856d466ea9cba89d0085#diff-5a017ebfb7e890a2b475f9c8c7844fb0))
### What type of PR is it?
[Documentation]
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-3388
### How should this be tested?
Documentation only.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No, this _is_ documentation.
Author: Sanjay Dasgupta
Closes #2960 from sanjaydasgupta/z-3388-jdbc and squashes the following commits:
b43ff21 [Sanjay Dasgupta] Correcting link to zeppelin-context documentation
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/941ccbbb
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/941ccbbb
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/941ccbbb
Branch: refs/heads/master
Commit: 941ccbbbdb6c2ca11f09f54bf0ddd31d6ba25d1c
Parents: 3712ce6
Author: Sanjay Dasgupta
Authored: Sat May 5 08:31:14 2018 +0530
Committer: Felix Cheung
Committed: Thu May 10 20:51:50 2018 -0700
--
docs/interpreter/jdbc.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/941ccbbb/docs/interpreter/jdbc.md
--
diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md
index 2f64da9..aee9c4e 100644
--- a/docs/interpreter/jdbc.md
+++ b/docs/interpreter/jdbc.md
@@ -753,7 +753,7 @@ z.put("country_code", "KR")
Object interpolation is disabled by default, and can be enabled for all
instances of the JDBC interpreter by
setting the value of the property `zeppelin.jdbc.interpolation` to `true` (see
_More Properties_ above).
More details of this feature can be found in the Spark interpreter
documentation under
-[Object Interpolation](spark.html#object-interpolation)
+[Zeppelin-Context](../usage/other_features/zeppelin_context.html)
## Bug reporting
If you find a bug using JDBC interpreter, please create a
[JIRA](https://issues.apache.org/jira/browse/ZEPPELIN) ticket.
zeppelin git commit: ZEPPELIN-3310. Scio interpreter layout is broken
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 e4a89ba38 -> de1a25c73
ZEPPELIN-3310. Scio interpreter layout is broken
### What is this PR for?
Fix scio interpreter layout. The current scio interpreter layout is broken
because there is not a newline between %table part and %text part in this
interpreter output.
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
[ZEPPELIN-3310](https://issues.apache.org/jira/browse/ZEPPELIN-3310)
### How should this be tested?
* CI should pass
* View the snapshot
### Screenshots (if appropriate)
[Before applied this change]
[Ater applied this change]
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: iijima_satoshi
Closes #2854 from iijima-satoshi/fix-scio-interpreter-layout and squashes the
following commits:
2b4fd68 [iijima_satoshi] ZEPPELIN-3310. Scio interpreter layout is broken
(cherry picked from commit 2a5960bd50ea29ce7b925a6ac3288c0fd5ae7ddd)
Signed-off-by: Jeff Zhang
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/de1a25c7
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/de1a25c7
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/de1a25c7
Branch: refs/heads/branch-0.8
Commit: de1a25c73b35a3873638e80cb35bafd96e5b19a0
Parents: e4a89ba
Author: iijima_satoshi
Authored: Fri Mar 9 19:15:24 2018 +0900
Committer: Jeff Zhang
Committed: Thu May 10 17:45:50 2018 +0800
--
.../apache/zeppelin/scio/DisplayHelpers.scala | 2 +-
.../zeppelin/scio/DisplayHelpersTest.scala | 103 +--
2 files changed, 47 insertions(+), 58 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/de1a25c7/scio/src/main/scala/org/apache/zeppelin/scio/DisplayHelpers.scala
--
diff --git a/scio/src/main/scala/org/apache/zeppelin/scio/DisplayHelpers.scala
b/scio/src/main/scala/org/apache/zeppelin/scio/DisplayHelpers.scala
index 8dee3ab..bfb4f9c 100644
--- a/scio/src/main/scala/org/apache/zeppelin/scio/DisplayHelpers.scala
+++ b/scio/src/main/scala/org/apache/zeppelin/scio/DisplayHelpers.scala
@@ -35,7 +35,7 @@ private[scio] object DisplayHelpers {
private[scio] val tab = "\t"
private[scio] val newline = "\n"
private[scio] val table = "%table"
- private[scio] val endTable = "%text"
+ private[scio] val endTable = "\n%text"
private[scio] val rowLimitReachedMsg =
s"$newlineResults are limited to " + maxResults + s"
rows.$newline"
private[scio] val bQSchemaIncomplete =
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/de1a25c7/scio/src/test/scala/org/apache/zeppelin/scio/DisplayHelpersTest.scala
--
diff --git
a/scio/src/test/scala/org/apache/zeppelin/scio/DisplayHelpersTest.scala
b/scio/src/test/scala/org/apache/zeppelin/scio/DisplayHelpersTest.scala
index 6dd05ab..a197faf 100644
--- a/scio/src/test/scala/org/apache/zeppelin/scio/DisplayHelpersTest.scala
+++ b/scio/src/test/scala/org/apache/zeppelin/scio/DisplayHelpersTest.scala
@@ -48,7 +48,8 @@ class DisplayHelpersTest extends FlatSpec with Matchers {
//
---
private val anyValHeader = s"$table value"
- private val endTable = DisplayHelpers.endTable
+ private val endTableFooter = DisplayHelpers.endTable.split("\\n").last
+ private val endTableSeq = Seq("", endTableFooter)
"DisplayHelpers" should "support Integer SCollection via AnyVal" in {
import
org.apache.zeppelin.scio.DisplaySCollectionImplicits.ZeppelinSCollection
@@ -60,10 +61,9 @@ class DisplayHelpersTest extends FlatSpec with Matchers {
o should contain theSameElementsAs Seq(anyValHeader,
"1",
"2",
- "3",
- endTable)
+ "3") ++ endTableSeq
o.head should be(anyValHeader)
-o.last should be(endTable)
+o.last should be(endTableFooter)
}
it should "support Long SCollection via AnyVal" in {
@@ -76,10 +76,9 @@ class DisplayHelpersTest extends FlatSpec with Matchers {
o should contain theSameElementsAs Seq(anyValHeader,
"1",
"2",
-
zeppelin git commit: ZEPPELIN-3115 Fix bigquery interpreter to remove TAB at end-of-line
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 df06f4542 -> e4a89ba38
ZEPPELIN-3115 Fix bigquery interpreter to remove TAB at end-of-line
Fix bigquery interpreter layout.
The current layout is broken due to a tab character at end-of-line.
Bug Fix
https://issues.apache.org/jira/browse/ZEPPELIN-3115
* Run bigquery interpreter and check the result (Please see below screenshots).
Before (from JIRA issues):
After:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: iijima_satoshi
Closes #2912 from iijima-satoshi/fix-bigquery-layout and squashes the following
commits:
f193f6a [iijima_satoshi] ZEPPELIN-3115 Add test for bigquery interpreter output
dd2a198 [iijima_satoshi] ZEPPELIN-3115 BigQuery interpreter does not render the
output of a sql query (only shows column names)
(cherry picked from commit 36a5a917371a47eb257e8cfdc44930c0eb65560e)
Signed-off-by: Jeff Zhang
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e4a89ba3
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e4a89ba3
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e4a89ba3
Branch: refs/heads/branch-0.8
Commit: e4a89ba38733569586cde1552ecb32908d6564ec
Parents: df06f45
Author: iijima_satoshi
Authored: Sat Apr 7 05:32:52 2018 +0900
Committer: Jeff Zhang
Committed: Thu May 10 17:44:01 2018 +0800
--
.../zeppelin/bigquery/BigQueryInterpreter.java | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e4a89ba3/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java
--
diff --git
a/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java
b/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java
index 4aff742..a176899 100644
---
a/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java
+++
b/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java
@@ -24,7 +24,7 @@ import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
import com.google.api.client.json.jackson2.JacksonFactory;
-
+import com.google.api.client.util.Joiner;
import com.google.api.services.bigquery.Bigquery;
import com.google.api.services.bigquery.BigqueryScopes;
import com.google.api.client.json.GenericJson;
@@ -166,19 +166,20 @@ public class BigQueryInterpreter extends Interpreter {
//Function that generates and returns the schema and the rows as string
public static String printRows(final GetQueryResultsResponse response) {
-StringBuilder msg = null;
-msg = new StringBuilder();
+StringBuilder msg = new StringBuilder();
try {
+ List schemNames = new ArrayList();
for (TableFieldSchema schem: response.getSchema().getFields()) {
-msg.append(schem.getName());
-msg.append(TAB);
- }
+schemNames.add(schem.getName());
+ }
+ msg.append(Joiner.on(TAB).join(schemNames));
msg.append(NEWLINE);
for (TableRow row : response.getRows()) {
+List fieldValues = new ArrayList();
for (TableCell field : row.getF()) {
- msg.append(field.getV().toString());
- msg.append(TAB);
+ fieldValues.add(field.getV().toString());
}
+msg.append(Joiner.on(TAB).join(fieldValues));
msg.append(NEWLINE);
}
return msg.toString();
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc2 [deleted] 12e73580b
[zeppelin] Git Push Summary [forced push!] [Forced Update!]
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 38fdce530 -> df06f4542 (forced update)
