Wed Nov 30 13:24:29 PST 2016

Author: ericl

sql/hive/src/test/scala/org/apache/spark/sql/hive/PartitionProviderCompatibilitySuite.scala

@@ -231,30 +231,32 @@ class PartitionProviderCompatibilitySuite
         assert(parts.contains("A=0/B=%3D"))
         assert(parts.contains("A=0/B=%25%3D"))
 
-        // custom locations sanity check
+        // drop partition sanity check
+        spark.sql("alter table test drop partition (A=1, B='%')")
+        assert(spark.sql("select * from test").count() == 29)  // 1 file in dropped partition
+
         withTempDir { dir =>
+          // custom locations sanity check
           spark.sql(s"""
             |alter table test partition (A=0, B='%')
             |set location '${dir.getAbsolutePath}'""".stripMargin)
-          assert(spark.sql("select * from test").count() == 29)  // missing 1
-        }
+          assert(spark.sql("select * from test").count() == 28)  // moved to empty dir
 
-        // drop partition sanity check
-        spark.sql("alter table test drop partition (A=1, B='%')")
-        assert(spark.sql("select * from test").count() == 28)
-
-        // TODO(ekl) fix rename partition
-//        withTempDir { dir =>
-//          spark.sql(s"""
-//            |alter table test partition (A=0, B='%')
-//            |rename to partition (A=100, B='%')""".stripMargin)
-//          assert(spark.sql("select * from test where a = 100").count() == 1)
-//        }
-
-        // TODO(ekl) fix overwrite table
-//        spark.sql("show partitions test").show(false)
-//        spark.sql("insert overwrite table test partition (a, b) select id, id, '%' from range(1)")
-//        assert(spark.sql("select * from test").count() == 1)
+          // rename partition sanity check
+          spark.sql(s"""
+            |alter table test partition (A=5, B='%')
+            |rename to partition (A=100, B='%')""".stripMargin)
+          assert(spark.sql("select * from test where a = 5 and b = '%'").count() == 0)
+          assert(spark.sql("select * from test where a = 100 and b = '%'").count() == 1)
+
+          // try with A=0 which has a custom location
+          spark.sql("insert into test partition (A=0, B='%') select 1")
+          spark.sql(s"""
+            |alter table test partition (A=0, B='%')
+            |rename to partition (A=101, B='%')""".stripMargin)
+          assert(spark.sql("select * from test where a = 0 and b = '%'").count() == 0)
+          assert(spark.sql("select * from test where a = 101 and b = '%'").count() == 1)
+        }
       }
     }
   }