[DPE-334] Use SQLPlan trait #18

ActionIQ · Jun 19, 2024 · ce3a8db · ce3a8db
2 parents 5d9b0fe + 18ffef1
commit ce3a8db
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/spark-bigquery-parent/pom.xml b/spark-bigquery-parent/pom.xml
@@ -85,7 +85,7 @@
 
     <properties>
         <gpg.skip>true</gpg.skip>
-        <revision>0.30.0-aiq11</revision>
+        <revision>0.30.0-aiq12</revision>
 
         <avro.version>1.11.1</avro.version>
         <arrow.version>11.0.0</arrow.version>
@@ -126,7 +126,7 @@
         <!-- checkstyle
         <checkstyle.header.file>${reactor.project.basedir}/java.header</checkstyle.header.file>
         -->
-        <spark.version>3-3-2-aiq88</spark.version>
+        <spark.version>3-3-2-aiq90</spark.version>
         <scala.binary.version>2.12</scala.binary.version>
         <scala.patch.version>15</scala.patch.version>
     </properties>

diff --git a/...rc/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala b/...rc/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala
@@ -20,11 +20,13 @@ import com.google.cloud.spark.bigquery.pushdowns.SparkBigQueryPushdownUtil.doExe
 import org.apache.spark.rdd.RDD
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.expressions.Attribute
-import org.apache.spark.sql.execution.SparkPlan
+import org.apache.spark.sql.execution.{SQLPlan, SparkPlan}
 
 /** BigQueryPlan, with RDD defined by custom query. */
 case class Spark33BigQueryPushdownPlan(output: Seq[Attribute], rdd: RDD[InternalRow], sqlString: String)
-  extends SparkPlan {
+  extends SparkPlan with SQLPlan {
+
+  override def sql: String = sqlString
 
   override def children: Seq[SparkPlan] = Nil
 

diff --git a/...rc/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala b/...rc/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala
@@ -20,11 +20,13 @@ import com.google.cloud.spark.bigquery.pushdowns.SparkBigQueryPushdownUtil.doExe
 import org.apache.spark.rdd.RDD
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.expressions.Attribute
-import org.apache.spark.sql.execution.SparkPlan
+import org.apache.spark.sql.execution.{SQLPlan, SparkPlan}
 
 /** BigQueryPlan, with RDD defined by custom query. */
 case class Spark33BigQueryPushdownPlan(output: Seq[Attribute], rdd: RDD[InternalRow], sqlString: String)
-  extends SparkPlan {
+  extends SparkPlan with SQLPlan {
+
+  override def sql: String = sqlString
 
   override def children: Seq[SparkPlan] = Nil