fix ut failures

Author: mgaido91

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

@@ -74,6 +74,12 @@ class HiveClientSuite(version: String)
     }
   }
 
+  private def analyzeIn(expr: Expression): Expression = expr match {
+    case In(CreateNamedStruct(children), list) => In(InValues(children), list)
+    case In(v, list) => In(InValues(Seq(v)), list)
+    case other => other
+  }
+
   override def beforeAll() {
     super.beforeAll()
     client = init(true)
@@ -156,23 +162,23 @@ class HiveClientSuite(version: String)
 
   test("getPartitionsByFilter: ds in (20170102, 20170103) (using IN expression)") {
     testMetastorePartitionFiltering(
-      attr("ds").in(20170102, 20170103),
+      analyzeIn(attr("ds").in(20170102, 20170103)),
       20170102 to 20170103,
       0 to 23,
       "aa" :: "ab" :: "ba" :: "bb" :: Nil)
   }
 
   test("getPartitionsByFilter: cast(ds as long) in (20170102L, 20170103L) (using IN expression)") {
     testMetastorePartitionFiltering(
-      attr("ds").cast(LongType).in(20170102L, 20170103L),
+      analyzeIn(attr("ds").cast(LongType).in(20170102L, 20170103L)),
       20170102 to 20170103,
       0 to 23,
       "aa" :: "ab" :: "ba" :: "bb" :: Nil)
   }
 
   test("getPartitionsByFilter: ds in (20170102, 20170103) (using INSET expression)") {
     testMetastorePartitionFiltering(
-      attr("ds").in(20170102, 20170103),
+      analyzeIn(attr("ds").in(20170102, 20170103)),
       20170102 to 20170103,
       0 to 23,
       "aa" :: "ab" :: "ba" :: "bb" :: Nil, {
@@ -184,7 +190,7 @@ class HiveClientSuite(version: String)
   test("getPartitionsByFilter: cast(ds as long) in (20170102L, 20170103L) (using INSET expression)")
   {
     testMetastorePartitionFiltering(
-      attr("ds").cast(LongType).in(20170102L, 20170103L),
+      analyzeIn(attr("ds").cast(LongType).in(20170102L, 20170103L)),
       20170102 to 20170103,
       0 to 23,
       "aa" :: "ab" :: "ba" :: "bb" :: Nil, {
@@ -195,15 +201,15 @@ class HiveClientSuite(version: String)
 
   test("getPartitionsByFilter: chunk in ('ab', 'ba') (using IN expression)") {
     testMetastorePartitionFiltering(
-      attr("chunk").in("ab", "ba"),
+      analyzeIn(attr("chunk").in("ab", "ba")),
       20170101 to 20170103,
       0 to 23,
       "ab" :: "ba" :: Nil)
   }
 
   test("getPartitionsByFilter: chunk in ('ab', 'ba') (using INSET expression)") {
     testMetastorePartitionFiltering(
-      attr("chunk").in("ab", "ba"),
+      analyzeIn(attr("chunk").in("ab", "ba")),
       20170101 to 20170103,
       0 to 23,
       "ab" :: "ba" :: Nil, {
@@ -231,7 +237,7 @@ class HiveClientSuite(version: String)
       "chunk in ('ab', 'ba') and ((ds=20170101 and h>=8) or (ds=20170102 and h<8))") {
     val day1 = (20170101 to 20170101, 8 to 23, Seq("ab", "ba"))
     val day2 = (20170102 to 20170102, 0 to 7, Seq("ab", "ba"))
-    testMetastorePartitionFiltering(attr("chunk").in("ab", "ba") &&
+    testMetastorePartitionFiltering(analyzeIn(attr("chunk").in("ab", "ba")) &&
         ((attr("ds") === 20170101 && attr("h") >= 8) || (attr("ds") === 20170102 && attr("h") < 8)),
       day1 :: day2 :: Nil)
   }