From 6fb16d76089e07c4fc273a86c7f887949e904b57 Mon Sep 17 00:00:00 2001 From: Cheng Lian Date: Tue, 16 Sep 2014 18:32:12 -0700 Subject: [PATCH] Fixes typo in test name, regenerated golden answer files --- ...tition-0-be33aaa7253c8f248ff3921cd7dae340} | 0 ...tition-1-640552dd462707563fd255a713f83b41} | 0 ...tition-2-36456c9d0d2e3ef72ab5ba9ba48e5493} | 0 ...tition-3-b7f7fa7ebf666f4fee27e149d8c6961f} | 0 ...tition-4-8bdb71ad8cb3cc3026043def2525de3a} | 0 ...tition-5-c630dce438f3792e7fb0f523fbbb3e1e} | 0 ...tition-6-7abc9ec8a36cdc5e89e955265a7fd7cf} | 0 ...tition-7-be33aaa7253c8f248ff3921cd7dae340} | 0 .../sql/hive/execution/HiveQuerySuite.scala | 34 ++++++++++++------- 9 files changed, 22 insertions(+), 12 deletions(-) rename sql/hive/src/test/resources/golden/{dynamic_partiton-0-310dfcd4399a7d152dd76020fb41ecef => dynamic_partition-0-be33aaa7253c8f248ff3921cd7dae340} (100%) rename sql/hive/src/test/resources/golden/{dynamic_partiton-1-2bba07855af8c11899cc6b89f8c0ee02 => dynamic_partition-1-640552dd462707563fd255a713f83b41} (100%) rename sql/hive/src/test/resources/golden/{dynamic_partiton-2-16367c381d4b189b3640c92511244bfe => dynamic_partition-2-36456c9d0d2e3ef72ab5ba9ba48e5493} (100%) rename sql/hive/src/test/resources/golden/{dynamic_partiton-3-b855e84c1d159eb6fa5fbb8ca371d318 => dynamic_partition-3-b7f7fa7ebf666f4fee27e149d8c6961f} (100%) rename sql/hive/src/test/resources/golden/{dynamic_partiton-4-ccc7d6efb0b13d5649ff98006e7ce182 => dynamic_partition-4-8bdb71ad8cb3cc3026043def2525de3a} (100%) rename sql/hive/src/test/resources/golden/{dynamic_partiton-5-516a04c3833a10c0241ec00dd6474dee => dynamic_partition-5-c630dce438f3792e7fb0f523fbbb3e1e} (100%) rename sql/hive/src/test/resources/golden/{dynamic_partiton-6-b00f7cece45f474c6383b2a9346284ed => dynamic_partition-6-7abc9ec8a36cdc5e89e955265a7fd7cf} (100%) rename sql/hive/src/test/resources/golden/{dynamic_partiton-7-310dfcd4399a7d152dd76020fb41ecef => dynamic_partition-7-be33aaa7253c8f248ff3921cd7dae340} (100%) diff --git a/sql/hive/src/test/resources/golden/dynamic_partiton-0-310dfcd4399a7d152dd76020fb41ecef b/sql/hive/src/test/resources/golden/dynamic_partition-0-be33aaa7253c8f248ff3921cd7dae340 similarity index 100% rename from sql/hive/src/test/resources/golden/dynamic_partiton-0-310dfcd4399a7d152dd76020fb41ecef rename to sql/hive/src/test/resources/golden/dynamic_partition-0-be33aaa7253c8f248ff3921cd7dae340 diff --git a/sql/hive/src/test/resources/golden/dynamic_partiton-1-2bba07855af8c11899cc6b89f8c0ee02 b/sql/hive/src/test/resources/golden/dynamic_partition-1-640552dd462707563fd255a713f83b41 similarity index 100% rename from sql/hive/src/test/resources/golden/dynamic_partiton-1-2bba07855af8c11899cc6b89f8c0ee02 rename to sql/hive/src/test/resources/golden/dynamic_partition-1-640552dd462707563fd255a713f83b41 diff --git a/sql/hive/src/test/resources/golden/dynamic_partiton-2-16367c381d4b189b3640c92511244bfe b/sql/hive/src/test/resources/golden/dynamic_partition-2-36456c9d0d2e3ef72ab5ba9ba48e5493 similarity index 100% rename from sql/hive/src/test/resources/golden/dynamic_partiton-2-16367c381d4b189b3640c92511244bfe rename to sql/hive/src/test/resources/golden/dynamic_partition-2-36456c9d0d2e3ef72ab5ba9ba48e5493 diff --git a/sql/hive/src/test/resources/golden/dynamic_partiton-3-b855e84c1d159eb6fa5fbb8ca371d318 b/sql/hive/src/test/resources/golden/dynamic_partition-3-b7f7fa7ebf666f4fee27e149d8c6961f similarity index 100% rename from sql/hive/src/test/resources/golden/dynamic_partiton-3-b855e84c1d159eb6fa5fbb8ca371d318 rename to sql/hive/src/test/resources/golden/dynamic_partition-3-b7f7fa7ebf666f4fee27e149d8c6961f diff --git a/sql/hive/src/test/resources/golden/dynamic_partiton-4-ccc7d6efb0b13d5649ff98006e7ce182 b/sql/hive/src/test/resources/golden/dynamic_partition-4-8bdb71ad8cb3cc3026043def2525de3a similarity index 100% rename from sql/hive/src/test/resources/golden/dynamic_partiton-4-ccc7d6efb0b13d5649ff98006e7ce182 rename to sql/hive/src/test/resources/golden/dynamic_partition-4-8bdb71ad8cb3cc3026043def2525de3a diff --git a/sql/hive/src/test/resources/golden/dynamic_partiton-5-516a04c3833a10c0241ec00dd6474dee b/sql/hive/src/test/resources/golden/dynamic_partition-5-c630dce438f3792e7fb0f523fbbb3e1e similarity index 100% rename from sql/hive/src/test/resources/golden/dynamic_partiton-5-516a04c3833a10c0241ec00dd6474dee rename to sql/hive/src/test/resources/golden/dynamic_partition-5-c630dce438f3792e7fb0f523fbbb3e1e diff --git a/sql/hive/src/test/resources/golden/dynamic_partiton-6-b00f7cece45f474c6383b2a9346284ed b/sql/hive/src/test/resources/golden/dynamic_partition-6-7abc9ec8a36cdc5e89e955265a7fd7cf similarity index 100% rename from sql/hive/src/test/resources/golden/dynamic_partiton-6-b00f7cece45f474c6383b2a9346284ed rename to sql/hive/src/test/resources/golden/dynamic_partition-6-7abc9ec8a36cdc5e89e955265a7fd7cf diff --git a/sql/hive/src/test/resources/golden/dynamic_partiton-7-310dfcd4399a7d152dd76020fb41ecef b/sql/hive/src/test/resources/golden/dynamic_partition-7-be33aaa7253c8f248ff3921cd7dae340 similarity index 100% rename from sql/hive/src/test/resources/golden/dynamic_partiton-7-310dfcd4399a7d152dd76020fb41ecef rename to sql/hive/src/test/resources/golden/dynamic_partition-7-be33aaa7253c8f248ff3921cd7dae340 diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala index 59639e5d65bf2..129d8c58c2940 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala @@ -271,18 +271,6 @@ class HiveQuerySuite extends HiveComparisonTest { |insert overwrite table src_lv2 SELECT key, D.* lateral view explode(array(key+3, key+4)) D as CX """.stripMargin) - createQueryTest("dynamic_partiton", - """ - |drop table IF EXISTS dynamic_part_table; - |create table dynamic_part_table(intcol int) partitioned by (partcol1 int, partcol2 int); - |set hive.exec.dynamic.partition.mode=nonstrict; - |insert into table dynamic_part_table partition(partcol1, partcol2) select 1, 1, 1 from src where key=150; - |insert into table dynamic_part_table partition(partcol1, partcol2) select 1, NULL, 1 from src where key=150; - |insert into table dynamic_part_table partition(partcol1, partcol2) select 1, 1, NULL from src where key=150; - |insert into table dynamic_part_table partition(partcol1, partcol2) select 1, NULL, NULL from src where key=150; - |drop table IF EXISTS dynamic_part_table; - """.stripMargin) - createQueryTest("lateral view5", "FROM src SELECT explode(array(key+3, key+4))") @@ -580,6 +568,28 @@ class HiveQuerySuite extends HiveComparisonTest { case class LogEntry(filename: String, message: String) case class LogFile(name: String) + createQueryTest("dynamic_partition", + """ + |DROP TABLE IF EXISTS dynamic_part_table; + |CREATE TABLE dynamic_part_table(intcol INT) PARTITIONED BY (partcol1 INT, partcol2 INT); + | + |SET hive.exec.dynamic.partition.mode=nonstrict; + | + |INSERT INTO TABLE dynamic_part_table PARTITION(partcol1, partcol2) + |SELECT 1, 1, 1 FROM src WHERE key=150; + | + |INSERT INTO TABLE dynamic_part_table PARTITION(partcol1, partcol2) + |SELECT 1, NULL, 1 FROM src WHERE key=150; + | + |INSERT INTO TABLE dynamic_part_table PARTITION(partcol1, partcol2) + |SELECT 1, 1, NULL FROM src WHERE key=150; + | + |INSERT INTO TABLe dynamic_part_table PARTITION(partcol1, partcol2) + |SELECT 1, NULL, NULL FROM src WHERE key=150; + | + |DROP TABLE IF EXISTS dynamic_part_table; + """.stripMargin) + test("SPARK-3414 regression: should store analyzed logical plan when registering a temp table") { sparkContext.makeRDD(Seq.empty[LogEntry]).registerTempTable("rawLogs") sparkContext.makeRDD(Seq.empty[LogFile]).registerTempTable("logFiles")