diff --git a/spark-bigquery-parent/pom.xml b/spark-bigquery-parent/pom.xml index 64c256a39..ded28862c 100644 --- a/spark-bigquery-parent/pom.xml +++ b/spark-bigquery-parent/pom.xml @@ -85,7 +85,7 @@ true - 0.30.0-aiq11 + 0.30.0-aiq12 1.11.1 11.0.0 @@ -126,7 +126,7 @@ - 3-3-2-aiq88 + 3-3-2-aiq90 2.12 15 diff --git a/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.12/src/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala b/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.12/src/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala index 73b37c378..d54a54721 100644 --- a/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.12/src/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala +++ b/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.12/src/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/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.13/src/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala b/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.13/src/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala index 73b37c378..d54a54721 100644 --- a/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.13/src/main/scala/com/google/cloud/spark/bigquery/pushdowns/Spark33BigQueryPushdownPlan.scala +++ b/spark-bigquery-pushdown/spark-3.3-bigquery-pushdown_2.13/src/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