This is an automated email from the ASF dual-hosted git repository.
zabetak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 566f48d3d3f HIVE-26584: Cleanup dangling testdata for
compressed_skip_header_footer_aggr/empty_skip_header_footer_aggr (John Sherman
reviewed by Ayush Saxena, Stamatis Zampetakis)
566f48d3d3f is described below
commit 566f48d3d3fc740ef958bdf963e511e0853da402
Author: John Sherman <j...@cloudera.com>
AuthorDate: Sat Oct 1 09:56:09 2022 -0700
HIVE-26584: Cleanup dangling testdata for
compressed_skip_header_footer_aggr/empty_skip_header_footer_aggr (John Sherman
reviewed by Ayush Saxena, Stamatis Zampetakis)
Closes #3636
---
.../clientpositive/compressed_skip_header_footer_aggr.q | 12 +++++++++---
.../queries/clientpositive/empty_skip_header_footer_aggr.q | 12 +++++-------
.../llap/compressed_skip_header_footer_aggr.q.out | 1 +
.../clientpositive/llap/empty_skip_header_footer_aggr.q.out | 11 +----------
.../tez/compressed_skip_header_footer_aggr.q.out | 1 +
.../clientpositive/tez/empty_skip_header_footer_aggr.q.out | 11 +----------
6 files changed, 18 insertions(+), 30 deletions(-)
diff --git
a/ql/src/test/queries/clientpositive/compressed_skip_header_footer_aggr.q
b/ql/src/test/queries/clientpositive/compressed_skip_header_footer_aggr.q
index 58853bef859..9cca2f47f62 100644
--- a/ql/src/test/queries/clientpositive/compressed_skip_header_footer_aggr.q
+++ b/ql/src/test/queries/clientpositive/compressed_skip_header_footer_aggr.q
@@ -4,8 +4,7 @@ SET hive.explain.user=false;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/testcase1;
dfs -copyFromLocal ../../data/files/compressed_4line_file1.csv
${system:test.tmp.dir}/testcase1/;
---
---
+
CREATE EXTERNAL TABLE `testcase1`(id int, name string) ROW FORMAT SERDE
'org.apache.hadoop.hive.serde2.OpenCSVSerde'
LOCATION '${system:test.tmp.dir}/testcase1'
TBLPROPERTIES ("skip.header.line.count"="1", "skip.footer.line.count"="1");
@@ -97,4 +96,11 @@ select count(*) from testcase_gz;
set hive.fetch.task.conversion=none;
select * from testcase_gz;
-select count(*) from testcase_gz;
\ No newline at end of file
+select count(*) from testcase_gz;
+
+-- clean up testdata
+dfs -rmr ${system:test.tmp.dir}/testcase_gz;
+dfs -rmr ${system:test.tmp.dir}/testcase1/;
+dfs -rmr ${system:test.tmp.dir}/testcase2/;
+dfs -rmr ${system:test.tmp.dir}/testcase3/;
+dfs -rmr ${system:test.tmp.dir}/testcase4/;
diff --git a/ql/src/test/queries/clientpositive/empty_skip_header_footer_aggr.q
b/ql/src/test/queries/clientpositive/empty_skip_header_footer_aggr.q
index 7d09ac48c1a..0406ef0a425 100644
--- a/ql/src/test/queries/clientpositive/empty_skip_header_footer_aggr.q
+++ b/ql/src/test/queries/clientpositive/empty_skip_header_footer_aggr.q
@@ -2,13 +2,10 @@ SET hive.query.results.cache.enabled=false;
SET hive.mapred.mode=nonstrict;
SET hive.explain.user=false;
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/testcase1;
-dfs -rmr ${system:test.tmp.dir}/testcase1;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/testcase1;
dfs -copyFromLocal ../../data/files/emptyhead_4line_file1.csv
${system:test.tmp.dir}/testcase1/;
--
--
-DROP TABLE IF EXISTS `testcase1`;
CREATE EXTERNAL TABLE `testcase1`(id int, name string) ROW FORMAT SERDE
'org.apache.hadoop.hive.serde2.OpenCSVSerde'
LOCATION '${system:test.tmp.dir}/testcase1'
TBLPROPERTIES ("skip.header.line.count"="1");
@@ -25,13 +22,10 @@ set hive.fetch.task.conversion=none;
select * from testcase1;
select count(*) from testcase1;
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/testcase2;
-dfs -rmr ${system:test.tmp.dir}/testcase2;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/testcase2;
dfs -copyFromLocal ../../data/files/emptyhead_4line_file1.csv.bz2
${system:test.tmp.dir}/testcase2/;
--
--
-DROP TABLE IF EXISTS `testcase2`;
CREATE EXTERNAL TABLE `testcase2`(id int, name string) ROW FORMAT SERDE
'org.apache.hadoop.hive.serde2.OpenCSVSerde'
LOCATION '${system:test.tmp.dir}/testcase2'
TBLPROPERTIES ("skip.header.line.count"="1");
@@ -42,4 +36,8 @@ select count(*) from testcase2;
set hive.fetch.task.conversion=none;
select * from testcase2;
-select count(*) from testcase2;
\ No newline at end of file
+select count(*) from testcase2;
+
+-- clean up external table files
+dfs -rmr ${system:test.tmp.dir}/testcase1/;
+dfs -rmr ${system:test.tmp.dir}/testcase2/;
diff --git
a/ql/src/test/results/clientpositive/llap/compressed_skip_header_footer_aggr.q.out
b/ql/src/test/results/clientpositive/llap/compressed_skip_header_footer_aggr.q.out
index cf27700f2bc..2d9be8f3b25 100644
---
a/ql/src/test/results/clientpositive/llap/compressed_skip_header_footer_aggr.q.out
+++
b/ql/src/test/results/clientpositive/llap/compressed_skip_header_footer_aggr.q.out
@@ -360,3 +360,4 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@testcase_gz
#### A masked pattern was here ####
2
+#### A masked pattern was here ####
diff --git
a/ql/src/test/results/clientpositive/llap/empty_skip_header_footer_aggr.q.out
b/ql/src/test/results/clientpositive/llap/empty_skip_header_footer_aggr.q.out
index b88359573e3..81d2f5a456f 100644
---
a/ql/src/test/results/clientpositive/llap/empty_skip_header_footer_aggr.q.out
+++
b/ql/src/test/results/clientpositive/llap/empty_skip_header_footer_aggr.q.out
@@ -1,8 +1,3 @@
-#### A masked pattern was here ####
-PREHOOK: query: DROP TABLE IF EXISTS `testcase1`
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS `testcase1`
-POSTHOOK: type: DROPTABLE
PREHOOK: query: CREATE EXTERNAL TABLE `testcase1`(id int, name string) ROW
FORMAT SERDE 'org.apache.hadoop.hive.serde2.OpenCSVSerde'
#### A masked pattern was here ####
TBLPROPERTIES ("skip.header.line.count"="1")
@@ -57,11 +52,6 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@testcase1
#### A masked pattern was here ####
3
-#### A masked pattern was here ####
-PREHOOK: query: DROP TABLE IF EXISTS `testcase2`
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS `testcase2`
-POSTHOOK: type: DROPTABLE
PREHOOK: query: CREATE EXTERNAL TABLE `testcase2`(id int, name string) ROW
FORMAT SERDE 'org.apache.hadoop.hive.serde2.OpenCSVSerde'
#### A masked pattern was here ####
TBLPROPERTIES ("skip.header.line.count"="1")
@@ -116,3 +106,4 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@testcase2
#### A masked pattern was here ####
3
+#### A masked pattern was here ####
diff --git
a/ql/src/test/results/clientpositive/tez/compressed_skip_header_footer_aggr.q.out
b/ql/src/test/results/clientpositive/tez/compressed_skip_header_footer_aggr.q.out
index a42e75e8e70..7bb02dfa10d 100644
---
a/ql/src/test/results/clientpositive/tez/compressed_skip_header_footer_aggr.q.out
+++
b/ql/src/test/results/clientpositive/tez/compressed_skip_header_footer_aggr.q.out
@@ -360,3 +360,4 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@testcase_gz
POSTHOOK: Output: hdfs://### HDFS PATH ###
2
+#### A masked pattern was here ####
diff --git
a/ql/src/test/results/clientpositive/tez/empty_skip_header_footer_aggr.q.out
b/ql/src/test/results/clientpositive/tez/empty_skip_header_footer_aggr.q.out
index fdb18c509df..a6e1c2137b6 100644
--- a/ql/src/test/results/clientpositive/tez/empty_skip_header_footer_aggr.q.out
+++ b/ql/src/test/results/clientpositive/tez/empty_skip_header_footer_aggr.q.out
@@ -1,8 +1,3 @@
-#### A masked pattern was here ####
-PREHOOK: query: DROP TABLE IF EXISTS `testcase1`
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS `testcase1`
-POSTHOOK: type: DROPTABLE
PREHOOK: query: CREATE EXTERNAL TABLE `testcase1`(id int, name string) ROW
FORMAT SERDE 'org.apache.hadoop.hive.serde2.OpenCSVSerde'
#### A masked pattern was here ####
TBLPROPERTIES ("skip.header.line.count"="1")
@@ -57,11 +52,6 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@testcase1
POSTHOOK: Output: hdfs://### HDFS PATH ###
3
-#### A masked pattern was here ####
-PREHOOK: query: DROP TABLE IF EXISTS `testcase2`
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS `testcase2`
-POSTHOOK: type: DROPTABLE
PREHOOK: query: CREATE EXTERNAL TABLE `testcase2`(id int, name string) ROW
FORMAT SERDE 'org.apache.hadoop.hive.serde2.OpenCSVSerde'
#### A masked pattern was here ####
TBLPROPERTIES ("skip.header.line.count"="1")
@@ -116,3 +106,4 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@testcase2
POSTHOOK: Output: hdfs://### HDFS PATH ###
3
+#### A masked pattern was here ####
