Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add GetSchemasOperation
  • Loading branch information
wangyum committed Oct 31, 2018
commit e4f7205cf07ab9230f1546b70ff115d92184c8b7
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* 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.UUID

import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType
import org.apache.hive.service.cli._
import org.apache.hive.service.cli.operation.GetSchemasOperation
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.SessionCatalog

/**
* Spark's own GetSchemasOperation
*
* @param sqlContext SQLContext to use
* @param parentSession a HiveSession from SessionManager
* @param catalogName catalog name. null if not applicable.
* @param schemaName database name, null or a concrete database name
*/
private[hive] class SparkGetSchemasOperation(
sqlContext: SQLContext,
parentSession: HiveSession,
catalogName: String,
schemaName: String)
extends GetSchemasOperation(parentSession, catalogName, schemaName) with Logging {

val catalog: SessionCatalog = sqlContext.sessionState.catalog

private final val RESULT_SET_SCHEMA = new TableSchema()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this can be removed too.

.addStringColumn("TABLE_SCHEM", "Schema name.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: TABLE_SCHEMA?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's copy from GetSchemasOperation.java#L49 and HiveDatabaseMetaData also use TABLE_SCHEMA.

.addStringColumn("TABLE_CATALOG", "Catalog name.")

private val rowSet = RowSetFactory.create(RESULT_SET_SCHEMA, getProtocolVersion)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed.


private var statementId: String = _

override def close(): Unit = {
logInfo(s"Close get schemas with $statementId")
setState(OperationState.CLOSED)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same here.

}

override def runInternal(): Unit = {
statementId = UUID.randomUUID().toString
logInfo(s"Getting schemas with $statementId")
setState(OperationState.RUNNING)
// Always use the latest class loader provided by executionHive's state.
val executionHiveClassLoader = sqlContext.sharedState.jarClassLoader
Thread.currentThread().setContextClassLoader(executionHiveClassLoader)

if (isAuthV2Enabled) {
val cmdStr = s"catalog : $catalogName, schemaPattern : $schemaName"
authorizeMetaGets(HiveOperationType.GET_TABLES, null, cmdStr)
}

try {
catalog.listDatabases(convertSchemaPattern(schemaName)).foreach { dbName =>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wangyum, IIRC, not only DBs but other metadata are not being shown as well (correct me if I am wrong because I tested it a while ago so can't exactly remember). Can you double check if only database is missing?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, that's true, none of the metadata operations is implemented currently..

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I think implementing GetSchemasOperation, GetTablesOperation and GetColumnsOperation is enough.

rowSet.addRow(Array[AnyRef](dbName, ""))
}
setState(OperationState.FINISHED)
} catch {
case e: HiveSQLException =>
setState(OperationState.ERROR)
throw e
}
}

override def getNextRowSet(order: FetchOrientation, maxRows: Long): RowSet = {
validateDefaultFetchOrientation(order)
assertState(OperationState.FINISHED)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the reason you need to change the order between line 87 and 88?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This copy from SparkExecuteStatementOperation. Has reverted it.

validateDefaultFetchOrientation(order)
assertState(OperationState.FINISHED)
setHasResultSet(true)

setHasResultSet(true)
if (order.equals(FetchOrientation.FETCH_FIRST)) {
rowSet.setStartOffset(0)
}
rowSet.extractSubset(maxRows.toInt)
}

override def cancel(): Unit = {
logInfo(s"Cancel get schemas with $statementId")
setState(OperationState.CANCELED)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not calling the default cancel()?

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import java.util.{Map => JMap}
import java.util.concurrent.ConcurrentHashMap

import org.apache.hive.service.cli._
import org.apache.hive.service.cli.operation.{ExecuteStatementOperation, Operation, OperationManager}
import org.apache.hive.service.cli.operation.{ExecuteStatementOperation, GetSchemasOperation, Operation, OperationManager}
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.hive.HiveUtils
import org.apache.spark.sql.hive.thriftserver.{ReflectionUtils, SparkExecuteStatementOperation}
import org.apache.spark.sql.hive.thriftserver.{ReflectionUtils, SparkExecuteStatementOperation, SparkGetSchemasOperation}
import org.apache.spark.sql.internal.SQLConf

/**
Expand Down Expand Up @@ -63,6 +63,19 @@ private[thriftserver] class SparkSQLOperationManager()
operation
}

override def newGetSchemasOperation(
parentSession: HiveSession,
catalogName: String,
schemaName: String): GetSchemasOperation = synchronized {
val sqlContext = sessionToContexts.get(parentSession.getSessionHandle)
require(sqlContext != null, s"Session handle: ${parentSession.getSessionHandle} has not been" +
s" initialized or had already closed.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit .. : s can be removed.

val operation = new SparkGetSchemasOperation(sqlContext, parentSession, catalogName, schemaName)
handleToOperation.put(operation.getHandle, operation)
logDebug(s"Created GetSchemasOperation with session=$parentSession.")
operation
}

def setConfMap(conf: SQLConf, confMap: java.util.Map[String, String]): Unit = {
val iterator = confMap.entrySet().iterator()
while (iterator.hasNext) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,22 @@ abstract class HiveThriftJdbcTest extends HiveThriftServer2Test {
}
}

def withDatabase(dbNames: String*)(fs: (Statement => Unit)*) {
val user = System.getProperty("user.name")
val connections = fs.map { _ => DriverManager.getConnection(jdbcUri, user, "") }
val statements = connections.map(_.createStatement())

try {
statements.zip(fs).foreach { case (s, f) => f(s) }
} finally {
dbNames.foreach { name =>
statements(0).execute(s"DROP DATABASE IF EXISTS $name")
}
statements.foreach(_.close())
connections.foreach(_.close())
}
}

def withJdbcStatement(tableNames: String*)(f: Statement => Unit) {
withMultipleConnectionJdbcStatement(tableNames: _*)(f)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
/*
* 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.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

test("Spark's own GetSchemasOperation(SparkGetSchemasOperation)") {
def testGetSchemasOperation(
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

catalog: String,
schemaPattern: 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 schemaReq = new TGetSchemasReq(sessHandle)

if (catalog != null) {
schemaReq.setCatalogName(catalog)
}

if (schemaPattern == null) {
schemaReq.setSchemaName("%")
} else {
schemaReq.setSchemaName(schemaPattern)
}

val schemaResp = client.GetSchemas(schemaReq)
JdbcUtils.verifySuccess(schemaResp.getStatus)

rs = new HiveQueryResultSet.Builder(connection)
.setClient(client)
.setSessionHandle(sessHandle)
.setStmtHandle(schemaResp.getOperationHandle)
.build()
f(rs)
} finally {
rs.close()
connection.close()
transport.close()
rawTransport.close()
}
}

def checkResult(dbNames: Seq[String], rs: HiveQueryResultSet): Unit = {
if (dbNames.nonEmpty) {
for (i <- dbNames.indices) {
assert(rs.next())
assert(rs.getString("TABLE_SCHEM") === dbNames(i))
}
} else {
assert(!rs.next())
}
}

withDatabase("db1", "db2") { statement =>
Seq("CREATE DATABASE db1", "CREATE DATABASE db2").foreach(statement.execute)

testGetSchemasOperation(null, "%") { rs =>
checkResult(Seq("db1", "db2"), rs)
}
testGetSchemasOperation(null, "db1") { rs =>
checkResult(Seq("db1"), rs)
}
testGetSchemasOperation(null, "db_not_exist") { rs =>
checkResult(Seq.empty, rs)
}
testGetSchemasOperation(null, "db*") { rs =>
checkResult(Seq("db1", "db2"), rs)
}
}
}
}