Skip to content

[AURON #2279] Implement native Levenshtein with threshold support for Spark 4.0+ #2280

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
lyne7-sc wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[AURON #2279] Implement native Levenshtein with threshold support for Spark 4.0+ #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
67fdebd
implement levenshtein with threshold parameter for Spark 4.x
lyne7-sc May 18, 2026
7963af0
Refactor spark levenshtein implementation
lyne7-sc May 19, 2026
8fcc669
Simplify levenshtein array threshold handling
lyne7-sc May 19, 2026
1b7439c
Comment out levenshtein proto enum
lyne7-sc May 19, 2026
f426f03
Clean up levenshtein planner fallback
lyne7-sc May 19, 2026
be74b5f
Clean up levenshtein planner fallback
lyne7-sc May 19, 2026
c7bdafc
Merge remote-tracking branch 'origin/fix/spark_levenshtein' into fix/…
lyne7-sc May 19, 2026
b1b35c5
Fix null handling in levenshtein function
lyne7-sc May 21, 2026
96e0c6e
lint
lyne7-sc May 21, 2026
bdfaa16
optimize with bounded threshold
lyne7-sc May 26, 2026
ae2065e
Merge branch 'master' into fix/spark_levenshtein
lyne7-sc May 27, 2026
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: 0 additions & 2 deletions auron-spark-tests/spark35/src/test/scala/org/apache/auron/utils/AuronSparkTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ class AuronSparkTestSettings extends SparkTestSettings {
enableSuite[AuronMiscFunctionsSuite]

enableSuite[AuronStringFunctionsSuite]
// Native levenshtein has a Spark 3.5+ result or schema comparison mismatch.
.exclude("string Levenshtein distance")
// Native substr does not support BinaryType inputs.
// See https://github.com/apache/auron/issues/1724
.exclude("string / binary substring function")
Expand Down
3 changes: 0 additions & 3 deletions auron-spark-tests/spark40/src/test/scala/org/apache/auron/utils/AuronSparkTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ class AuronSparkTestSettings extends SparkTestSettings {
enableSuite[AuronStringFunctionsSuite]
.exclude("string concat")
.exclude("string concat_ws")
// Spark 4 adds the threshold argument, but native levenshtein currently supports only
// two arguments.
.exclude("string Levenshtein distance")
// Native substr does not support BinaryType inputs.
.exclude("string / binary substring function")
.exclude("UTF-8 string validate")
Expand Down
3 changes: 0 additions & 3 deletions auron-spark-tests/spark41/src/test/scala/org/apache/auron/utils/AuronSparkTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ class AuronSparkTestSettings extends SparkTestSettings {
enableSuite[AuronStringFunctionsSuite]
.exclude("string concat")
.exclude("string concat_ws")
// Spark 4 adds the threshold argument, but native levenshtein currently supports only
// two arguments.
.exclude("string Levenshtein distance")
// Native substr does not support BinaryType inputs.
.exclude("string / binary substring function")
.exclude("UTF-8 string validate")
Expand Down
2 changes: 1 addition & 1 deletion native-engine/auron-planner/proto/auron.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ enum ScalarFunction {
Hex=66;
Power=67;
IsNaN=69;
Levenshtein=80;
// Levenshtein=80;

@weiqingy weiqingy Jun 12, 2026

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.

Commenting out the line frees number 80 without a reserved 80; guard, so a future enum value could reclaim it. The practical risk is small — Auron plans are built and consumed in-process rather than persisted across versions, and the enum already has unguarded gaps (68, 70–79), so this matches existing house style.

Is leaving a commented-out enum line the deliberate convention here, or worth tightening to the following while the change is fresh?

  reserved 80;
  reserved "Levenshtein";

That makes the intent explicit and lets the compiler reject any accidental reuse of 80 or the name.

FindInSet=81;
Nvl=82;
Nvl2=83;
Expand Down
3 changes: 1 addition & 2 deletions native-engine/auron-planner/src/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,8 +1306,7 @@ impl From<protobuf::ScalarFunction> for Arc<ScalarUDF> {
ScalarFunction::Rpad => f::unicode::rpad(),
ScalarFunction::SplitPart => f::string::split_part(),
ScalarFunction::StartsWith => f::string::starts_with(),
ScalarFunction::Levenshtein => f::string::levenshtein(),

// ScalarFunction::Levenshtein => f::string::levenshtein(),
ScalarFunction::FindInSet => f::unicode::find_in_set(),
ScalarFunction::Strpos => f::unicode::strpos(),
ScalarFunction::Substr => f::unicode::substr(),
Expand Down
1 change: 1 addition & 0 deletions native-engine/datafusion-ext-functions/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ pub fn create_auron_ext_function(
"Spark_StringConcatWs" => Arc::new(spark_strings::string_concat_ws),
"Spark_StringLower" => Arc::new(spark_strings::string_lower),
"Spark_StringUpper" => Arc::new(spark_strings::string_upper),
"Spark_Levenshtein" => Arc::new(spark_strings::spark_levenshtein),
"Spark_InitCap" => Arc::new(spark_initcap::string_initcap),
"Spark_Year" => Arc::new(spark_dates::spark_year),
"Spark_Month" => Arc::new(spark_dates::spark_month),
Expand Down
Loading
Loading