HyukjinKwon commented on a change in pull request #32807:
URL: https://github.com/apache/spark/pull/32807#discussion_r650451379
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
##########
@@ -699,20 +699,25 @@ abstract class PushableColumnBase {
def unapply(e: Expression): Option[String] = {
import
org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper
- def helper(e: Expression): Option[Seq[String]] = e match {
- case a: Attribute =>
- // Attribute that contains dot "." in name is supported only when
- // nested predicate pushdown is enabled.
- if (nestedPredicatePushdownEnabled || !a.name.contains(".")) {
- Some(Seq(a.name))
- } else {
- None
- }
- case s: GetStructField if nestedPredicatePushdownEnabled =>
- helper(s.child).map(_ :+ s.childSchema(s.ordinal).name)
- case _ => None
+ if (nestedPredicatePushdownEnabled) {
+ extractNameAdvanced(e).map(_.quoted)
+ } else {
+ extractNameBasic(e)
}
- helper(e).map(_.quoted)
+ }
+
+ private def extractNameBasic(e: Expression): Option[String] = e match {
+ // Attribute that contains dot "." in name is supported only when nested
predicate pushdown
+ // is enabled.
+ case a: Attribute if !a.name.contains(".") => Some(a.name)
+ case _ => None
+ }
+
+ private def extractNameAdvanced(e: Expression): Option[Seq[String]] = e
match {
Review comment:
```suggestion
private def extractQualifiedName(e: Expression): Option[Seq[String]] = e
match {
```
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
##########
@@ -699,20 +699,25 @@ abstract class PushableColumnBase {
def unapply(e: Expression): Option[String] = {
import
org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper
- def helper(e: Expression): Option[Seq[String]] = e match {
- case a: Attribute =>
- // Attribute that contains dot "." in name is supported only when
- // nested predicate pushdown is enabled.
- if (nestedPredicatePushdownEnabled || !a.name.contains(".")) {
- Some(Seq(a.name))
- } else {
- None
- }
- case s: GetStructField if nestedPredicatePushdownEnabled =>
- helper(s.child).map(_ :+ s.childSchema(s.ordinal).name)
- case _ => None
+ if (nestedPredicatePushdownEnabled) {
+ extractNameAdvanced(e).map(_.quoted)
+ } else {
+ extractNameBasic(e)
}
- helper(e).map(_.quoted)
+ }
+
+ private def extractNameBasic(e: Expression): Option[String] = e match {
Review comment:
```suggestion
private def extractPlainName(e: Expression): Option[String] = e match {
```
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
##########
@@ -699,20 +699,25 @@ abstract class PushableColumnBase {
def unapply(e: Expression): Option[String] = {
import
org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper
- def helper(e: Expression): Option[Seq[String]] = e match {
- case a: Attribute =>
- // Attribute that contains dot "." in name is supported only when
- // nested predicate pushdown is enabled.
- if (nestedPredicatePushdownEnabled || !a.name.contains(".")) {
- Some(Seq(a.name))
- } else {
- None
- }
- case s: GetStructField if nestedPredicatePushdownEnabled =>
- helper(s.child).map(_ :+ s.childSchema(s.ordinal).name)
- case _ => None
+ if (nestedPredicatePushdownEnabled) {
+ extractNameAdvanced(e).map(_.quoted)
+ } else {
+ extractNameBasic(e)
Review comment:
```suggestion
extractPlainName(e)
```
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
##########
@@ -699,20 +699,25 @@ abstract class PushableColumnBase {
def unapply(e: Expression): Option[String] = {
import
org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper
- def helper(e: Expression): Option[Seq[String]] = e match {
- case a: Attribute =>
- // Attribute that contains dot "." in name is supported only when
- // nested predicate pushdown is enabled.
- if (nestedPredicatePushdownEnabled || !a.name.contains(".")) {
- Some(Seq(a.name))
- } else {
- None
- }
- case s: GetStructField if nestedPredicatePushdownEnabled =>
- helper(s.child).map(_ :+ s.childSchema(s.ordinal).name)
- case _ => None
+ if (nestedPredicatePushdownEnabled) {
+ extractNameAdvanced(e).map(_.quoted)
Review comment:
```suggestion
extractQualifiedName(e).map(_.quoted)
```
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
##########
@@ -699,20 +699,25 @@ abstract class PushableColumnBase {
def unapply(e: Expression): Option[String] = {
import
org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper
- def helper(e: Expression): Option[Seq[String]] = e match {
- case a: Attribute =>
- // Attribute that contains dot "." in name is supported only when
- // nested predicate pushdown is enabled.
- if (nestedPredicatePushdownEnabled || !a.name.contains(".")) {
- Some(Seq(a.name))
- } else {
- None
- }
- case s: GetStructField if nestedPredicatePushdownEnabled =>
- helper(s.child).map(_ :+ s.childSchema(s.ordinal).name)
- case _ => None
+ if (nestedPredicatePushdownEnabled) {
+ extractNameAdvanced(e).map(_.quoted)
+ } else {
+ extractNameBasic(e)
}
- helper(e).map(_.quoted)
+ }
+
+ private def extractNameBasic(e: Expression): Option[String] = e match {
+ // Attribute that contains dot "." in name is supported only when nested
predicate pushdown
+ // is enabled.
+ case a: Attribute if !a.name.contains(".") => Some(a.name)
+ case _ => None
+ }
+
+ private def extractNameAdvanced(e: Expression): Option[Seq[String]] = e
match {
+ case a: Attribute => Some(Seq(a.name))
+ case s: GetStructField =>
+ extractNameAdvanced(s.child).map(_ :+ s.childSchema(s.ordinal).name)
Review comment:
```suggestion
extractQualifiedName(s.child).map(_ :+ s.childSchema(s.ordinal).name)
```
--
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
