From 3f486bee879c6711851b310e37839491a3b93270 Mon Sep 17 00:00:00 2001 From: Daniel Fernandez Date: Thu, 14 Sep 2017 18:11:40 -0300 Subject: [PATCH 1/5] HiveDialect implementation done --- .../apache/spark/sql/jdbc/HiveDialect.scala | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 sql/core/src/main/scala/org/apache/spark/sql/jdbc/HiveDialect.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/HiveDialect.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/HiveDialect.scala new file mode 100644 index 000000000000..a07535cb2049 --- /dev/null +++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/HiveDialect.scala @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ + +package org.apache.spark.sql.jdbc + +object HiveDialect extends JdbcDialect { + + override def canHandle(url: String): Boolean = url.startsWith("jdbc:hive2") + + override def quoteIdentifier(colName: String): String = s"`$colName`" + +} From c0d262455633b7d302124e963b05efb7afda2dcb Mon Sep 17 00:00:00 2001 From: Daniel Fernandez Date: Thu, 14 Sep 2017 18:12:01 -0300 Subject: [PATCH 2/5] HiveDialect registration added --- .../src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala index 7c38ed68c041..48a977b81268 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala @@ -200,6 +200,7 @@ object JdbcDialects { registerDialect(DerbyDialect) registerDialect(OracleDialect) registerDialect(TeradataDialect) + registerDialect(HiveDialect) /** * Fetch the JdbcDialect class corresponding to a given database url. From f704950eedcd7662db4020eae70aa5351bb3e611 Mon Sep 17 00:00:00 2001 From: Daniel Fernandez Date: Thu, 14 Sep 2017 18:12:18 -0300 Subject: [PATCH 3/5] Tests for the HiveDialect added --- .../org/apache/spark/sql/jdbc/JDBCSuite.scala | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala index 40179261ab20..bd979041199c 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala @@ -1103,6 +1103,17 @@ class JDBCSuite extends SparkFunSuite """.stripMargin) val df3 = sql("SELECT * FROM test_sessionInitStatement") - assert(df3.collect() === Array(Row(21519, 1234))) - } + assert(df3.collect() === Array(Row(21519, 1234)) + ) + } + + test("Hive dialect registration") { + assert(JdbcDialects.get("jdbc:hive2://127.0.0.1/db") == HiveDialect) + } + + test("Hive dialect quoted identifier") { + val dialect = JdbcDialects.get("jdbc:hive2://127.0.0.1/db") + val quotedIdentifier = dialect.quoteIdentifier("a_column") + assert(quotedIdentifier == "`a_column`") + } } From 7d3a6d6f8b4e618d8ada9ff766609a3a98663338 Mon Sep 17 00:00:00 2001 From: Daniel Fernandez Date: Fri, 15 Sep 2017 14:11:28 -0300 Subject: [PATCH 4/5] Code indentation fixed in JDBCSuite --- .../src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala index bd979041199c..dc1f0c328053 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala @@ -1103,9 +1103,8 @@ class JDBCSuite extends SparkFunSuite """.stripMargin) val df3 = sql("SELECT * FROM test_sessionInitStatement") - assert(df3.collect() === Array(Row(21519, 1234)) - ) - } + assert(df3.collect() === Array(Row(21519, 1234))) + } test("Hive dialect registration") { assert(JdbcDialects.get("jdbc:hive2://127.0.0.1/db") == HiveDialect) From 12bc9ca49e4d4b7fa5376a4d3c235a0acadb7c97 Mon Sep 17 00:00:00 2001 From: Daniel Fernandez Date: Mon, 18 Sep 2017 11:36:41 -0300 Subject: [PATCH 5/5] JDBCSuite indentation issues fixed --- .../test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala index dc1f0c328053..f148b9d0810f 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala @@ -1100,11 +1100,11 @@ class JDBCSuite extends SparkFunSuite |OPTIONS (url '$urlWithUserAndPass', |dbtable '(SELECT NVL(@MYTESTVAR1, -1), NVL(@MYTESTVAR2, -1))', |sessionInitStatement 'SET @MYTESTVAR1 21519; SET @MYTESTVAR2 1234') - """.stripMargin) + """.stripMargin) - val df3 = sql("SELECT * FROM test_sessionInitStatement") - assert(df3.collect() === Array(Row(21519, 1234))) - } + val df3 = sql("SELECT * FROM test_sessionInitStatement") + assert(df3.collect() === Array(Row(21519, 1234))) + } test("Hive dialect registration") { assert(JdbcDialects.get("jdbc:hive2://127.0.0.1/db") == HiveDialect)