Refine code.

Author: fuwhu

sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/PruneHiveTablePartitions.scala

@@ -101,6 +101,7 @@ private[sql] class PruneHiveTablePartitions(session: SparkSession)
         val newTableMeta = updateTableMeta(relation.tableMeta, newPartitions)
         val newRelation = relation.copy(
           tableMeta = newTableMeta, prunedPartitions = Some(newPartitions))
+        // Keep partition filters so that they are visible in physical planning
         Project(projections, Filter(filters.reduceLeft(And), newRelation))
       } else {
         op

sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/PruneHiveTablePartitionsSuite.scala

@@ -34,28 +34,23 @@ class PruneHiveTablePartitionsSuite extends QueryTest with SQLTestUtils with Tes
 
   test("SPARK-15616 statistics pruned after going throuhg PruneHiveTablePartitions") {
     withTable("test", "temp") {
-      withTempDir { dir =>
-        sql(
-          s"""
-             |CREATE EXTERNAL TABLE test(i int)
-             |PARTITIONED BY (p int)
-             |STORED AS textfile
-             |LOCATION '${dir.toURI}'""".stripMargin)
+      sql(
+        s"""
+           |CREATE TABLE test(i int)
+           |PARTITIONED BY (p int)
+           |STORED AS textfile""".stripMargin)
+      spark.range(0, 1000, 1).selectExpr("id as col")
+        .createOrReplaceTempView("temp")
 
-        spark.range(0, 1000, 1).selectExpr("id as col")
-          .createOrReplaceTempView("temp")
-
-        for (part <- Seq(1, 2, 3, 4)) {
-          sql(s"""
-                 |INSERT OVERWRITE TABLE test PARTITION (p='$part')
-                 |select col from temp""".stripMargin)
-        }
-        val singlePartitionSizeInBytes = 3890
-        val analyzed1 = sql("select i from test where p>0").queryExecution.analyzed
-        val analyzed2 = sql("select i from test where p=1").queryExecution.analyzed
-        assert(Optimize.execute(analyzed1).stats.sizeInBytes === singlePartitionSizeInBytes*4*12/16)
-        assert(Optimize.execute(analyzed2).stats.sizeInBytes === singlePartitionSizeInBytes*12/16)
+      for (part <- Seq(1, 2, 3, 4)) {
+        sql(s"""
+               |INSERT OVERWRITE TABLE test PARTITION (p='$part')
+               |select col from temp""".stripMargin)
       }
+      val analyzed1 = sql("select i from test where p>0").queryExecution.analyzed
+      val analyzed2 = sql("select i from test where p=1").queryExecution.analyzed
+      assert(Optimize.execute(analyzed1).stats.sizeInBytes/4 ===
+        Optimize.execute(analyzed2).stats.sizeInBytes)
     }
   }
 }