Skip to content

fix: support to_json on Spark 4.0 #4036

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

Merged
mbutrovich merged 1 commit into from
Apr 22, 2026
Merged

fix: support to_json on Spark 4.0 #4036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
package org.apache.comet.shims

import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.expressions.objects.StaticInvoke
import org.apache.spark.sql.catalyst.expressions.json.StructsToJsonEvaluator
import org.apache.spark.sql.catalyst.expressions.objects.{Invoke, StaticInvoke}
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.internal.types.StringTypeWithCollation
import org.apache.spark.sql.types.{BinaryType, BooleanType, DataTypes, StringType}
Expand Down Expand Up @@ -114,6 +115,19 @@ trait CometExprShim extends CommonStringExprs {
case k: KnownNotContainsNull =>
exprToProtoInternal(k.child, inputs, binding)

// In Spark 4.0, StructsToJson is a RuntimeReplaceable whose replacement is
// Invoke(Literal(StructsToJsonEvaluator), "evaluate", ...). Reconstruct the
// original StructsToJson and recurse so support-level checks apply.
case i: Invoke =>
(i.targetObject, i.functionName, i.arguments) match {
case (Literal(evaluator: StructsToJsonEvaluator, _), "evaluate", Seq(child)) =>
exprToProtoInternal(
StructsToJson(evaluator.options, child, evaluator.timeZoneId),
inputs,
binding)
case _ => None
}

case _ => None
}
}
Expand Down
6 changes: 0 additions & 6 deletions spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2271,8 +2271,6 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
}

test("to_json") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
withSQLConf(CometConf.getExprAllowIncompatConfigKey(classOf[StructsToJson]) -> "true") {
Seq(true, false).foreach { dictionaryEnabled =>
withParquetTable(
Expand All @@ -2298,8 +2296,6 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
}

test("to_json escaping of field names and string values") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
withSQLConf(CometConf.getExprAllowIncompatConfigKey(classOf[StructsToJson]) -> "true") {
val gen = new DataGenerator(new Random(42))
val chars = "\\'\"abc\t\r\n\f\b"
Expand Down Expand Up @@ -2329,8 +2325,6 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
}

test("to_json unicode") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
withSQLConf(CometConf.getExprAllowIncompatConfigKey(classOf[StructsToJson]) -> "true") {
Seq(true, false).foreach { dictionaryEnabled =>
withParquetTable(
Expand Down
2 changes: 0 additions & 2 deletions spark/src/test/scala/org/apache/comet/CometJsonExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import org.apache.spark.sql.catalyst.expressions.{JsonToStructs, StructsToJson}
import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
import org.apache.spark.sql.functions._

import org.apache.comet.CometSparkSessionExtensions.isSpark40Plus
import org.apache.comet.serde.CometStructsToJson
import org.apache.comet.testing.{DataGenOptions, ParquetGenerator, SchemaGenOptions}

Expand All @@ -48,7 +47,6 @@ class CometJsonExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelpe
}

test("to_json - all supported types") {
assume(!isSpark40Plus)
withTempDir { dir =>
val path = new Path(dir.toURI.toString, "test.parquet")
val filename = path.toString
Expand Down
Loading
⚡