Skip to content

[SPARK-32970][SQL][TEST] Reduce the runtime of an UT for SPARK-32019 #29842

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
tanelk wants to merge 4 commits into from
Closed

[SPARK-32970][SQL][TEST] Reduce the runtime of an UT for SPARK-32019 #29842

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45dee3f
Reduce the runtime of an UT
tanelk Sep 22, 2020
d71ad45
Add FILES_OPEN_COST_IN_BYTES conf to UT
tanelk Sep 25, 2020
4f386f4
Move config closer to slow tests
tanelk Sep 28, 2020
42020ee
8 -> 16
tanelk Sep 28, 2020
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
58 changes: 30 additions & 28 deletions ...e/src/test/scala/org/apache/spark/sql/execution/datasources/FileSourceStrategySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,37 +529,39 @@ class FileSourceStrategySuite extends QueryTest with SharedSparkSession with Pre
}

test("SPARK-32019: Add spark.sql.files.minPartitionNum config") {
withSQLConf(SQLConf.FILES_MIN_PARTITION_NUM.key -> "1") {
val table =
createTable(files = Seq(
"file1" -> 1,
"file2" -> 1,
"file3" -> 1
))
assert(table.rdd.partitions.length == 1)
}
withSQLConf(SQLConf.FILES_MAX_PARTITION_BYTES.key -> "2MB") {

@ulysses-you ulysses-you Sep 23, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we add the config spark.sql.files.openCostInBytes ? The result is based on it although we don't change the default value.

@tanelk tanelk Sep 25, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done

withSQLConf(SQLConf.FILES_MIN_PARTITION_NUM.key -> "1") {

@maropu maropu Sep 28, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think it is okay just to update the slow two tests only in this PR.

@tanelk tanelk Sep 28, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done

val table =
createTable(files = Seq(
"file1" -> 1,
"file2" -> 1,
"file3" -> 1
))
assert(table.rdd.partitions.length == 3)
}

withSQLConf(SQLConf.FILES_MIN_PARTITION_NUM.key -> "10") {
val table =
createTable(files = Seq(
"file1" -> 1,
"file2" -> 1,
"file3" -> 1
))
assert(table.rdd.partitions.length == 3)
}
withSQLConf(SQLConf.FILES_MIN_PARTITION_NUM.key -> "10") {
val table =
createTable(files = Seq(
"file1" -> 1,
"file2" -> 1,
"file3" -> 1
))
assert(table.rdd.partitions.length == 3)
}

withSQLConf(SQLConf.FILES_MIN_PARTITION_NUM.key -> "16") {
val partitions = (1 to 100).map(i => s"file$i" -> 128 * 1024 * 1024)
val table = createTable(files = partitions)
// partition is limited by filesMaxPartitionBytes(128MB)
assert(table.rdd.partitions.length == 100)
}
withSQLConf(SQLConf.FILES_MIN_PARTITION_NUM.key -> "8") {
val partitions = (1 to 12).map(i => s"file$i" -> 2 * 1024 * 1024)
val table = createTable(files = partitions)
// partition is limited by filesMaxPartitionBytes(2MB)
assert(table.rdd.partitions.length == 12)
}

withSQLConf(SQLConf.FILES_MIN_PARTITION_NUM.key -> "32") {
val partitions = (1 to 800).map(i => s"file$i" -> 4 * 1024 * 1024)
val table = createTable(files = partitions)
assert(table.rdd.partitions.length == 50)
withSQLConf(SQLConf.FILES_MIN_PARTITION_NUM.key -> "8") {

@maropu maropu Sep 28, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

8 -> 16 for keeping the original test context?

@tanelk tanelk Sep 28, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sure

val partitions = (1 to 12).map(i => s"file$i" -> 4 * 1024 * 1024)
val table = createTable(files = partitions)
assert(table.rdd.partitions.length == 24)
}
}
}

Expand Down