Fix

Author: wangyum

sql/hive/src/test/scala/org/apache/spark/sql/hive/client/FiltersSuite.scala

@@ -30,6 +30,7 @@ import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.catalyst.plans.PlanTest
 import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.types._
+import org.apache.spark.unsafe.types.UTF8String
 
 /**
  * A set of tests for the filter conversion logic used when pushing partition pruning into the
@@ -82,6 +83,10 @@ class FiltersSuite extends SparkFunSuite with Logging with PlanTest {
     (a("datecol", DateType) ===  Literal(null)) :: Nil,
     "")
 
+  filterTest("string filter with InSet predicate",
+    InSet(a("strcol", StringType), Set("1", "2").map(s => UTF8String.fromString(s))) :: Nil,
+    "(strcol = \"1\" or strcol = \"2\")")
+
   filterTest("skip varchar",
     (Literal("") === a("varchar", StringType)) :: Nil,
     "")

sql/hive/src/test/scala/org/apache/spark/sql/hive/client/HivePartitionFilteringSuite.scala

@@ -333,18 +333,20 @@ class HivePartitionFilteringSuite(version: String)
       assert(filteredPartitions.map(_.spec.toSet).toSet == expectedPartitions.toSet)
     }
 
+    val dateAttr: Attribute = AttributeReference("part", DateType)()
+
     testDataTypeFiltering(
-      Seq(AttributeReference("part", DateType)() === Date.valueOf("2019-01-01")),
+      Seq(dateAttr === Date.valueOf("2019-01-01")),
       Seq("2019-01-01").map(Date.valueOf) :: Nil)
     testDataTypeFiltering(
-      Seq(AttributeReference("part", DateType)() > Date.valueOf("2019-01-02")),
+      Seq(dateAttr > Date.valueOf("2019-01-02")),
       Seq("2019-01-03", "2019-01-04").map(Date.valueOf) :: Nil)
     testDataTypeFiltering(
-      Seq(In(AttributeReference("part", DateType)(),
+      Seq(In(dateAttr,
         Seq("2019-01-01", "2019-01-02").map(d => Literal(Date.valueOf(d))))),
       Seq("2019-01-01", "2019-01-02").map(Date.valueOf) :: Nil)
     testDataTypeFiltering(
-      Seq(InSet(AttributeReference("part", DateType)(),
+      Seq(InSet(dateAttr,
         Set("2019-01-01", "2019-01-02").map(d => Literal(Date.valueOf(d)).eval(EmptyRow)))),
       Seq("2019-01-01", "2019-01-02").map(Date.valueOf) :: Nil)
   }