diff --git ql/src/test/queries/clientpositive/repair.q ql/src/test/queries/clientpositive/repair.q index 7eadfbc..2720d1f 100644 --- ql/src/test/queries/clientpositive/repair.q +++ ql/src/test/queries/clientpositive/repair.q @@ -1,24 +1,9 @@ - - CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING); --- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.23) - --- When you invoke the mkdir command using versions of Hadoop up to and including 0.23, --- they behave as if you had specified the -p option, --- *but* they don't actually support the -p option. - --- Support for the -p option first appeared in 1.0 and 2.0, --- but they maintain backward compatibility with older versions, --- so they let you include -p, but if you don't they still act like you did. - --- HADOOP-8551 breaks backward compatibility with 0.23 and older versions by --- requiring you to explicitly specify -p if you require that behavior. - MSCK TABLE repairtable; -dfs -mkdir -p ../build/ql/test/data/warehouse/repairtable/p1=a/p2=a; -dfs -mkdir -p ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a; +dfs -mkdir ../build/ql/test/data/warehouse/repairtable/p1=a/p2=a; +dfs -mkdir ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a; dfs -touchz ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a/datafile; MSCK TABLE repairtable; diff --git ql/src/test/queries/clientpositive/repair_hadoop23.q ql/src/test/queries/clientpositive/repair_hadoop23.q deleted file mode 100644 index a72ad7a..0000000 --- ql/src/test/queries/clientpositive/repair_hadoop23.q +++ /dev/null @@ -1,29 +0,0 @@ - - -CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING); - --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.23) --- When you invoke the mkdir command using versions of Hadoop up to and including 0.23, --- they behave as if you had specified the -p option, --- *but* they don't actually support the -p option. - --- Support for the -p option first appeared in 1.0 and 2.0, --- but they maintain backward compatibility with older versions, --- so they let you include -p, but if you don't they still act like you did. - --- HADOOP-8551 breaks backward compatibility with 0.23 and older versions by --- requiring you to explicitly specify -p if you require that behavior. - -MSCK TABLE repairtable; - -dfs -mkdir ../build/ql/test/data/warehouse/repairtable/p1=a/p2=a; -dfs -mkdir ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a; -dfs -touchz ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a/datafile; - -MSCK TABLE repairtable; - -MSCK REPAIR TABLE repairtable; - -MSCK TABLE repairtable; - - diff --git ql/src/test/results/clientpositive/repair.q.out ql/src/test/results/clientpositive/repair.q.out index 5d9de61..a05726a 100644 --- ql/src/test/results/clientpositive/repair.q.out +++ ql/src/test/results/clientpositive/repair.q.out @@ -3,33 +3,9 @@ PREHOOK: type: CREATETABLE POSTHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@repairtable -PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.23) --- When you invoke the mkdir command using versions of Hadoop up to and including 0.23, --- they behave as if you had specified the -p option, --- *but* they don't actually support the -p option. - --- Support for the -p option first appeared in 1.0 and 2.0, --- but they maintain backward compatibility with older versions, --- so they let you include -p, but if you don't they still act like you did. - --- HADOOP-8551 breaks backward compatibility with 0.23 and older versions by --- requiring you to explicitly specify -p if you require that behavior. - -MSCK TABLE repairtable +PREHOOK: query: MSCK TABLE repairtable PREHOOK: type: MSCK -POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.23) --- When you invoke the mkdir command using versions of Hadoop up to and including 0.23, --- they behave as if you had specified the -p option, --- *but* they don't actually support the -p option. - --- Support for the -p option first appeared in 1.0 and 2.0, --- but they maintain backward compatibility with older versions, --- so they let you include -p, but if you don't they still act like you did. - --- HADOOP-8551 breaks backward compatibility with 0.23 and older versions by --- requiring you to explicitly specify -p if you require that behavior. - -MSCK TABLE repairtable +POSTHOOK: query: MSCK TABLE repairtable POSTHOOK: type: MSCK PREHOOK: query: MSCK TABLE repairtable PREHOOK: type: MSCK