huaxingao commented on code in PR #37197:
URL: https://github.com/apache/spark/pull/37197#discussion_r927207292
##########
sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala:
##########
@@ -234,7 +234,13 @@ class V2ExpressionBuilder(e: Expression, isPredicate:
Boolean = false) {
if (l.isDefined && r.isDefined) {
b match {
case _: Predicate =>
- Some(new V2Predicate(b.sqlOperator, Array[V2Expression](l.get,
r.get)))
+ if (l.get.isInstanceOf[LiteralValue[_]] &&
r.get.isInstanceOf[FieldReference]) {
Review Comment:
Sorry I missed that comment. Fixed.
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2StrategySuite.scala:
##########
@@ -18,14 +18,77 @@
package org.apache.spark.sql.execution.datasources.v2
import org.apache.spark.sql.catalyst.dsl.expressions._
-import org.apache.spark.sql.catalyst.expressions.Expression
+import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.plans.PlanTest
import org.apache.spark.sql.connector.expressions.{FieldReference,
LiteralValue}
import org.apache.spark.sql.connector.expressions.filter.Predicate
import org.apache.spark.sql.test.SharedSparkSession
-import org.apache.spark.sql.types.BooleanType
+import org.apache.spark.sql.types.{BooleanType, IntegerType, StringType,
StructField, StructType}
class DataSourceV2StrategySuite extends PlanTest with SharedSparkSession {
+ val attrInts = Seq(
+ $"cint".int,
+ $"c.int".int,
+ GetStructField($"a".struct(StructType(
+ StructField("cstr", StringType, nullable = true) ::
+ StructField("cint", IntegerType, nullable = true) :: Nil)), 1, None),
+ GetStructField($"a".struct(StructType(
+ StructField("c.int", IntegerType, nullable = true) ::
+ StructField("cstr", StringType, nullable = true) :: Nil)), 0, None),
+ GetStructField($"a.b".struct(StructType(
+ StructField("cstr1", StringType, nullable = true) ::
+ StructField("cstr2", StringType, nullable = true) ::
+ StructField("cint", IntegerType, nullable = true) :: Nil)), 2, None),
+ GetStructField($"a.b".struct(StructType(
+ StructField("c.int", IntegerType, nullable = true) :: Nil)), 0, None),
+ GetStructField(GetStructField($"a".struct(StructType(
+ StructField("cstr1", StringType, nullable = true) ::
+ StructField("b", StructType(StructField("cint", IntegerType, nullable
= true) ::
+ StructField("cstr2", StringType, nullable = true) :: Nil)) :: Nil)),
1, None), 0, None)
+ ).zip(Seq(
+ "cint",
+ "`c.int`", // single level field that contains `dot` in name
+ "a.cint", // two level nested field
+ "a.`c.int`", // two level nested field, and nested level contains `dot`
+ "`a.b`.cint", // two level nested field, and top level contains `dot`
+ "`a.b`.`c.int`", // two level nested field, and both levels contain `dot`
+ "a.b.cint" // three level nested field
+ ))
+
+ test("translate simple expression") { attrInts
Review Comment:
Fixed. Thanks
--
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]
