You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "MrHappyEnding (via GitHub)" <gi...@apache.org> on 2026/08/05 09:21:07 UTC
[PR] [SPARK-58578][SQL]Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation [spark]
MrHappyEnding opened a new pull request, #57789:
URL: https://github.com/apache/spark/pull/57789
### What changes were proposed in this pull request?
Mark `ApplyFunctionExpression` as stateful and add a regression test verifying
that it produces a fresh expression instance.
### Why are the changes needed?
`ApplyFunctionExpression` reuses a mutable `SpecificInternalRow`. Without being
marked stateful, the same expression instance could be shared by multiple
evaluators, causing concurrent evaluations to overwrite each other's inputs and
produce incorrect results.
### Does this PR introduce *any* user-facing change?
Yes. It prevents incorrect results during concurrent evaluation of
`ApplyFunctionExpression`. There is no public API change.
### How was this patch tested?
Added `ApplyFunctionExpressionSuite` and ran:
build/sbt 'catalyst/testOnly *ApplyFunctionExpressionSuite'
build/sbt 'catalyst/testOnly *DataSourceV2FunctionSuite'
dev/lint-scala
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-58578][SQL] Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation [spark]
Posted by "MrHappyEnding (via GitHub)" <gi...@apache.org>.
MrHappyEnding commented on PR #57789:
URL: https://github.com/apache/spark/pull/57789#issuecomment-5249981099
> Thanks for the fix @MrHappyEnding and @uros-b for the review!
>
> @MrHappyEnding , do you have a Jira account that I can assign https://issues.apache.org/jira/browse/SPARK-58578 to? (And https://issues.apache.org/jira/browse/SPARK-58384 as well.)
Username: mrhappyending
Full name: Vicky Lu
Thank you!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-58578][SQL] Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation [spark]
Posted by "uros-b (via GitHub)" <gi...@apache.org>.
uros-b commented on PR #57789:
URL: https://github.com/apache/spark/pull/57789#issuecomment-5190815270
Thank you @MrHappyEnding! Adding @peter-toth for further review.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-58578][SQL] Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation [spark]
Posted by "peter-toth (via GitHub)" <gi...@apache.org>.
peter-toth commented on code in PR #57789:
URL: https://github.com/apache/spark/pull/57789#discussion_r3720626848
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ApplyFunctionExpressionSuite.scala:
##########
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.expressions
+
+import java.util.concurrent.{CountDownLatch, TimeUnit}
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.concurrent.duration._
+
+import org.apache.spark.SparkFunSuite
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.connector.catalog.functions.ScalarFunction
+import org.apache.spark.sql.types.{DataType, IntegerType}
+import org.apache.spark.util.ThreadUtils
+
+class ApplyFunctionExpressionSuite extends SparkFunSuite {
+
+ private val intIdentity = new ScalarFunction[Int] {
+ override def inputTypes(): Array[DataType] = Array(IntegerType)
+ override def resultType(): DataType = IntegerType
+ override def name(): String = "int_identity"
+ override def produceResult(input: InternalRow): Int = input.getInt(0)
+ }
+
+ test("SPARK-58578: ApplyFunctionExpression is stateful and produces fresh copies") {
+ val expr = ApplyFunctionExpression(
+ intIdentity, Seq(BoundReference(0, IntegerType, nullable = false)))
+ assert(expr.stateful, "ApplyFunctionExpression.stateful should be true")
+ val copy = expr.freshCopyIfContainsStatefulExpression()
+ assert(copy ne expr,
+ "freshCopyIfContainsStatefulExpression should return a new instance " +
+ "for ApplyFunctionExpression")
+ assert(copy.eval(InternalRow(7)) === 7)
+ }
+
+ test("SPARK-58578: concurrent evaluation uses independent input rows") {
Review Comment:
**Finding 2.** The name reads as "concurrent evaluation of this expression is safe", but the test constructs the two evaluators itself with `freshCopyIfContainsStatefulExpression()`, so what it actually pins is that two fresh copies don't share `reusedRow`. The query-level property needs one more step that isn't exercised here — each concurrent execution building its own projection — so a reader who trusts the name could conclude more than the test shows.
Suggest matching the name to the assertion:
```suggestion
test("SPARK-58578: fresh copies do not share the reused input row") {
```
Worth keeping the test as it is otherwise — I reverted just the `stateful` override and it fails exactly as intended, with `firstResult` coming back as `2` because both evaluators are then the same instance.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-58578][SQL] Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation [spark]
Posted by "peter-toth (via GitHub)" <gi...@apache.org>.
peter-toth commented on PR #57789:
URL: https://github.com/apache/spark/pull/57789#issuecomment-5230875226
**Merge Summary:**
- merged into master https://github.com/apache/spark/commit/daba9c6894c2c47a8088c2839938e538db8676ec
- merged into branch-4.x https://github.com/apache/spark/commit/f94586d021ee4e7eff30a85483133ba63fdc74f0
- merged into branch-4.3 https://github.com/apache/spark/commit/5be9c74fea344f02fe2a96a7772ef1bd6d5dcf7f
*Posted by `merge_spark_pr.py`*
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-58578][SQL] Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation [spark]
Posted by "MrHappyEnding (via GitHub)" <gi...@apache.org>.
MrHappyEnding commented on code in PR #57789:
URL: https://github.com/apache/spark/pull/57789#discussion_r3722759679
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ApplyFunctionExpressionSuite.scala:
##########
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.expressions
+
+import java.util.concurrent.{CountDownLatch, TimeUnit}
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.concurrent.duration._
+
+import org.apache.spark.SparkFunSuite
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.connector.catalog.functions.ScalarFunction
+import org.apache.spark.sql.types.{DataType, IntegerType}
+import org.apache.spark.util.ThreadUtils
+
+class ApplyFunctionExpressionSuite extends SparkFunSuite {
+
+ private val intIdentity = new ScalarFunction[Int] {
+ override def inputTypes(): Array[DataType] = Array(IntegerType)
+ override def resultType(): DataType = IntegerType
+ override def name(): String = "int_identity"
+ override def produceResult(input: InternalRow): Int = input.getInt(0)
+ }
+
+ test("SPARK-58578: ApplyFunctionExpression is stateful and produces fresh copies") {
+ val expr = ApplyFunctionExpression(
+ intIdentity, Seq(BoundReference(0, IntegerType, nullable = false)))
+ assert(expr.stateful, "ApplyFunctionExpression.stateful should be true")
+ val copy = expr.freshCopyIfContainsStatefulExpression()
+ assert(copy ne expr,
+ "freshCopyIfContainsStatefulExpression should return a new instance " +
+ "for ApplyFunctionExpression")
+ assert(copy.eval(InternalRow(7)) === 7)
+ }
+
+ test("SPARK-58578: concurrent evaluation uses independent input rows") {
Review Comment:
Thanks for the review! I clarified how the expression instance can be shared in the PR description and renamed the test to match what it actually verifies.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-58578][SQL] Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation [spark]
Posted by "peter-toth (via GitHub)" <gi...@apache.org>.
peter-toth commented on PR #57789:
URL: https://github.com/apache/spark/pull/57789#issuecomment-5230888427
Thanks for the fix @MrHappyEnding and @uros-b for the review!
@MrHappyEnding , do you have a Jira account that I can assign https://issues.apache.org/jira/browse/SPARK-58578 to? (And https://issues.apache.org/jira/browse/SPARK-58384 as well.)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-58578][SQL] Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation [spark]
Posted by "peter-toth (via GitHub)" <gi...@apache.org>.
peter-toth closed pull request #57789: [SPARK-58578][SQL] Mark ApplyFunctionExpression stateful to prevent reusedRow data races under concurrent evaluation
URL: https://github.com/apache/spark/pull/57789
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org