You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ur...@apache.org on 2026/08/18 14:36:41 UTC
(spark) branch branch-4.x updated: [SPARK-58822][SQL][TEST] Extract a nonEmptyLines helper in LogicalPlanDifferenceSuite
This is an automated email from the ASF dual-hosted git repository.
uros-b pushed a commit to branch branch-4.x
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.x by this push:
new e35305859e31 [SPARK-58822][SQL][TEST] Extract a nonEmptyLines helper in LogicalPlanDifferenceSuite
e35305859e31 is described below
commit e35305859e31df802f5cad0b70fd0150f5409d3f
Author: Uros <22...@users.noreply.github.com>
AuthorDate: Tue Aug 18 14:36:19 2026 +0000
[SPARK-58822][SQL][TEST] Extract a nonEmptyLines helper in LogicalPlanDifferenceSuite
### What changes were proposed in this pull request?
Extracts a single private helper in `LogicalPlanDifferenceSuite` and routes 20 call sites through it:
```scala
/** Splits `text` into lines, dropping any empty ones. */
private def nonEmptyLines(text: String): Array[String] =
text.split("\n").filter(_.nonEmpty)
```
### Why are the changes needed?
The idiom `X.split("\n").filter(_.nonEmpty)` was repeated 20 times, twice per test, which buries what each test is actually asserting under a parsing incantation. Naming it once reduces the per-test maintenance surface in this suite.
### Does this PR introduce _any_ user-facing change?
No. Test-only refactor.
### How was this patch tested?
Existing suite. The helper body is the extracted expression verbatim and keeps the `Array[String]` return type, so every downstream `.length`, index access, and `mkString` is unchanged; equivalence holds for empty, single-line, multi-line, and trailing-newline inputs. Scoped to this one file.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Opus 4.8)
Closes #58048 from uros-b/helper-planvsplan-nonemptylines.
Authored-by: Uros <22...@users.noreply.github.com>
Signed-off-by: Uros Bojanic <22...@users.noreply.github.com>
(cherry picked from commit 67e731741f6c71558e0b0711b6dda4fe8eff9b76)
Signed-off-by: Uros Bojanic <22...@users.noreply.github.com>
---
.../resolver/LogicalPlanDifferenceSuite.scala | 44 ++++++++++++----------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/resolver/LogicalPlanDifferenceSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/resolver/LogicalPlanDifferenceSuite.scala
index 36e739969b40..6a6cc1c64e41 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/resolver/LogicalPlanDifferenceSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/resolver/LogicalPlanDifferenceSuite.scala
@@ -39,6 +39,10 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
private val FILTER = "Filter"
private val PROJECT = "Project"
+ /** Splits `text` into lines, dropping any empty ones. */
+ private def nonEmptyLines(text: String): Array[String] =
+ text.split("\n").filter(_.nonEmpty)
+
test("identical plans should return empty strings") {
val plan1 = LocalRelation(idAttr, nameAttr)
val plan2 = LocalRelation(idAttr, nameAttr)
@@ -88,8 +92,8 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
assert(result2.contains("age") || result2.contains("50"))
// Should NOT contain operations too far away (limit is at the top)
- val lines1 = result1.split("\n").filter(_.nonEmpty).length
- val lines2 = result2.split("\n").filter(_.nonEmpty).length
+ val lines1 = nonEmptyLines(result1).length
+ val lines2 = nonEmptyLines(result2).length
assert(
lines1 <= 7,
s"Expected at most 7 lines (2 before + mismatch + 2 after + margins), got $lines1"
@@ -159,8 +163,8 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
assert(result2.contains(FILTER))
// Both should have truncated output
- val lines1 = result1.split("\n").filter(_.nonEmpty).length
- val lines2 = result2.split("\n").filter(_.nonEmpty).length
+ val lines1 = nonEmptyLines(result1).length
+ val lines2 = nonEmptyLines(result2).length
assert(lines1 >= 1 && lines1 <= 7, s"Expected 1-7 lines, got $lines1")
assert(lines2 >= 1 && lines2 <= 7, s"Expected 1-7 lines, got $lines2")
@@ -190,8 +194,8 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
val (result1, result2) = LogicalPlanDifference(plan1, plan2, 0)
// With 0 context lines, should only show the mismatched line
- val lines1 = result1.split("\n").filter(_.nonEmpty)
- val lines2 = result2.split("\n").filter(_.nonEmpty)
+ val lines1 = nonEmptyLines(result1)
+ val lines2 = nonEmptyLines(result2)
// Should have exactly 1 line (the mismatch)
assert(lines1.length == 1, s"Expected 1 line, got ${lines1.length}: ${lines1.mkString("; ")}")
@@ -237,8 +241,8 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
val (result1, result2) = LogicalPlanDifference(plan1, plan2, 5)
// With 5 context lines, should show 5 before, mismatch, and 5 after (11 total)
- val lines1 = result1.split("\n").filter(_.nonEmpty)
- val lines2 = result2.split("\n").filter(_.nonEmpty)
+ val lines1 = nonEmptyLines(result1)
+ val lines2 = nonEmptyLines(result2)
assert(lines1.length >= 10, s"Expected at least 10 lines, got ${lines1.length}")
assert(lines2.length >= 10, s"Expected at least 10 lines, got ${lines2.length}")
@@ -281,8 +285,8 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
val (result1, result2) = LogicalPlanDifference(plan1, plan2, 2)
// The mismatch is at the top (Project vs GlobalLimit), so both should show their top portions
- val lines1 = result1.split("\n").filter(_.nonEmpty)
- val lines2 = result2.split("\n").filter(_.nonEmpty)
+ val lines1 = nonEmptyLines(result1)
+ val lines2 = nonEmptyLines(result2)
assert(lines1.length >= 1, s"Plan1 should have at least 1 line, got ${lines1.length}")
assert(lines2.length >= 1, s"Plan2 should have at least 1 line, got ${lines2.length}")
@@ -313,8 +317,8 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
val (result1, result2) = LogicalPlanDifference(plan1, plan2, 2)
- val lines1 = result1.split("\n").filter(_.nonEmpty)
- val lines2 = result2.split("\n").filter(_.nonEmpty)
+ val lines1 = nonEmptyLines(result1)
+ val lines2 = nonEmptyLines(result2)
// Both should have content
assert(lines1.length >= 1, s"Plan1 should have at least 1 line")
@@ -371,8 +375,8 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
assert(result1 != result2, "Plans should produce different output strings")
// Should be truncated (not showing all operations)
- val lines1 = result1.split("\n").filter(_.nonEmpty).length
- val lines2 = result2.split("\n").filter(_.nonEmpty).length
+ val lines1 = nonEmptyLines(result1).length
+ val lines2 = nonEmptyLines(result2).length
assert(lines1 <= 10, s"Expected truncated output with at most 10 lines, got $lines1")
assert(lines2 <= 10, s"Expected truncated output with at most 10 lines, got $lines2")
assert(lines1 >= 1, "Should have at least the mismatch line")
@@ -415,10 +419,10 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
val (result1, result2) = LogicalPlanDifference(plan1, plan2, 1000)
// With very large context, should show entire plans
- val lines1 = result1.split("\n").filter(_.nonEmpty).length
- val lines2 = result2.split("\n").filter(_.nonEmpty).length
- val planLines1 = plan1.toString.split("\n").filter(_.nonEmpty).length
- val planLines2 = plan2.toString.split("\n").filter(_.nonEmpty).length
+ val lines1 = nonEmptyLines(result1).length
+ val lines2 = nonEmptyLines(result2).length
+ val planLines1 = nonEmptyLines(plan1.toString).length
+ val planLines2 = nonEmptyLines(plan2.toString).length
assert(lines1 <= planLines1)
assert(lines2 <= planLines2)
@@ -445,8 +449,8 @@ class LogicalPlanDifferenceSuite extends SparkFunSuite with SQLConfHelper {
val (result1, result2) = LogicalPlanDifference(plan1, plan2, 1)
// With 1 context line, should show 1 line before, the mismatch, and 1 line after (3 total)
- val lines1 = result1.split("\n").filter(_.nonEmpty)
- val lines2 = result2.split("\n").filter(_.nonEmpty)
+ val lines1 = nonEmptyLines(result1)
+ val lines2 = nonEmptyLines(result2)
assert(
lines1.length <= 3,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org