From bd3d80952ca56e709379632318ba1193a17338ae Mon Sep 17 00:00:00 2001 From: Tinkoff DWH Date: Fri, 23 Jun 2017 16:58:20 +0500 Subject: [PATCH 1/9] [ZEPPELIN-2679] jdbc. precode for session --- .../java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 8 ++++++++ jdbc/src/main/resources/interpreter-setting.json | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) 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 72d7981764d..5dfe5596616 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java @@ -111,6 +111,7 @@ public class JDBCInterpreter extends Interpreter { static final String JDBC_JCEKS_FILE = "jceks.file"; static final String JDBC_JCEKS_CREDENTIAL_KEY = "jceks.credentialKey"; static final String PRECODE_KEY_TEMPLATE = "%s.precode"; + static final String SESSION_PRECODE_KEY_TEMPLATE = "%s.sessionPrecode"; static final String DOT = "."; private static final char WHITESPACE = ' '; @@ -659,6 +660,13 @@ private InterpreterResult executeSql(String propertyKey, String sql, try { getJDBCConfiguration(user).saveStatement(paragraphId, statement); + String sessionPrecode = + getProperty(String.format(SESSION_PRECODE_KEY_TEMPLATE, propertyKey)); + + if (StringUtils.isNotBlank(sessionPrecode)) { + statement.execute(sessionPrecode); + } + boolean isResultSetAvailable = statement.execute(sqlToExecute); getJDBCConfiguration(user).setConnectionInDBDriverPoolSuccessful(propertyKey); if (isResultSetAvailable) { diff --git a/jdbc/src/main/resources/interpreter-setting.json b/jdbc/src/main/resources/interpreter-setting.json index 21ff6850015..8aad240de3f 100644 --- a/jdbc/src/main/resources/interpreter-setting.json +++ b/jdbc/src/main/resources/interpreter-setting.json @@ -42,10 +42,16 @@ }, "default.precode": { "envName": null, - "propertyName": "zeppelin.jdbc.precode", + "propertyName": "default.precode", "defaultValue": "", "description": "SQL which executes while opening connection" }, + "default.sessionPrecode": { + "envName": null, + "propertyName": "default.sessionPrecode", + "defaultValue": "", + "description": "Runs before each run of the paragraph, in the same connection" + }, "default.splitQueries": { "envName": null, "propertyName": "default.splitQueries", From ae7a0d63966a1ddbf89292715221d041ecdc2b74 Mon Sep 17 00:00:00 2001 From: Tinkoff DWH Date: Mon, 26 Jun 2017 09:14:11 +0500 Subject: [PATCH 2/9] [ZEPPELIN-2679] tests --- .../apache/zeppelin/jdbc/JDBCInterpreter.java | 2 + .../zeppelin/jdbc/JDBCInterpreterTest.java | 61 +++++++++++++++++++ 2 files changed, 63 insertions(+) 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 5dfe5596616..9975e48015a 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java @@ -104,6 +104,7 @@ public class JDBCInterpreter extends Interpreter { static final String USER_KEY = "user"; static final String PASSWORD_KEY = "password"; static final String PRECODE_KEY = "precode"; + static final String SESSION_PRECODE_KEY = "sessionPrecode"; static final String COMPLETER_SCHEMA_FILTERS_KEY = "completer.schemaFilters"; static final String COMPLETER_TTL_KEY = "completer.ttlInSeconds"; static final String DEFAULT_COMPLETER_TTL = "120"; @@ -127,6 +128,7 @@ public class JDBCInterpreter extends Interpreter { static final String DEFAULT_USER = DEFAULT_KEY + DOT + USER_KEY; static final String DEFAULT_PASSWORD = DEFAULT_KEY + DOT + PASSWORD_KEY; static final String DEFAULT_PRECODE = DEFAULT_KEY + DOT + PRECODE_KEY; + static final String DEFAULT_SESSION_PRECODE = DEFAULT_KEY + DOT + SESSION_PRECODE_KEY; static final String EMPTY_COLUMN_VALUE = ""; 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 e6f9598f8b7..6b5adc4d4b0 100644 --- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java +++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java @@ -17,11 +17,13 @@ import static java.lang.String.format; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_DRIVER; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_PASSWORD; +import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_SESSION_PRECODE; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_USER; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_URL; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_PRECODE; import static org.apache.zeppelin.jdbc.JDBCInterpreter.PRECODE_KEY_TEMPLATE; import static org.apache.zeppelin.jdbc.JDBCInterpreter.COMMON_MAX_LINE; +import static org.apache.zeppelin.jdbc.JDBCInterpreter.SESSION_PRECODE_KEY_TEMPLATE; import static org.junit.Assert.*; import java.io.IOException; @@ -522,6 +524,65 @@ public void testPrecodeWithAnotherPrefix() throws SQLException, IOException { assertEquals("ID\n2\n", interpreterResult.message().get(0).getData()); } + @Test + public void testSessionPrecode() throws SQLException, IOException { + Properties properties = new Properties(); + properties.setProperty("default.driver", "org.h2.Driver"); + properties.setProperty("default.url", getJdbcConnection()); + properties.setProperty("default.user", ""); + properties.setProperty("default.password", ""); + properties.setProperty(DEFAULT_SESSION_PRECODE, "set @v='session'"); + JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); + jdbcInterpreter.open(); + + String sqlQuery = "select @v"; + + InterpreterResult interpreterResult = jdbcInterpreter.interpret(sqlQuery, interpreterContext); + + assertEquals(InterpreterResult.Code.SUCCESS, interpreterResult.code()); + assertEquals(InterpreterResult.Type.TABLE, interpreterResult.message().get(0).getType()); + assertEquals("@V\nsession\n", interpreterResult.message().get(0).getData()); + } + + @Test + public void testIncorrectSessionPrecode() throws SQLException, IOException { + Properties properties = new Properties(); + properties.setProperty("default.driver", "org.h2.Driver"); + properties.setProperty("default.url", getJdbcConnection()); + properties.setProperty("default.user", ""); + properties.setProperty("default.password", ""); + properties.setProperty(DEFAULT_SESSION_PRECODE, "set incorrect"); + JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); + jdbcInterpreter.open(); + + String sqlQuery = "select 1"; + + InterpreterResult interpreterResult = jdbcInterpreter.interpret(sqlQuery, interpreterContext); + + assertEquals(InterpreterResult.Code.ERROR, interpreterResult.code()); + assertEquals(InterpreterResult.Type.TEXT, interpreterResult.message().get(0).getType()); + } + + @Test + public void testSessionPrecodeWithAnotherPrefix() throws SQLException, IOException { + Properties properties = new Properties(); + properties.setProperty("anotherPrefix.driver", "org.h2.Driver"); + properties.setProperty("anotherPrefix.url", getJdbcConnection()); + properties.setProperty("anotherPrefix.user", ""); + properties.setProperty("anotherPrefix.password", ""); + properties.setProperty(String.format(SESSION_PRECODE_KEY_TEMPLATE, "anotherPrefix"), "set @v='sessionAnotherPrefix'"); + JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); + jdbcInterpreter.open(); + + String sqlQuery = "(anotherPrefix) select @v"; + + InterpreterResult interpreterResult = jdbcInterpreter.interpret(sqlQuery, interpreterContext); + + assertEquals(InterpreterResult.Code.SUCCESS, interpreterResult.code()); + assertEquals(InterpreterResult.Type.TABLE, interpreterResult.message().get(0).getType()); + assertEquals("@V\nsessionAnotherPrefix\n", interpreterResult.message().get(0).getData()); + } + @Test public void testExcludingComments() throws SQLException, IOException { Properties properties = new Properties(); From 719d0a2fdf73a478c4475c8147da8d26646933ff Mon Sep 17 00:00:00 2001 From: "isys.mreshetov" Date: Thu, 29 Jun 2017 09:35:10 +0500 Subject: [PATCH 3/9] ZEPPELIN-2679 docs --- docs/interpreter/jdbc.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md index 0fe9d68ecf0..3653ea3a4c7 100644 --- a/docs/interpreter/jdbc.md +++ b/docs/interpreter/jdbc.md @@ -123,6 +123,11 @@ The JDBC interpreter properties are defined by default like below. Some SQL which executes every time after initialization of the interpreter (see [Binding mode](../manual/interpreters.md#interpreter-binding-mode)) + + default.sessionPrecode + + SQL code which executed before the SQL from paragraph, in the same database session (database connection) + default.completer.schemaFilters From 7bba0db8ac7f28c7c35798e3292ec0e8dd08fde8 Mon Sep 17 00:00:00 2001 From: tinkoff-dwh Date: Tue, 13 Mar 2018 14:49:56 +0500 Subject: [PATCH 4/9] ZEPPELIN-2679 rename session to statement --- docs/interpreter/jdbc.md | 2 +- .../org/apache/zeppelin/jdbc/JDBCInterpreter.java | 14 +++++++------- jdbc/src/main/resources/interpreter-setting.json | 4 ++-- .../apache/zeppelin/jdbc/JDBCInterpreterTest.java | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md index 3653ea3a4c7..f7821cc020d 100644 --- a/docs/interpreter/jdbc.md +++ b/docs/interpreter/jdbc.md @@ -124,7 +124,7 @@ The JDBC interpreter properties are defined by default like below. Some SQL which executes every time after initialization of the interpreter (see [Binding mode](../manual/interpreters.md#interpreter-binding-mode)) - default.sessionPrecode + default.statementPrecode SQL code which executed before the SQL from paragraph, in the same database session (database connection) 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 9975e48015a..83db85a8ad4 100644 --- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java +++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java @@ -104,7 +104,7 @@ public class JDBCInterpreter extends Interpreter { static final String USER_KEY = "user"; static final String PASSWORD_KEY = "password"; static final String PRECODE_KEY = "precode"; - static final String SESSION_PRECODE_KEY = "sessionPrecode"; + static final String STATEMENT_PRECODE_KEY = "statementPrecode"; static final String COMPLETER_SCHEMA_FILTERS_KEY = "completer.schemaFilters"; static final String COMPLETER_TTL_KEY = "completer.ttlInSeconds"; static final String DEFAULT_COMPLETER_TTL = "120"; @@ -112,7 +112,7 @@ public class JDBCInterpreter extends Interpreter { static final String JDBC_JCEKS_FILE = "jceks.file"; static final String JDBC_JCEKS_CREDENTIAL_KEY = "jceks.credentialKey"; static final String PRECODE_KEY_TEMPLATE = "%s.precode"; - static final String SESSION_PRECODE_KEY_TEMPLATE = "%s.sessionPrecode"; + static final String STATEMENT_PRECODE_KEY_TEMPLATE = "%s.statementPrecode"; static final String DOT = "."; private static final char WHITESPACE = ' '; @@ -128,7 +128,7 @@ public class JDBCInterpreter extends Interpreter { static final String DEFAULT_USER = DEFAULT_KEY + DOT + USER_KEY; static final String DEFAULT_PASSWORD = DEFAULT_KEY + DOT + PASSWORD_KEY; static final String DEFAULT_PRECODE = DEFAULT_KEY + DOT + PRECODE_KEY; - static final String DEFAULT_SESSION_PRECODE = DEFAULT_KEY + DOT + SESSION_PRECODE_KEY; + static final String DEFAULT_STATEMENT_PRECODE = DEFAULT_KEY + DOT + STATEMENT_PRECODE_KEY; static final String EMPTY_COLUMN_VALUE = ""; @@ -662,11 +662,11 @@ private InterpreterResult executeSql(String propertyKey, String sql, try { getJDBCConfiguration(user).saveStatement(paragraphId, statement); - String sessionPrecode = - getProperty(String.format(SESSION_PRECODE_KEY_TEMPLATE, propertyKey)); + String statementPrecode = + getProperty(String.format(STATEMENT_PRECODE_KEY_TEMPLATE, propertyKey)); - if (StringUtils.isNotBlank(sessionPrecode)) { - statement.execute(sessionPrecode); + if (StringUtils.isNotBlank(statementPrecode)) { + statement.execute(statementPrecode); } boolean isResultSetAvailable = statement.execute(sqlToExecute); diff --git a/jdbc/src/main/resources/interpreter-setting.json b/jdbc/src/main/resources/interpreter-setting.json index 8aad240de3f..fdf38117ffd 100644 --- a/jdbc/src/main/resources/interpreter-setting.json +++ b/jdbc/src/main/resources/interpreter-setting.json @@ -46,9 +46,9 @@ "defaultValue": "", "description": "SQL which executes while opening connection" }, - "default.sessionPrecode": { + "default.statementPrecode": { "envName": null, - "propertyName": "default.sessionPrecode", + "propertyName": "default.statementPrecode", "defaultValue": "", "description": "Runs before each run of the paragraph, in the same connection" }, 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 6b5adc4d4b0..bfe353c7b11 100644 --- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java +++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java @@ -17,13 +17,13 @@ import static java.lang.String.format; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_DRIVER; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_PASSWORD; -import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_SESSION_PRECODE; +import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_STATEMENT_PRECODE; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_USER; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_URL; import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_PRECODE; import static org.apache.zeppelin.jdbc.JDBCInterpreter.PRECODE_KEY_TEMPLATE; import static org.apache.zeppelin.jdbc.JDBCInterpreter.COMMON_MAX_LINE; -import static org.apache.zeppelin.jdbc.JDBCInterpreter.SESSION_PRECODE_KEY_TEMPLATE; +import static org.apache.zeppelin.jdbc.JDBCInterpreter.STATEMENT_PRECODE_KEY_TEMPLATE; import static org.junit.Assert.*; import java.io.IOException; @@ -531,7 +531,7 @@ public void testSessionPrecode() throws SQLException, IOException { properties.setProperty("default.url", getJdbcConnection()); properties.setProperty("default.user", ""); properties.setProperty("default.password", ""); - properties.setProperty(DEFAULT_SESSION_PRECODE, "set @v='session'"); + properties.setProperty(DEFAULT_STATEMENT_PRECODE, "set @v='session'"); JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); jdbcInterpreter.open(); @@ -551,7 +551,7 @@ public void testIncorrectSessionPrecode() throws SQLException, IOException { properties.setProperty("default.url", getJdbcConnection()); properties.setProperty("default.user", ""); properties.setProperty("default.password", ""); - properties.setProperty(DEFAULT_SESSION_PRECODE, "set incorrect"); + properties.setProperty(DEFAULT_STATEMENT_PRECODE, "set incorrect"); JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); jdbcInterpreter.open(); @@ -570,7 +570,7 @@ public void testSessionPrecodeWithAnotherPrefix() throws SQLException, IOExcepti properties.setProperty("anotherPrefix.url", getJdbcConnection()); properties.setProperty("anotherPrefix.user", ""); properties.setProperty("anotherPrefix.password", ""); - properties.setProperty(String.format(SESSION_PRECODE_KEY_TEMPLATE, "anotherPrefix"), "set @v='sessionAnotherPrefix'"); + properties.setProperty(String.format(STATEMENT_PRECODE_KEY_TEMPLATE, "anotherPrefix"), "set @v='sessionAnotherPrefix'"); JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); jdbcInterpreter.open(); From 07b41c5110430f3b13ca81088b29fa5eae3d0734 Mon Sep 17 00:00:00 2001 From: tinkoff-dwh Date: Tue, 13 Mar 2018 17:15:49 +0500 Subject: [PATCH 5/9] ZEPPELIN-2679 rename test methods --- .../apache/zeppelin/jdbc/JDBCInterpreterTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 3381fbad3ee..a7c04b5691b 100644 --- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java +++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java @@ -526,13 +526,13 @@ public void testPrecodeWithAnotherPrefix() throws SQLException, IOException { } @Test - public void testSessionPrecode() throws SQLException, IOException { + public void testStatementPrecode() throws SQLException, IOException { Properties properties = new Properties(); properties.setProperty("default.driver", "org.h2.Driver"); properties.setProperty("default.url", getJdbcConnection()); properties.setProperty("default.user", ""); properties.setProperty("default.password", ""); - properties.setProperty(DEFAULT_STATEMENT_PRECODE, "set @v='session'"); + properties.setProperty(DEFAULT_STATEMENT_PRECODE, "set @v='statement'"); JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); jdbcInterpreter.open(); @@ -542,11 +542,11 @@ public void testSessionPrecode() throws SQLException, IOException { assertEquals(InterpreterResult.Code.SUCCESS, interpreterResult.code()); assertEquals(InterpreterResult.Type.TABLE, interpreterResult.message().get(0).getType()); - assertEquals("@V\nsession\n", interpreterResult.message().get(0).getData()); + assertEquals("@V\nstatement\n", interpreterResult.message().get(0).getData()); } @Test - public void testIncorrectSessionPrecode() throws SQLException, IOException { + public void testIncorrectStatementPrecode() throws SQLException, IOException { Properties properties = new Properties(); properties.setProperty("default.driver", "org.h2.Driver"); properties.setProperty("default.url", getJdbcConnection()); @@ -565,13 +565,13 @@ public void testIncorrectSessionPrecode() throws SQLException, IOException { } @Test - public void testSessionPrecodeWithAnotherPrefix() throws SQLException, IOException { + public void testStatementPrecodeWithAnotherPrefix() throws SQLException, IOException { Properties properties = new Properties(); properties.setProperty("anotherPrefix.driver", "org.h2.Driver"); properties.setProperty("anotherPrefix.url", getJdbcConnection()); properties.setProperty("anotherPrefix.user", ""); properties.setProperty("anotherPrefix.password", ""); - properties.setProperty(String.format(STATEMENT_PRECODE_KEY_TEMPLATE, "anotherPrefix"), "set @v='sessionAnotherPrefix'"); + properties.setProperty(String.format(STATEMENT_PRECODE_KEY_TEMPLATE, "anotherPrefix"), "set @v='statementAnotherPrefix'"); JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); jdbcInterpreter.open(); @@ -581,7 +581,7 @@ public void testSessionPrecodeWithAnotherPrefix() throws SQLException, IOExcepti assertEquals(InterpreterResult.Code.SUCCESS, interpreterResult.code()); assertEquals(InterpreterResult.Type.TABLE, interpreterResult.message().get(0).getType()); - assertEquals("@V\nsessionAnotherPrefix\n", interpreterResult.message().get(0).getData()); + assertEquals("@V\nstatementAnotherPrefix\n", interpreterResult.message().get(0).getData()); } @Test From 00aeabf5dcc9b78ce40482ae2ffff4aed41da373 Mon Sep 17 00:00:00 2001 From: tinkoff-dwh Date: Wed, 14 Mar 2018 10:37:48 +0500 Subject: [PATCH 6/9] ZEPPELIN-2679 fix checkstyle --- .../java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 043a362b19f..f6934b940db 100644 --- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java +++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java @@ -582,7 +582,8 @@ public void testStatementPrecodeWithAnotherPrefix() throws SQLException, IOExcep properties.setProperty("anotherPrefix.url", getJdbcConnection()); properties.setProperty("anotherPrefix.user", ""); properties.setProperty("anotherPrefix.password", ""); - properties.setProperty(String.format(STATEMENT_PRECODE_KEY_TEMPLATE, "anotherPrefix"), "set @v='statementAnotherPrefix'"); + properties.setProperty(String.format(STATEMENT_PRECODE_KEY_TEMPLATE, "anotherPrefix"), + "set @v='statementAnotherPrefix'"); JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties); jdbcInterpreter.open(); From 11f89a590eb5e75830056e2692167cfc72c8124e Mon Sep 17 00:00:00 2001 From: mebelousov Date: Mon, 9 Apr 2018 12:45:56 +0300 Subject: [PATCH 7/9] ZEPPELIN-2679 Small fix in docs --- docs/interpreter/jdbc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md index 8f070b69a38..a6c28dfcf1a 100644 --- a/docs/interpreter/jdbc.md +++ b/docs/interpreter/jdbc.md @@ -311,7 +311,7 @@ Returns value of `search_path` which is set in the *default.precode*. ```sql -%jdbc(mysql) +%mysql select @v ``` Returns value of `v` which is set in the *mysql.precode*. From 11cbc44549cfed08973de84821447fedc146e2d9 Mon Sep 17 00:00:00 2001 From: Renjith Kamath Date: Sat, 14 Apr 2018 17:23:05 +0300 Subject: [PATCH 8/9] ZEPPELIN-3406 Travis build failure due to npm error ### What is this PR for? Travis build failure due to npm error e.g: https://travis-ci.org/TinkoffCreditSystems/zeppelin/jobs/365002217 ### What type of PR is it? Bug Fix ### Todos * [ ] - Task ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3406 ### 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: Renjith Kamath Closes #2928 from r-kamath/ZEPPELIN-3406 and squashes the following commits: 14ca6bed2 [Renjith Kamath] ZEPPELIN-3406 Travis build failure due to npm error (cherry picked from commit 7aa94ce) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a81441ccf5..29ad600517b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,7 +124,7 @@ before_install: - hasbowerchanged=$(echo $changedfiles | grep -c "bower.json" || true); - gitlog=$(git log $TRAVIS_COMMIT_RANGE 2>/dev/null) || gitlog="" - clearcache=$(echo $gitlog | grep -c -E "clear bower|bower clear" || true) - - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache clear; else echo "Using cached bower_components."; fi + - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache verify; else echo "Using cached bower_components."; fi - echo "MAVEN_OPTS='-Xms1024M -Xmx2048M -XX:MaxPermSize=1024m -XX:-UseGCOverheadLimit -Dorg.slf4j.simpleLogger.defaultLogLevel=warn'" >> ~/.mavenrc - ./testing/install_external_dependencies.sh - ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin || true From d6108051f5dce6b9f4e24eb1f5a49c9c23e273fc Mon Sep 17 00:00:00 2001 From: mebelousov Date: Sun, 15 Apr 2018 21:16:55 +0300 Subject: [PATCH 9/9] Revert "ZEPPELIN-3406 Travis build failure due to npm error" This reverts commit 11cbc44 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 29ad600517b..5a81441ccf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,7 +124,7 @@ before_install: - hasbowerchanged=$(echo $changedfiles | grep -c "bower.json" || true); - gitlog=$(git log $TRAVIS_COMMIT_RANGE 2>/dev/null) || gitlog="" - clearcache=$(echo $gitlog | grep -c -E "clear bower|bower clear" || true) - - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache verify; else echo "Using cached bower_components."; fi + - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache clear; else echo "Using cached bower_components."; fi - echo "MAVEN_OPTS='-Xms1024M -Xmx2048M -XX:MaxPermSize=1024m -XX:-UseGCOverheadLimit -Dorg.slf4j.simpleLogger.defaultLogLevel=warn'" >> ~/.mavenrc - ./testing/install_external_dependencies.sh - ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin || true