Repository: hive Updated Branches: refs/heads/master 5663b9717 -> 1e3e74e54
HIVE-17456: Set current database for external LLAP interface (Jason Dere, reviewed by Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1e3e74e5 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1e3e74e5 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1e3e74e5 Branch: refs/heads/master Commit: 1e3e74e54d25921f96d1a0e0eae04d4aeb5a40bd Parents: 5663b97 Author: Jason Dere <jd...@hortonworks.com> Authored: Thu Sep 7 11:18:19 2017 -0700 Committer: Jason Dere <jd...@hortonworks.com> Committed: Thu Sep 7 11:18:19 2017 -0700 ---------------------------------------------------------------------- .../apache/hive/jdbc/TestJdbcWithMiniLlap.java | 22 +++++++++++++++++--- .../hadoop/hive/llap/LlapBaseInputFormat.java | 5 +++++ 2 files changed, 24 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1e3e74e5/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniLlap.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniLlap.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniLlap.java index 68d2ddc..28fa7a5 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniLlap.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniLlap.java @@ -156,8 +156,17 @@ public class TestJdbcWithMiniLlap { } private void createTestTable(String tableName) throws Exception { + createTestTable(null, tableName); + } + + private void createTestTable(String database, String tableName) throws Exception { Statement stmt = hs2Conn.createStatement(); + if (database != null) { + stmt.execute("CREATE DATABASE IF NOT EXISTS " + database); + stmt.execute("USE " + database); + } + // create table stmt.execute("DROP TABLE IF EXISTS " + tableName); stmt.execute("CREATE TABLE " + tableName @@ -225,12 +234,12 @@ public class TestJdbcWithMiniLlap { @Test(timeout = 60000) public void testNonAsciiStrings() throws Exception { - createTestTable("testtab1"); + createTestTable("nonascii", "testtab_nonascii"); RowCollector rowCollector = new RowCollector(); String nonAscii = "à côté du garçon"; - String query = "select value, '" + nonAscii + "' from testtab1 where under_col=0"; - int rowCount = processQuery(query, 1, rowCollector); + String query = "select value, '" + nonAscii + "' from testtab_nonascii where under_col=0"; + int rowCount = processQuery("nonascii", query, 1, rowCollector); assertEquals(3, rowCount); assertArrayEquals(new String[] {"val_0", nonAscii}, rowCollector.rows.get(0)); @@ -474,6 +483,10 @@ public class TestJdbcWithMiniLlap { } private int processQuery(String query, int numSplits, RowProcessor rowProcessor) throws Exception { + return processQuery(null, query, numSplits, rowProcessor); + } + + private int processQuery(String currentDatabase, String query, int numSplits, RowProcessor rowProcessor) throws Exception { String url = miniHS2.getJdbcURL(); String user = System.getProperty("user.name"); String pwd = user; @@ -488,6 +501,9 @@ public class TestJdbcWithMiniLlap { job.set(LlapBaseInputFormat.PWD_KEY, pwd); job.set(LlapBaseInputFormat.QUERY_KEY, query); job.set(LlapBaseInputFormat.HANDLE_ID, handleId); + if (currentDatabase != null) { + job.set(LlapBaseInputFormat.DB_KEY, currentDatabase); + } InputSplit[] splits = inputFormat.getSplits(job, numSplits); assertTrue(splits.length > 0); http://git-wip-us.apache.org/repos/asf/hive/blob/1e3e74e5/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java ---------------------------------------------------------------------- diff --git a/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java b/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java index 215f5b1..1708df1 100644 --- a/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java +++ b/llap-ext-client/src/java/org/apache/hadoop/hive/llap/LlapBaseInputFormat.java @@ -109,6 +109,7 @@ public class LlapBaseInputFormat<V extends WritableComparable<?>> public static final String USER_KEY = "llap.if.user"; public static final String PWD_KEY = "llap.if.pwd"; public static final String HANDLE_ID = "llap.if.handleid"; + public static final String DB_KEY = "llap.if.database"; public final String SPLIT_QUERY = "select get_splits(\"%s\",%d)"; public static final LlapServiceInstance[] serviceInstanceArray = new LlapServiceInstance[0]; @@ -210,6 +211,7 @@ public class LlapBaseInputFormat<V extends WritableComparable<?>> if (query == null) query = job.get(QUERY_KEY); if (user == null) user = job.get(USER_KEY); if (pwd == null) pwd = job.get(PWD_KEY); + String database = job.get(DB_KEY); if (url == null || query == null) { throw new IllegalStateException(); @@ -239,6 +241,9 @@ public class LlapBaseInputFormat<V extends WritableComparable<?>> try ( Statement stmt = conn.createStatement(); ) { + if (database != null && !database.isEmpty()) { + stmt.execute("USE " + database); + } ResultSet res = stmt.executeQuery(sql); while (res.next()) { // deserialize split
