zikangh commented on code in PR #56133:
URL: https://github.com/apache/spark/pull/56133#discussion_r3313923758
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/runtime/MicroBatchExecution.scala:
##########
@@ -224,7 +225,13 @@ class MicroBatchExecution(
log"from DataSourceV2 named
'${MDC(LogKeys.STREAMING_DATA_SOURCE_NAME, srcName)}' " +
log"${MDC(LogKeys.STREAMING_DATA_SOURCE_DESCRIPTION, dsStr)}")
// TODO: operator pushdown.
- val scan = table.newScanBuilder(options).build()
+ val scanBuilder = table.newScanBuilder(options)
+ scanBuilder match {
+ case r: SupportsPushDownRequiredColumns =>
+ r.pruneColumns(output.toStructType)
+ case _ =>
+ }
+ val scan = scanBuilder.build()
Review Comment:
Not an issue here because we pass the entire output into pruneColumns.
##########
sql/core/src/test/scala/org/apache/spark/sql/streaming/test/DataStreamTableAPISuite.scala:
##########
@@ -564,6 +564,40 @@ class DataStreamTableAPISuite extends StreamTest with
BeforeAndAfter {
}
}
+ test("pruneColumns called on SupportsPushDownRequiredColumns V2 streaming
scan builder") {
+ val tblName = "teststream.table_name"
+ withTable(tblName) {
+ spark.sql(s"CREATE TABLE $tblName (data int) USING foo")
+ val stream = MemoryStream[Int]
+ val testCatalog =
spark.sessionState.catalogManager.catalog("teststream").asTableCatalog
+ val table = testCatalog.loadTable(Identifier.of(Array(), "table_name"))
+ .asInstanceOf[InMemoryStreamTable]
+ table.setStream(stream)
+
+ // Wrap the table's scan builder so we can record pruneColumns calls.
+ val recorded = new PrunedSchemaRecorder
+ table.scanBuilderWrapper = Some(inner => new
RecordingPruneScanBuilder(inner, recorded))
+
+ withTempDir { checkpointDir =>
+ val q = spark.readStream.table(tblName)
+ .select("value", "_seq")
+ .writeStream.format("noop")
+ .option("checkpointLocation", checkpointDir.getCanonicalPath)
+ .start()
+ try {
+ stream.addData(1, 2, 3)
+ q.processAllAvailable()
+ assert(recorded.called, "pruneColumns should have been called on the
streaming scan builder")
Review Comment:
Added an E2E 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]
