fix

ulysses-you · ulysses-you · commit 515aeba74616 · 2021-05-11T16:42:11.000+08:00
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala
@@ -1566,16 +1566,18 @@ class CachedTableSuite extends QueryTest with SQLTestUtils
             sql("CACHE TABLE t1 as SELECT /*+ REPARTITION */ * FROM values(1) as t(c)")
             assert(spark.table("t1").rdd.partitions.length == 2)
 
-            sql(s"SET ${SQLConf.CAN_CHANGE_CACHED_PLAN_OUTPUT_PARTITIONING.key} = true")
-            assert(spark.table("t1").rdd.partitions.length == 2)
-            sql("CACHE TABLE t2 as SELECT /*+ REPARTITION */ * FROM values(2) as t(c)")
-            assert(spark.table("t2").rdd.partitions.length == 1)
-
-            sql(s"SET ${SQLConf.CAN_CHANGE_CACHED_PLAN_OUTPUT_PARTITIONING.key} = false")
-            assert(spark.table("t1").rdd.partitions.length == 2)
-            assert(spark.table("t2").rdd.partitions.length == 1)
-            sql("CACHE TABLE t3 as SELECT /*+ REPARTITION */ * FROM values(3) as t(c)")
-            assert(spark.table("t3").rdd.partitions.length == 2)
+            withSQLConf(SQLConf.CAN_CHANGE_CACHED_PLAN_OUTPUT_PARTITIONING.key -> "true") {
+              assert(spark.table("t1").rdd.partitions.length == 2)
+              sql("CACHE TABLE t2 as SELECT /*+ REPARTITION */ * FROM values(2) as t(c)")
+              assert(spark.table("t2").rdd.partitions.length == 1)
+
+              withSQLConf(SQLConf.CAN_CHANGE_CACHED_PLAN_OUTPUT_PARTITIONING.key -> "false") {
+                assert(spark.table("t1").rdd.partitions.length == 2)
+                assert(spark.table("t2").rdd.partitions.length == 1)
+                sql("CACHE TABLE t3 as SELECT /*+ REPARTITION */ * FROM values(3) as t(c)")
+                assert(spark.table("t3").rdd.partitions.length == 2)
+              }
+            }
           }
         }
       }
@@ -1599,16 +1601,18 @@ class CachedTableSuite extends QueryTest with SQLTestUtils
           sql("CACHE TABLE t1")
           assert(spark.table("t1").rdd.partitions.length == 2)
 
-          sql(s"SET ${SQLConf.CAN_CHANGE_CACHED_PLAN_OUTPUT_PARTITIONING.key} = true")
-          assert(spark.table("t1").rdd.partitions.length == 2)
-          sql("CACHE TABLE t2")
-          assert(spark.table("t2").rdd.partitions.length == 1)
+          withSQLConf(SQLConf.CAN_CHANGE_CACHED_PLAN_OUTPUT_PARTITIONING.key -> "true") {
+            assert(spark.table("t1").rdd.partitions.length == 2)
+            sql("CACHE TABLE t2")
+            assert(spark.table("t2").rdd.partitions.length == 1)
 
-          sql(s"SET ${SQLConf.CAN_CHANGE_CACHED_PLAN_OUTPUT_PARTITIONING.key} = false")
-          assert(spark.table("t1").rdd.partitions.length == 2)
-          assert(spark.table("t2").rdd.partitions.length == 1)
-          sql("CACHE TABLE t3")
-          assert(spark.table("t3").rdd.partitions.length == 2)
+            withSQLConf(SQLConf.CAN_CHANGE_CACHED_PLAN_OUTPUT_PARTITIONING.key -> "false") {
+              assert(spark.table("t1").rdd.partitions.length == 2)
+              assert(spark.table("t2").rdd.partitions.length == 1)
+              sql("CACHE TABLE t3")
+              assert(spark.table("t3").rdd.partitions.length == 2)
+            }
+          }
         }
       }
     }
