Skip to content

[SPARK-23486]cache the function name from the external catalog for lookupFunctions #20795

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

Closed
kevinyu98 wants to merge 12 commits into from
Closed

[SPARK-23486]cache the function name from the external catalog for lookupFunctions #20795

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5c8648c
cache the function name from the catalog for lookupFunction
kevinyu98 Mar 11, 2018
caf6b6d
address comments and add test cases
kevinyu98 Mar 13, 2018
b8871e2
commit the new testcase file
kevinyu98 Mar 13, 2018
14c62e4
add normalize during function name lookup
kevinyu98 Mar 16, 2018
5c6687c
just cache external function name
kevinyu98 Mar 19, 2018
e030bd0
fix the HiveSQLViewSuite failure
kevinyu98 Mar 21, 2018
6358b92
address comments
kevinyu98 Mar 26, 2018
74b01a5
changing the APIs in SessionCatalog
kevinyu98 Apr 10, 2018
27246fb
address comments
kevinyu98 Jul 10, 2018
8dceda9
fix style
kevinyu98 Jul 11, 2018
0db2826
add isRegisteredFunction check
kevinyu98 Jul 12, 2018
26f2f54
check case sensitive
kevinyu98 Jul 12, 2018
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
Prev Previous commit
Next Next commit
just cache external function name
  • Loading branch information
@kevinyu98
kevinyu98 committed Jul 10, 2018
commit 5c6687c12656453d6fdc43ae8b1dee759c9ee294
17 changes: 10 additions & 7 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,29 +1207,32 @@ class Analyzer(
* only performs simple existence check according to the function identifier to quickly identify
* undefined functions without triggering relation resolution, which may incur potentially
* expensive partition/schema discovery process in some cases.
*
* In order to avoid duplicate external functions lookup, the external function identifier will
* store in the local hash set externalFunctionNameSet.
* @see [[ResolveFunctions]]
* @see https://issues.apache.org/jira/browse/SPARK-19737
*/
object LookupFunctions extends Rule[LogicalPlan] {
override def apply(plan: LogicalPlan): LogicalPlan = {
val catalogFunctionNameSet = new mutable.HashSet[FunctionIdentifier]()
val externalFunctionNameSet = new mutable.HashSet[FunctionIdentifier]()
plan.transformAllExpressions {
case f: UnresolvedFunction
if catalogFunctionNameSet.contains(normalizeFuncName(f.name)) => f
case f: UnresolvedFunction if catalog.functionExists(f.name) =>
catalogFunctionNameSet.add(normalizeFuncName(f.name))
if externalFunctionNameSet.contains(normalizeFuncName(f.name)) => f
case f: UnresolvedFunction if catalog.buildinFunctionExists(f.name) => f
case f: UnresolvedFunction if catalog.externalFunctionExists(f.name) =>
externalFunctionNameSet.add(normalizeFuncName(f.name))
f
case f: UnresolvedFunction =>
withPosition(f) {
throw new NoSuchFunctionException(f.name.database.getOrElse("default"),
throw new NoSuchFunctionException(f.name.database.getOrElse(catalog.getCurrentDatabase),
f.name.funcName)
}
}
}

private def normalizeFuncName(name: FunctionIdentifier): FunctionIdentifier = {
FunctionIdentifier(name.funcName.toLowerCase(Locale.ROOT), name.database)
FunctionIdentifier(name.funcName.toLowerCase(Locale.ROOT),
name.database.orElse(Some(catalog.getCurrentDatabase)))
Copy link
Contributor

@dilipbiswal dilipbiswal Jul 12, 2018

Choose a reason for hiding this comment

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

@kevinyu98 I have a question. So we normalize the funcName here. How about name.database ? Is that normalized already by the time we are here ?

Copy link
Contributor

@dilipbiswal dilipbiswal Jul 12, 2018

Choose a reason for hiding this comment

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

@kevinyu98 how about consideration of conf.caseSensitiveAnalysis ?

Copy link
Contributor Author

@kevinyu98 kevinyu98 Jul 12, 2018

Choose a reason for hiding this comment

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

yes, I will change the code for the name.database. Thanks.

}
}

Expand Down
10 changes: 10 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,16 @@ class SessionCatalog(
externalCatalog.functionExists(db, name.funcName)
}

def buildinFunctionExists(name: FunctionIdentifier): Boolean = {
functionRegistry.functionExists(name)
}

def externalFunctionExists(name: FunctionIdentifier): Boolean = {
val db = formatDatabaseName(name.database.getOrElse(getCurrentDatabase))
requireDbExists(db)
externalCatalog.functionExists(db, name.funcName)
}

Copy link
Contributor

@WeichenXu123 WeichenXu123 Mar 21, 2018

Choose a reason for hiding this comment

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

To avoid code duplication, you should modify the functionExists like:

def functionExists(name: FunctionIdentifier): Boolean = {
  buildinFunctionExists(name) || externalFunctionExists(name)
}

Copy link
Contributor Author

@kevinyu98 kevinyu98 Mar 21, 2018

Choose a reason for hiding this comment

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

ok, I will change.

// ----------------------------------------------------------------
// | Methods that interact with temporary and metastore functions |
// ----------------------------------------------------------------
Expand Down