viirya commented on code in PR #58950:
URL: https://github.com/apache/spark/pull/58950#discussion_r4068991931
##########
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/UnsupportedOperationsSuite.scala:
##########
@@ -396,6 +396,34 @@ class UnsupportedOperationsSuite extends SparkFunSuite
with SQLHelper {
outputMode = Append
)
+ def asOfJoin(left: LogicalPlan, right: LogicalPlan): AsOfJoin = {
+ AsOfJoin(
+ left,
+ right,
+ left.output.head >= right.output.head,
+ condition = None,
+ joinType = Inner,
+ orderExpression = left.output.head - right.output.head,
+ toleranceAssertion = None)
+ }
+
+ assertSupportedInStreamingPlan(
+ "ASOF join with stream-static relations",
+ asOfJoin(streamRelation, batchRelation),
+ outputMode = Append)
+
+ assertNotSupportedInStreamingPlan(
Review Comment:
Could we also add a SQL-level rejection test in `StreamingAsOfJoinSuite` for
static-stream and stream-stream ASOF joins, asserting that
`writeStream.start()` fails with the expected message?
These tests cover the checker directly, while the execution tests cover only
the supported stream-static path. A SQL-level negative test would also protect
the integration between SQL analysis and the streaming unsupported-operation
check. This could be parameterized over INNER and LEFT ASOF.
##########
sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingAsOfJoinSuite.scala:
##########
@@ -0,0 +1,100 @@
+/*
+ * 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.streaming
+
+import java.sql.Timestamp
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.execution.streaming.runtime.MemoryStream
+import org.apache.spark.sql.internal.SQLConf
+
+class StreamingAsOfJoinSuite extends StreamTest {
+
+ import testImplicits._
+
+ override def beforeAll(): Unit = {
+ super.beforeAll()
+ spark.conf.set(SQLConf.SQL_ASOF_JOIN_ENABLED.key, "true")
+ }
+
+ override def afterAll(): Unit = {
+ spark.conf.unset(SQLConf.SQL_ASOF_JOIN_ENABLED.key)
+ super.afterAll()
+ }
+
+ private def timestamp(value: String): Timestamp = Timestamp.valueOf(value)
+
+ private def withTradeQuoteViews(
+ testCode: MemoryStream[(Timestamp, String, Int)] => Unit): Unit = {
+ withTempView("streaming_trades", "static_quotes") {
+ val input = MemoryStream[(Timestamp, String, Int)]
+ input.toDF().toDF("trade_time", "symbol", "quantity")
+ .createOrReplaceTempView("streaming_trades")
+ sql(
+ """
+ |CREATE TEMP VIEW static_quotes(quote_time, symbol, bid_price) AS
+ |VALUES (TIMESTAMP '2026-06-29 10:00:00', 'AAPL', 18010),
+ | (TIMESTAMP '2026-06-29 10:00:07', 'AAPL', 18015),
+ | (TIMESTAMP '2026-06-29 10:00:08', 'MSFT', 42050)
+ |""".stripMargin)
+ testCode(input)
+ }
+ }
+
+ test("stream-static ASOF join matches against the static snapshot") {
+ withTradeQuoteViews { input =>
+ val joined = sql(
+ """
+ |SELECT t.trade_time, t.symbol, t.quantity, q.bid_price
+ |FROM streaming_trades t ASOF JOIN static_quotes q
+ | MATCH_CONDITION (t.trade_time >= q.quote_time)
+ | ON t.symbol = q.symbol
+ |""".stripMargin)
+
+ testStream(joined)(
+ AddData(input,
+ (timestamp("2026-06-29 10:00:05"), "AAPL", 100),
+ (timestamp("2026-06-29 10:00:09"), "MSFT", 50)),
+ CheckNewAnswer(
+ (timestamp("2026-06-29 10:00:05"), "AAPL", 100, 18010),
+ (timestamp("2026-06-29 10:00:09"), "MSFT", 50, 42050)),
+ AddData(input, (timestamp("2026-06-29 10:00:11"), "AAPL", 200)),
+ CheckNewAnswer((timestamp("2026-06-29 10:00:11"), "AAPL", 200, 18015)))
+ }
+ }
+
+ test("stream-static LEFT ASOF join preserves unmatched streaming rows") {
+ withTradeQuoteViews { input =>
+ val joined = sql(
+ """
+ |SELECT t.trade_time, t.symbol, t.quantity, q.bid_price
+ |FROM streaming_trades t LEFT ASOF JOIN static_quotes q
+ | MATCH_CONDITION (t.trade_time >= q.quote_time)
+ | ON t.symbol = q.symbol
+ |""".stripMargin)
+
+ testStream(joined)(
+ AddData(input,
+ (timestamp("2026-06-29 09:59:59"), "AAPL", 30),
+ (timestamp("2026-06-29 10:00:09"), "GOOG", 40)),
+ CheckNewAnswer(
+ Row(timestamp("2026-06-29 09:59:59"), "AAPL", 30, null),
+ Row(timestamp("2026-06-29 10:00:09"), "GOOG", 40, null)))
Review Comment:
Could we include one matching row in this LEFT ASOF test as well, for
example an AAPL trade at `10:00:11` expecting `18015`?
Both input rows currently exercise unmatched cases. Mixing matched and
unmatched rows would verify that LEFT ASOF both returns the selected quote and
preserves unmatched rows; otherwise, a regression that null-pads every row in
the LEFT path could still pass this test.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
