Skip to content

[CORE] Fix deadlock risk in XSQLSessionCatalog #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[CORE] Fix deadlock risk in XSQLSessionCatalog #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sql/xsql/src/main/scala/org/apache/spark/sql/xsql/XSQLExternalCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ private[xsql] class XSQLExternalCatalog(conf: SparkConf, hadoopConf: Configurati

override def setCurrentDatabase(dbName: String): Unit = {
withWorkingDSDB(dbName) { (_, db, _, _) =>
currentDataBase = Option(db)
synchronized {currentDataBase = Option(db) }
}
}

Expand Down
52 changes: 28 additions & 24 deletions sql/xsql/src/main/scala/org/apache/spark/sql/xsql/XSQLSessionCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,34 +838,38 @@ private[xsql] class XSQLSessionCatalog(
* and set the current database to "default".
* This is mainly used for tests.
*/
override def reset(): Unit = synchronized {
override def reset(): Unit = {
val defaultDataSource = conf.getConf(XSQL_DEFAULT_DATASOURCE)
val defaultDatabase = conf.getConf(XSQL_DEFAULT_DATABASE)
setCurrentDatabase(defaultDataSource, defaultDatabase)
listDatabasesForXSQL(defaultDataSource).filter(_ != defaultDatabase).foreach { db =>
dropDatabase(Some(defaultDataSource), db, ignoreIfNotExists = false, cascade = true)
}
listTablesForXSQL(defaultDataSource, defaultDatabase).foreach { table =>
dropTable(table, ignoreIfNotExists = false, purge = false)
}
listFunctions(defaultDataSource, defaultDatabase).map(_._1).foreach { func =>
if (func.database.isDefined) {
dropFunction(func, ignoreIfNotExists = false)
} else {
dropTempFunction(func.funcName, ignoreIfNotExists = false)
setWorkingDataSource(Option(defaultDataSource)) {
synchronized {
setCurrentDatabase(defaultDataSource, defaultDatabase)
listDatabasesForXSQL(defaultDataSource).filter(_ != defaultDatabase).foreach { db =>
dropDatabase(Some(defaultDataSource), db, ignoreIfNotExists = false, cascade = true)
}
listTablesForXSQL(defaultDataSource, defaultDatabase).foreach { table =>
dropTable(table, ignoreIfNotExists = false, purge = false)
}
listFunctions(defaultDataSource, defaultDatabase).map(_._1).foreach { func =>
if (func.database.isDefined) {
dropFunction(func, ignoreIfNotExists = false)
} else {
dropTempFunction(func.funcName, ignoreIfNotExists = false)
}
}
clearTempTables()
globalTempViewManager.clear()
functionRegistry.clear()
// restore built-in functions
FunctionRegistry.builtin.listFunction().foreach { f =>
val expressionInfo = FunctionRegistry.builtin.lookupFunction(f)
val functionBuilder = FunctionRegistry.builtin.lookupFunctionBuilder(f)
require(expressionInfo.isDefined, s"built-in function '$f' is missing expression info")
require(functionBuilder.isDefined, s"built-in function '$f' is missing function builder")
functionRegistry.registerFunction(f, expressionInfo.get, functionBuilder.get)
}
}
}
clearTempTables()
globalTempViewManager.clear()
functionRegistry.clear()
// restore built-in functions
FunctionRegistry.builtin.listFunction().foreach { f =>
val expressionInfo = FunctionRegistry.builtin.lookupFunction(f)
val functionBuilder = FunctionRegistry.builtin.lookupFunctionBuilder(f)
require(expressionInfo.isDefined, s"built-in function '$f' is missing expression info")
require(functionBuilder.isDefined, s"built-in function '$f' is missing function builder")
functionRegistry.registerFunction(f, expressionInfo.get, functionBuilder.get)
}
}

/**
Expand Down