[GitHub] spark pull request #22794: [SPARK-24570][SQL] Implement Spark own GetTablesO...
Github user wangyum commented on a diff in the pull request:
https://github.com/apache/spark/pull/22794#discussion_r228422431
--- Diff:
sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/SparkMetadataOperationSuite.scala
---
@@ -0,0 +1,117 @@
+/*
+ * 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.hive.thriftserver
+
+import java.util.{Arrays => JArrays, List => JList, Properties}
+
+import org.apache.hive.jdbc.{HiveConnection, HiveQueryResultSet, Utils =>
JdbcUtils}
+import org.apache.hive.service.auth.PlainSaslHelper
+import org.apache.hive.service.cli.thrift._
+import org.apache.thrift.protocol.TBinaryProtocol
+import org.apache.thrift.transport.TSocket
+
+class SparkMetadataOperationSuite extends HiveThriftJdbcTest {
+
+ override def mode: ServerMode.Value = ServerMode.binary
+
+ private def withHiveQueryResultSet(
+ schema: String,
+ tableNamePattern: String,
+ tableTypes: JList[String])(f: HiveQueryResultSet => Unit): Unit = {
+val rawTransport = new TSocket("localhost", serverPort)
+val connection = new
HiveConnection(s"jdbc:hive2://localhost:$serverPort", new Properties)
+val user = System.getProperty("user.name")
+val transport = PlainSaslHelper.getPlainTransport(user, "anonymous",
rawTransport)
+val client = new TCLIService.Client(new TBinaryProtocol(transport))
+transport.open()
+
+var rs: HiveQueryResultSet = null
+
+try {
+ val openResp = client.OpenSession(new TOpenSessionReq)
+ val sessHandle = openResp.getSessionHandle
+
+ val getTableReq = new TGetTablesReq(sessHandle)
+ getTableReq.setSchemaName(schema)
+ getTableReq.setTableName(tableNamePattern)
+ getTableReq.setTableTypes(tableTypes)
+
+ val getTableResp = client.GetTables(getTableReq)
+
+ JdbcUtils.verifySuccess(getTableResp.getStatus)
+
+ rs = new HiveQueryResultSet.Builder(connection)
+.setClient(client)
+.setSessionHandle(sessHandle)
+.setStmtHandle(getTableResp.getOperationHandle)
+.build()
+
+ f(rs)
+} finally {
+ rs.close()
+ connection.close()
+ transport.close()
+ rawTransport.close()
+}
+ }
+
+ test("Spark's own GetTablesOperation(SparkGetTablesOperation)") {
--- End diff --
This test mimic
[`HiveDatabaseMetaData.getTables()`](https://github.com/apache/hive/blob/7c9689a9f5625b4b17f3ea6dc275bd55442407f3/jdbc/src/java/org/apache/hive/jdbc/HiveDatabaseMetaData.java#L634-L665).
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #22794: [SPARK-24570][SQL] Implement Spark own GetTablesO...
Github user wangyum commented on a diff in the pull request:
https://github.com/apache/spark/pull/22794#discussion_r228058051
--- Diff:
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkGetTablesOperation.scala
---
@@ -0,0 +1,121 @@
+/*
+ * 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.hive.thriftserver
+
+import java.util.{List => JList, Map => JMap, UUID}
+
+import scala.collection.JavaConverters.seqAsJavaListConverter
+
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObjectUtils
+import org.apache.hive.service.cli._
+import org.apache.hive.service.cli.operation.GetTablesOperation
+import org.apache.hive.service.cli.session.HiveSession
+
+import org.apache.spark.internal.Logging
+import org.apache.spark.sql.SQLContext
+import org.apache.spark.sql.catalyst.catalog.CatalogTableType._
+import org.apache.spark.sql.catalyst.catalog.SessionCatalog
+
+private[hive] class SparkGetTablesOperation(
--- End diff --
Fixed.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #22794: [SPARK-24570][SQL] Implement Spark own GetTablesO...
Github user wangyum commented on a diff in the pull request:
https://github.com/apache/spark/pull/22794#discussion_r228057957
--- Diff:
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkGetTablesOperation.scala
---
@@ -0,0 +1,121 @@
+/*
+ * 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.hive.thriftserver
+
+import java.util.{List => JList, Map => JMap, UUID}
+
+import scala.collection.JavaConverters.seqAsJavaListConverter
+
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObjectUtils
+import org.apache.hive.service.cli._
+import org.apache.hive.service.cli.operation.GetTablesOperation
+import org.apache.hive.service.cli.session.HiveSession
+
+import org.apache.spark.internal.Logging
+import org.apache.spark.sql.SQLContext
+import org.apache.spark.sql.catalyst.catalog.CatalogTableType._
+import org.apache.spark.sql.catalyst.catalog.SessionCatalog
+
+private[hive] class SparkGetTablesOperation(
+parentSession: HiveSession,
+catalogName: String,
+schemaName: String,
+tableName: String,
+tableTypes: JList[String])
+(sqlContext: SQLContext, sessionToActivePool: JMap[SessionHandle,
String])
--- End diff --
Fixed.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #22794: [SPARK-24570][SQL] Implement Spark own GetTablesO...
Github user wangyum commented on a diff in the pull request:
https://github.com/apache/spark/pull/22794#discussion_r228058028
--- Diff:
sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala
---
@@ -644,6 +644,47 @@ class HiveThriftBinaryServerSuite extends
HiveThriftJdbcTest {
assert(resultSet.getString(1) === "4.56")
}
}
+
+ test("SPARK-24196: SQL client(DBeaver) can't show tables") {
--- End diff --
Fixed.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #22794: [SPARK-24570][SQL] Implement Spark own GetTablesO...
Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/22794#discussion_r227872504
--- Diff:
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkGetTablesOperation.scala
---
@@ -0,0 +1,121 @@
+/*
+ * 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.hive.thriftserver
+
+import java.util.{List => JList, Map => JMap, UUID}
+
+import scala.collection.JavaConverters.seqAsJavaListConverter
+
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObjectUtils
+import org.apache.hive.service.cli._
+import org.apache.hive.service.cli.operation.GetTablesOperation
+import org.apache.hive.service.cli.session.HiveSession
+
+import org.apache.spark.internal.Logging
+import org.apache.spark.sql.SQLContext
+import org.apache.spark.sql.catalyst.catalog.CatalogTableType._
+import org.apache.spark.sql.catalyst.catalog.SessionCatalog
+
+private[hive] class SparkGetTablesOperation(
+parentSession: HiveSession,
+catalogName: String,
+schemaName: String,
+tableName: String,
+tableTypes: JList[String])
+(sqlContext: SQLContext, sessionToActivePool: JMap[SessionHandle,
String])
--- End diff --
Just add sqlContext in the class parameter.
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #22794: [SPARK-24570][SQL] Implement Spark own GetTablesO...
Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/22794#discussion_r227872346
--- Diff:
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkGetTablesOperation.scala
---
@@ -0,0 +1,121 @@
+/*
+ * 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.hive.thriftserver
+
+import java.util.{List => JList, Map => JMap, UUID}
+
+import scala.collection.JavaConverters.seqAsJavaListConverter
+
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObjectUtils
+import org.apache.hive.service.cli._
+import org.apache.hive.service.cli.operation.GetTablesOperation
+import org.apache.hive.service.cli.session.HiveSession
+
+import org.apache.spark.internal.Logging
+import org.apache.spark.sql.SQLContext
+import org.apache.spark.sql.catalyst.catalog.CatalogTableType._
+import org.apache.spark.sql.catalyst.catalog.SessionCatalog
+
+private[hive] class SparkGetTablesOperation(
+parentSession: HiveSession,
+catalogName: String,
+schemaName: String,
+tableName: String,
+tableTypes: JList[String])
+(sqlContext: SQLContext, sessionToActivePool: JMap[SessionHandle,
String])
--- End diff --
Just wondering why we need `sessionToActivePool`?
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #22794: [SPARK-24570][SQL] Implement Spark own GetTablesO...
Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/22794#discussion_r227869218
--- Diff:
sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala
---
@@ -644,6 +644,47 @@ class HiveThriftBinaryServerSuite extends
HiveThriftJdbcTest {
assert(resultSet.getString(1) === "4.56")
}
}
+
+ test("SPARK-24196: SQL client(DBeaver) can't show tables") {
--- End diff --
Create a `SparkMetadataOperationSuite`?
---
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
