Skip to content

[SPARK-50216][SQL][TESTS] Update CollationBenchmark to invoke collationNameToId outside of cases #48804

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
stevomitric wants to merge 12 commits into from
Closed

[SPARK-50216][SQL][TESTS] Update CollationBenchmark to invoke collationNameToId outside of cases #48804

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f582fe9
early-out check for utf8_binary
stevomitric Nov 8, 2024
9cbad8a
fix benchmark
stevomitric Nov 8, 2024
44d56fb
revert changes
stevomitric Nov 8, 2024
47693a9
add early-out check
stevomitric Nov 8, 2024
2951355
add benchmarks
stevomitric Nov 11, 2024
95b259e
revert collation benchmark
stevomitric Nov 12, 2024
882f980
revert collation-factory changes, modify the benchmarks
stevomitric Nov 13, 2024
ef5b065
Merge branch 'master' into stevomitric/fix-utf8_binary-regression
stevomitric Nov 13, 2024
d67fd93
revert benchmarks
stevomitric Nov 13, 2024
daf0b8d
revert changes
stevomitric Nov 13, 2024
2139918
add benchmark
stevomitric Nov 13, 2024
5680954
add non-ascii benchmarks
stevomitric Nov 14, 2024
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
4 changes: 4 additions & 0 deletions common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,10 @@ private CollationSpecUTF8(

private static int collationNameToId(String originalName, String collationName)
throws SparkException {
// Have a check for UTF8_BINARY collation to early-out and not introduce any regression.
if (UTF8_BINARY_COLLATION.collationName.equals(collationName)) {
return UTF8_BINARY_COLLATION_ID;
}

int baseId;
String collationNamePrefix;
Expand Down
12 changes: 6 additions & 6 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/benchmark/CollationBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ abstract class CollationBenchmarkBase extends BenchmarkBase {
warmupTime = 10.seconds,
output = output)
collationTypes.foreach { collationType => {
val collation = CollationFactory.fetchCollation(collationType)
val collationId = CollationFactory.collationNameToId(collationType)
Copy link
Member

@dongjoon-hyun dongjoon-hyun Nov 11, 2024

Choose a reason for hiding this comment

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

Can we avoid touching the benchmark in the PR, @stevomitric ?

If we need this, we can proceed separately this CollationBenchmark change before your regression fix.

Copy link
Contributor Author

@stevomitric stevomitric Nov 11, 2024

Choose a reason for hiding this comment

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

The regression was partially due to benchmarks as well. The CollationFactory.collationNameToId function should only be called fixed amount of times per query, which shouldn't measurably impact the performance of the query.

So i think this is the right PR for it, since it was the leading contributor to the numbers seen in the results.

benchmark.addCase(s"$collationType") { _ =>
sublistStrings.foreach { s1 =>
utf8Strings.foreach { s =>
(0 to 3).foreach { _ =>
CollationSupport.Contains.exec(
s, s1, CollationFactory.collationNameToId(collation.collationName)
s, s1, collationId
)
}
}
Expand All @@ -141,13 +141,13 @@ abstract class CollationBenchmarkBase extends BenchmarkBase {
warmupTime = 10.seconds,
output = output)
collationTypes.foreach { collationType => {
val collation = CollationFactory.fetchCollation(collationType)
val collationId = CollationFactory.collationNameToId(collationType)
benchmark.addCase(s"$collationType") { _ =>
sublistStrings.foreach { s1 =>
utf8Strings.foreach { s =>
(0 to 3).foreach { _ =>
CollationSupport.StartsWith.exec(
s, s1, CollationFactory.collationNameToId(collation.collationName)
s, s1, collationId
)
}
}
Expand All @@ -169,13 +169,13 @@ abstract class CollationBenchmarkBase extends BenchmarkBase {
warmupTime = 10.seconds,
output = output)
collationTypes.foreach { collationType => {
val collation = CollationFactory.fetchCollation(collationType)
val collationId = CollationFactory.collationNameToId(collationType)
benchmark.addCase(s"$collationType") { _ =>
sublistStrings.foreach { s1 =>
utf8Strings.foreach { s =>
(0 to 3).foreach { _ =>
CollationSupport.EndsWith.exec(
s, s1, CollationFactory.collationNameToId(collation.collationName)
s, s1, collationId
)
}
}
Expand Down