svn commit: r21582 - /dev/zeppelin/zeppelin-0.7.3-rc3/
Author: minalee Date: Wed Sep 13 11:27:20 2017 New Revision: 21582 Log: Upload zeppelin-0.7.3-rc3 Added: dev/zeppelin/zeppelin-0.7.3-rc3/ dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz (with props) dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.asc dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.md5 dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.sha512 dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz (with props) dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.asc dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.md5 dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.sha512 dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3.tgz (with props) dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3.tgz.asc dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3.tgz.md5 dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3.tgz.sha512 Added: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz -- svn:mime-type = application/octet-stream Added: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.asc == --- dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.asc Wed Sep 13 11:27:20 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEEoiUpCBwcv0n4DKCJVRP5wdxy3V8FAlm5E0IACgkQVRP5wdxy +3V+Z1Af9F75hQdPNEafer0ULuL6uHF9UZDxkXO6919poL4phHxqJSse7rre073DN +3QHocQCcq9fls2mGxPX4/7A7qoyJJ18yQaf4Pg+n4ffYa2zZNFqZ4bo2ntjffshF +Z8jsnuWC9QWwXAwx2CvWn15KWyQmswVVqqe3QX/EYBYZIZHgMEHA77zQf755op/k +eFZFGyvjANR2YoNYCYYvFYlH+olyleZ+/cR7KKkyYN+gdzfDbDbbGUwmGyDLfWk4 +6G4FmvKRcrbM/MVXAw2B+USWdsSW/dR76clZOZWaviJSZ1gx3QS6c0vHBKB9pBVr +ZUwtLxH4peHGne2lenxy2qFZyM+ppw== +=MZ5l +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.md5 == --- dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.md5 (added) +++ dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.md5 Wed Sep 13 11:27:20 2017 @@ -0,0 +1 @@ +zeppelin-0.7.3-bin-all.tgz: CF 4C 16 19 66 DB C7 4E 9A 3C B6 9A 82 75 BF 8E Added: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.sha512 == --- dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.sha512 (added) +++ dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-all.tgz.sha512 Wed Sep 13 11:27:20 2017 @@ -0,0 +1 @@ +8aa030e75da2e6ff3387f7ebfc257daf01afb7d2286bc5a8f13ff3b6fe2cf5b6126cf055ee2f370e235299a004516bcb0798ffd893e2465474372ed4f27b4704 zeppelin-0.7.3-bin-all.tgz Added: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz -- svn:mime-type = application/octet-stream Added: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.asc == --- dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.asc Wed Sep 13 11:27:20 2017 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEEoiUpCBwcv0n4DKCJVRP5wdxy3V8FAlm5FI0ACgkQVRP5wdxy +3V804Qf/WqIb/gEo4wRLApW6QCDFWoIc/pAqhIbvkqCTeLqDy2dcZTBp+ebYeg77 +nsp1cxoA0MUw9Al++mn2mwgB9CRVMAtBJDYBm0qlVmQANTg51TERFbgcjCIMmPL+ +eQk//jXQqm7IpLVg3OCgM1O4Jf11ofgzERS2w+XC28sNtKtwXJc0wgIfqgFIXBPK +/OXbPrOjHOJDY5kF+zww6rz28t0gppTBltzXhMht+f+4ZPHHIXvFBHU0cGxx/C9Q +f6qKfAPf5lmvIsd35TvYSRNFLGVJ1hgDQxavEwdrSkf7/ke56Y82mreZ7JC5Zd5d +KSf31Io0pl3cQ7LplpH2r/ch3cFN4g== +=4LP+ +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.md5 == --- dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.md5 (added) +++ dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.md5 Wed Sep 13 11:27:20 2017 @@ -0,0 +1 @@ +zeppelin-0.7.3-bin-netinst.tgz: F5 11 E9 F3 04 FE 38 C1 F2 66 B3 DA 02 A1 58 8F Added: dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.sha512 == --- dev/zeppelin/zeppelin-0.7.3-rc3/zeppelin-0.7.3-bin-netinst.tgz.sha512 (added) +++
[2/2] zeppelin git commit: Preparing development version 0.7.4-SNAPSHOT
Preparing development version 0.7.4-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e8039c71 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e8039c71 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e8039c71 Branch: refs/heads/branch-0.7 Commit: e8039c716bfa3e25a74a25bb2c3dae53667af006 Parents: 42c1810 Author: Mina LeeAuthored: Wed Sep 13 20:01:32 2017 +0900 Committer: Mina Lee Committed: Wed Sep 13 20:01:32 2017 +0900 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml| 4 ++-- elasticsearch/pom.xml| 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml| 4 ++-- geode/pom.xml| 4 ++-- hbase/pom.xml| 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml| 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- postgresql/pom.xml | 4 ++-- python/pom.xml | 4 ++-- r/pom.xml| 2 +- scalding/pom.xml | 4 ++-- scio/pom.xml | 4 ++-- scripts/docker/zeppelin/bin/Dockerfile | 2 +- shell/pom.xml| 4 ++-- spark-dependencies/pom.xml | 4 ++-- spark/pom.xml| 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml| 2 +- zeppelin-examples/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml | 4 ++-- .../zeppelin-example-clock/zeppelin-example-clock.json | 2 +- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml | 4 ++-- zeppelin-interpreter/pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml | 4 ++-- zeppelin-web/src/app/tabledata/package.json | 2 +- zeppelin-web/src/app/visualization/package.json | 2 +- zeppelin-zengine/pom.xml | 4 ++-- 40 files changed, 73 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8039c71/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index b3206ed..802ce40 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.7.3 +0.7.4-SNAPSHOT .. org.apache.zeppelin zeppelin-alluxio jar -0.7.3 +0.7.4-SNAPSHOT Zeppelin: Alluxio interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8039c71/angular/pom.xml -- diff --git a/angular/pom.xml b/angular/pom.xml index 5701eac..1c83fe4 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.7.3 +0.7.4-SNAPSHOT .. org.apache.zeppelin zeppelin-angular jar - 0.7.3 + 0.7.4-SNAPSHOT Zeppelin: Angular interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8039c71/beam/pom.xml -- diff --git a/beam/pom.xml b/beam/pom.xml index 833da55..03748fe
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.7.3-rc3 [created] 42c1810ef
[1/2] zeppelin git commit: Preparing Apache Zeppelin release 0.7.3
Repository: zeppelin Updated Branches: refs/heads/branch-0.7 361844c5c -> e8039c716 Preparing Apache Zeppelin release 0.7.3 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/42c1810e Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/42c1810e Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/42c1810e Branch: refs/heads/branch-0.7 Commit: 42c1810ef901eb8dba923385f3c305d7f7b11a70 Parents: 361844c Author: Mina LeeAuthored: Wed Sep 13 20:01:24 2017 +0900 Committer: Mina Lee Committed: Wed Sep 13 20:01:24 2017 +0900 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml | 4 ++-- bigquery/pom.xml | 4 ++-- cassandra/pom.xml| 4 ++-- elasticsearch/pom.xml| 4 ++-- file/pom.xml | 4 ++-- flink/pom.xml| 4 ++-- geode/pom.xml| 4 ++-- hbase/pom.xml| 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- jdbc/pom.xml | 4 ++-- kylin/pom.xml| 4 ++-- lens/pom.xml | 4 ++-- livy/pom.xml | 4 ++-- markdown/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- postgresql/pom.xml | 4 ++-- python/pom.xml | 4 ++-- r/pom.xml| 2 +- scalding/pom.xml | 4 ++-- scio/pom.xml | 4 ++-- scripts/docker/zeppelin/bin/Dockerfile | 2 +- shell/pom.xml| 4 ++-- spark-dependencies/pom.xml | 4 ++-- spark/pom.xml| 4 ++-- zeppelin-display/pom.xml | 4 ++-- zeppelin-distribution/pom.xml| 2 +- zeppelin-examples/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml | 4 ++-- .../zeppelin-example-clock/zeppelin-example-clock.json | 2 +- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml | 4 ++-- zeppelin-interpreter/pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml | 4 ++-- zeppelin-web/src/app/tabledata/package.json | 2 +- zeppelin-web/src/app/visualization/package.json | 2 +- zeppelin-zengine/pom.xml | 4 ++-- 40 files changed, 73 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/42c1810e/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index 802ce40..b3206ed 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.7.4-SNAPSHOT +0.7.3 .. org.apache.zeppelin zeppelin-alluxio jar -0.7.4-SNAPSHOT +0.7.3 Zeppelin: Alluxio interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/42c1810e/angular/pom.xml -- diff --git a/angular/pom.xml b/angular/pom.xml index 1c83fe4..5701eac 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -22,14 +22,14 @@ zeppelin org.apache.zeppelin -0.7.4-SNAPSHOT +0.7.3 .. org.apache.zeppelin zeppelin-angular jar - 0.7.4-SNAPSHOT + 0.7.3 Zeppelin: Angular interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/42c1810e/beam/pom.xml
zeppelin git commit: fixed jdbc connection issue.
Repository: zeppelin Updated Branches: refs/heads/branch-0.7 c4f208e92 -> 361844c5c fixed jdbc connection issue. ### What is this PR for? This PR fixes JDBC connection release problem. for example whenever i run not executable command like following ![image](https://user-images.githubusercontent.com/3348133/30206892-8248d1ae-94c8-11e7-9eae-a495be075892.png) new JDBC connection is made like following. ``` $ netstat -an |grep EST |grep 3306 |wc -l 1 $ netstat -an |grep EST |grep 3306 |wc -l 2 $ netstat -an |grep EST |grep 3306 |wc -l 3 ``` ### 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: ShimCloses #2582 from astroshim/feat/fixJdbcIssue and squashes the following commits: 9807172a [Shim] fixed close pool issue. 5d534e67 [Shim] a1 2335adf5 [Shim] initialize the variable 9b99d21e [Shim] fixed jdbc connection issue. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/361844c5 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/361844c5 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/361844c5 Branch: refs/heads/branch-0.7 Commit: 361844c5c12de752e477e9b43e87583a9d97be79 Parents: c4f208e Author: Shim Authored: Wed Sep 13 15:26:44 2017 +0900 Committer: Mina Lee Committed: Wed Sep 13 19:07:11 2017 +0900 -- .../apache/zeppelin/jdbc/JDBCInterpreter.java | 53 +--- .../zeppelin/jdbc/JDBCUserConfigurations.java | 6 --- 2 files changed, 35 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/361844c5/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 ad456be..c94b959 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java @@ -230,11 +230,17 @@ public class JDBCInterpreter extends Interpreter { } private void initConnectionPoolMap() { -for (JDBCUserConfigurations configurations : jdbcUserConfigurationsMap.values()) { +for (String key : jdbcUserConfigurationsMap.keySet()) { + try { +closeDBPool(key, DEFAULT_KEY); + } catch (SQLException e) { +e.printStackTrace(); + } try { +JDBCUserConfigurations configurations = jdbcUserConfigurationsMap.get(key); configurations.initConnectionPoolMap(); - } catch (Exception e) { -logger.error("Error while closing initConnectionPoolMap...", e); + } catch (SQLException e) { +e.printStackTrace(); } } } @@ -357,7 +363,7 @@ public class JDBCInterpreter extends Interpreter { public Connection getConnection(String propertyKey, InterpreterContext interpreterContext) throws ClassNotFoundException, SQLException, InterpreterException, IOException { final String user = interpreterContext.getAuthenticationInfo().getUser(); -Connection connection; +Connection connection = null; if (propertyKey == null || basePropretiesMap.get(propertyKey) == null) { return null; } @@ -553,20 +559,30 @@ public class JDBCInterpreter extends Interpreter { private InterpreterResult executeSql(String propertyKey, String sql, InterpreterContext interpreterContext) { -Connection connection; +Connection connection = null; Statement statement; ResultSet resultSet = null; String paragraphId = interpreterContext.getParagraphId(); String user = interpreterContext.getAuthenticationInfo().getUser(); InterpreterResult interpreterResult = new InterpreterResult(InterpreterResult.Code.SUCCESS); - try { connection = getConnection(propertyKey, interpreterContext); - if (connection == null) { -return new InterpreterResult(Code.ERROR, "Prefix not found."); +} catch (Exception e) { + String errorMsg = Throwables.getStackTraceAsString(e); + try { +closeDBPool(user, propertyKey); + } catch (SQLException e1) { +logger.error("Cannot close DBPool for user, propertyKey: " + user + propertyKey, e1); } + interpreterResult.add(errorMsg); + return new InterpreterResult(Code.ERROR, interpreterResult.message()); +} +if (connection == null) { + return new InterpreterResult(Code.ERROR, "Prefix not found."); +} +try { ArrayList multipleSqlArray = splitSqlQueries(sql); for (int i = 0; i <