You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2016/08/11 00:10:01 UTC

[49/51] [partial] hive git commit: HIVE-14376: Schema evolution tests takes a long time (Prasanth Jayachandran reviewed by Matt McCline)

http://git-wip-us.apache.org/repos/asf/hive/blob/9a798130/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q
index 0328d0a..f9297dc 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q
@@ -45,12 +45,12 @@ insert into table table_add_int_permute_select
            (10, 6, 'new', 200);
 
 explain
-select insert_num,a,b from table_add_int_permute_select order by insert_num;
+select insert_num,a,b from table_add_int_permute_select;
 
 -- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,a,b from table_add_int_permute_select order by insert_num;
-select insert_num,a,b,c from table_add_int_permute_select order by insert_num;
-select insert_num,c from table_add_int_permute_select order by insert_num;
+select insert_num,a,b from table_add_int_permute_select;
+select insert_num,a,b,c from table_add_int_permute_select;
+select insert_num,c from table_add_int_permute_select;
 
 drop table table_add_int_permute_select;
 
@@ -82,16 +82,16 @@ insert into table table_add_int_string_permute_select
            (10, 6, 'new', 200, 'two hundred');
 
 explain
-select insert_num,a,b from table_add_int_string_permute_select order by insert_num;
+select insert_num,a,b from table_add_int_string_permute_select;
 
 -- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,a,b from table_add_int_string_permute_select order by insert_num;
-select insert_num,a,b,c from table_add_int_string_permute_select order by insert_num;
-select insert_num,a,b,c,d from table_add_int_string_permute_select order by insert_num;
-select insert_num,a,c,d from table_add_int_string_permute_select order by insert_num;
-select insert_num,a,d from table_add_int_string_permute_select order by insert_num;
-select insert_num,c from table_add_int_string_permute_select order by insert_num;
-select insert_num,d from table_add_int_string_permute_select order by insert_num;
+select insert_num,a,b from table_add_int_string_permute_select;
+select insert_num,a,b,c from table_add_int_string_permute_select;
+select insert_num,a,b,c,d from table_add_int_string_permute_select;
+select insert_num,a,c,d from table_add_int_string_permute_select;
+select insert_num,a,d from table_add_int_string_permute_select;
+select insert_num,c from table_add_int_string_permute_select;
+select insert_num,d from table_add_int_string_permute_select;
 
 drop table table_add_int_string_permute_select;
 
@@ -126,9 +126,9 @@ insert into table table_change_string_group_double
            (10, 9250340.75 , 9250340.75 , 9250340.75 , 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_string_group_double order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_string_group_double;
 
-select insert_num,c1,c2,c3,b from table_change_string_group_double order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_string_group_double;
 
 drop table table_change_string_group_double;
 
@@ -159,9 +159,9 @@ insert into table table_change_date_group_string_group_timestamp
            (9, '5966-07-09 03:30:50.597', '5966-07-09 03:30:50.597', '5966-07-09 03:30:50.597', '5966-07-09 03:30:50.597', '5966-07-09 03:30:50.597', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,c5,b from table_change_date_group_string_group_timestamp order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,b from table_change_date_group_string_group_timestamp;
 
-select insert_num,c1,c2,c3,c4,c5,b from table_change_date_group_string_group_timestamp order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,b from table_change_date_group_string_group_timestamp;
 
 drop table table_change_date_group_string_group_timestamp;
 
@@ -189,9 +189,9 @@ insert into table table_change_date_group_string_group_date
            (9, '5966-07-09', '5966-07-09', '5966-07-09', '5966-07-09', '5966-07-09', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,c5,b from table_change_date_group_string_group_date order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,b from table_change_date_group_string_group_date;
 
-select insert_num,c1,c2,c3,c4,c5,b from table_change_date_group_string_group_date order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,b from table_change_date_group_string_group_date;
 
 drop table table_change_date_group_string_group_date;
 
@@ -212,7 +212,7 @@ insert into table table_change_numeric_group_string_group_multi_ints_string
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_string order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_string;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_multi_ints_string replace columns (insert_num int, c1 STRING, c2 STRING, c3 STRING, c4 STRING, b STRING) ;
@@ -226,9 +226,9 @@ insert into table table_change_numeric_group_string_group_multi_ints_string
            (10, '17', '90000', '754072151', '3289094', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_string order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_string;
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_string order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_string;
 
 drop table table_change_numeric_group_string_group_multi_ints_string;
 
@@ -245,7 +245,7 @@ insert into table table_change_numeric_group_string_group_multi_ints_char
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_multi_ints_char replace columns (insert_num int, c1 CHAR(50), c2 CHAR(50), c3 CHAR(50), c4 CHAR(50), b STRING) ;
@@ -259,9 +259,9 @@ insert into table table_change_numeric_group_string_group_multi_ints_char
            (10, '17', '90000', '754072151', '3289094', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char;
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char;
 
 drop table table_change_numeric_group_string_group_multi_ints_char;
 
@@ -277,7 +277,7 @@ insert into table table_change_numeric_group_string_group_multi_ints_char_trunc
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char_trunc order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_multi_ints_char_trunc replace columns (insert_num int, c1 CHAR(5), c2 CHAR(5), c3 CHAR(5), c4 CHAR(5), b STRING) ;
@@ -291,9 +291,9 @@ insert into table table_change_numeric_group_string_group_multi_ints_char_trunc
            (10, '17', '90000', '754072151', '3289094', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char_trunc order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char_trunc;
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char_trunc order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_char_trunc;
 
 drop table table_change_numeric_group_string_group_multi_ints_char_trunc;
 
@@ -310,7 +310,7 @@ insert into table table_change_numeric_group_string_group_multi_ints_varchar
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_multi_ints_varchar replace columns (insert_num int, c1 VARCHAR(50), c2 VARCHAR(50), c3 VARCHAR(50), c4 VARCHAR(50), b STRING) ;
@@ -324,9 +324,9 @@ insert into table table_change_numeric_group_string_group_multi_ints_varchar
            (10, '17', '90000', '754072151', '3289094', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar;
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar;
 
 drop table table_change_numeric_group_string_group_multi_ints_varchar;
 
@@ -342,7 +342,7 @@ insert into table table_change_numeric_group_string_group_multi_ints_varchar_tru
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar_trunc order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_multi_ints_varchar_trunc replace columns (insert_num int, c1 VARCHAR(5), c2 VARCHAR(5), c3 VARCHAR(5), c4 VARCHAR(5), b STRING) ;
@@ -356,9 +356,9 @@ insert into table table_change_numeric_group_string_group_multi_ints_varchar_tru
            (10, '17', '90000', '754072151', '3289094', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar_trunc order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
-select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar_trunc order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
 drop table table_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
@@ -374,7 +374,7 @@ insert into table table_change_numeric_group_string_group_floating_string
            (3, - 832222222, 255, 4957,'original'),
            (4, 847492223, 0, 20435, 'original');
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_string order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_string;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_floating_string replace columns (insert_num int, c1 STRING, c2 STRING, c3 STRING, b STRING) ;
@@ -388,9 +388,9 @@ insert into table table_change_numeric_group_string_group_floating_string
            (10, '17', '90000', '754072151', 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_string order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_string;
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_string order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_string;
 
 drop table table_change_numeric_group_string_group_floating_string;
 
@@ -406,7 +406,7 @@ insert into table table_change_numeric_group_string_group_floating_char
            (3,  9000000000, -255, 4957,'original'),
            (4, -999999999999, 0, 20435, 'original');
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_floating_char replace columns (insert_num int, c1 CHAR(50), c2 CHAR(50), c3 CHAR(50), b STRING) ;
@@ -420,9 +420,9 @@ insert into table table_change_numeric_group_string_group_floating_char
            (10, '17', '90000', '754072151', 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char;
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char;
 
 drop table table_change_numeric_group_string_group_floating_char;
 
@@ -438,7 +438,7 @@ insert into table table_change_numeric_group_string_group_floating_char_trunc
            (3, 832222222, -255, 4957, 'original'),
            (4, 847492223, 0, 20435, 'original');
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char_trunc order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_floating_char_trunc replace columns (insert_num int, c1 CHAR(7), c2 CHAR(7), c3 CHAR(7), b STRING) ;
@@ -452,9 +452,9 @@ insert into table table_change_numeric_group_string_group_floating_char_trunc
            (10, '17', '90000', '754072151', 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char_trunc order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char_trunc;
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char_trunc order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_char_trunc;
 
 drop table table_change_numeric_group_string_group_floating_char_trunc;
 
@@ -470,7 +470,7 @@ insert into table table_change_numeric_group_string_group_floating_varchar
            (3, 9000000000, -255, 4957, 'original'),
            (4, -999999999999, 0, 20435, 'original');
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_floating_varchar replace columns (insert_num int, c1 VARCHAR(50), c2 VARCHAR(50), c3 VARCHAR(50), b STRING) ;
@@ -484,9 +484,9 @@ insert into table table_change_numeric_group_string_group_floating_varchar
            (10, '17', '90000', '754072151', 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar;
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar;
 
 drop table table_change_numeric_group_string_group_floating_varchar;
 
@@ -502,7 +502,7 @@ insert into table table_change_numeric_group_string_group_floating_varchar_trunc
            (3, 9000000000, -255, 4957, 'original'),
            (4, -999999999999, 0, 20435, 'original');
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar_trunc order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_numeric_group_string_group_floating_varchar_trunc replace columns (insert_num int, c1 VARCHAR(7), c2 VARCHAR(7), c3 VARCHAR(7), b STRING) ;
@@ -516,9 +516,9 @@ insert into table table_change_numeric_group_string_group_floating_varchar_trunc
            (10, '17', '90000', '754072151', 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar_trunc order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar_trunc;
 
-select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar_trunc order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_numeric_group_string_group_floating_varchar_trunc;
 
 drop table table_change_numeric_group_string_group_floating_varchar_trunc;
 
@@ -538,7 +538,7 @@ insert into table table_change_string_group_string_group_string
            (3, 'dynamic reptile', 'dynamic reptile', 'dynamic reptile', 'dynamic reptile', 'original'),
            (4, 'blank pads   ', 'blank pads   ', 'blank pads   ', 'blank pads   ', 'original');
 
-select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_string_group_string_group_string replace columns (insert_num int, c1 CHAR(50), c2 CHAR(9), c3 VARCHAR(50), c4 CHAR(9), b STRING) ;
@@ -552,9 +552,9 @@ insert into table table_change_string_group_string_group_string
            (10, 'bottom  ', 'bottom  ', 'bottom  ', 'bottom  ', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string;
 
-select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string;
 
 drop table table_change_string_group_string_group_string;
 
@@ -571,7 +571,7 @@ insert into table table_change_string_group_string_group_char
            (3, 'dynamic reptile', 'dynamic reptile', 'dynamic reptile', 'original'),
            (4, 'blank pads   ', 'blank pads   ', 'blank pads   ', 'original');
 
-select insert_num,c1,c2,c3,b from table_change_string_group_string_group_char order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_string_group_string_group_char;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_string_group_string_group_char replace columns (insert_num int, c1 VARCHAR(50), c2 VARCHAR(9), c3 STRING, b STRING) ;
@@ -585,9 +585,9 @@ insert into table table_change_string_group_string_group_char
            (10, 'bottom  ', 'bottom  ', 'bottom  ', 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_string_group_string_group_char order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_string_group_string_group_char;
 
-select insert_num,c1,c2,c3,b from table_change_string_group_string_group_char order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_string_group_string_group_char;
 
 drop table table_change_string_group_string_group_char;
 
@@ -604,7 +604,7 @@ insert into table table_change_string_group_string_group_varchar
            (3, 'dynamic reptile', 'dynamic reptile', 'dynamic reptile', 'original'),
            (4, 'blank pads   ', 'blank pads   ', 'blank pads   ', 'original');
 
-select insert_num,c1,c2,c3,b from table_change_string_group_string_group_varchar order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_string_group_string_group_varchar;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_string_group_string_group_varchar replace columns (insert_num int, c1 CHAR(50), c2 CHAR(9), c3 STRING, b STRING) ;
@@ -618,9 +618,9 @@ insert into table table_change_string_group_string_group_varchar
            (10, 'bottom  ', 'bottom  ', 'bottom  ', 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_string_group_string_group_varchar order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_string_group_string_group_varchar;
 
-select insert_num,c1,c2,c3,b from table_change_string_group_string_group_varchar order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_string_group_string_group_varchar;
 
 drop table table_change_string_group_string_group_varchar;
 
@@ -641,7 +641,7 @@ insert into table table_change_lower_to_higher_numeric_group_tinyint
            (3, -255, -255, -255, -255, -255, -255, 'original'),
            (4, 100, 100, 100, 100, 100, 100, 'original');
 
-select insert_num,c1,c2,c3,c4,c5,c6,b from table_change_lower_to_higher_numeric_group_tinyint order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,c6,b from table_change_lower_to_higher_numeric_group_tinyint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_lower_to_higher_numeric_group_tinyint replace columns (insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, c6 DOUBLE, b STRING) ;
@@ -655,9 +655,9 @@ insert into table table_change_lower_to_higher_numeric_group_tinyint
            (10, '17', '90000', '754072151', '95', '20', '18', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,c5,c6,b from table_change_lower_to_higher_numeric_group_tinyint order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,c6,b from table_change_lower_to_higher_numeric_group_tinyint;
 
-select insert_num,c1,c2,c3,c4,c5,c6,b from table_change_lower_to_higher_numeric_group_tinyint order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,c6,b from table_change_lower_to_higher_numeric_group_tinyint;
 
 drop table table_change_lower_to_higher_numeric_group_tinyint;
 
@@ -673,7 +673,7 @@ insert into table table_change_lower_to_higher_numeric_group_smallint
            (3, -5000, -5000, -5000, -5000, -5000, 'original'),
            (4, 100, 100, 100, 100, 100, 'original');
 
-select insert_num,c1,c2,c3,c4,c5,b from table_change_lower_to_higher_numeric_group_smallint order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,b from table_change_lower_to_higher_numeric_group_smallint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_lower_to_higher_numeric_group_smallint replace columns (insert_num int, c1 INT, c2 BIGINT, c3 decimal(38,18), c4 FLOAT, c5 DOUBLE, b STRING) ;
@@ -687,9 +687,9 @@ insert into table table_change_lower_to_higher_numeric_group_smallint
            (10, '17', '90000', '754072151', '95', '20', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,c5,b from table_change_lower_to_higher_numeric_group_smallint order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,b from table_change_lower_to_higher_numeric_group_smallint;
 
-select insert_num,c1,c2,c3,c4,c5,b from table_change_lower_to_higher_numeric_group_smallint order by insert_num;
+select insert_num,c1,c2,c3,c4,c5,b from table_change_lower_to_higher_numeric_group_smallint;
 
 drop table table_change_lower_to_higher_numeric_group_smallint;
 
@@ -706,7 +706,7 @@ insert into table table_change_lower_to_higher_numeric_group_int
            (3, -5000, -5000, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 52927714, 52927714, 'original');
 
-select insert_num,c1,c2,c3,c4,b from table_change_lower_to_higher_numeric_group_int order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_lower_to_higher_numeric_group_int;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_lower_to_higher_numeric_group_int replace columns (insert_num int, c1 BIGINT, c2 decimal(38,18), c3 FLOAT, c4 DOUBLE,  b STRING) ;
@@ -720,9 +720,9 @@ insert into table table_change_lower_to_higher_numeric_group_int
            (10, '17', '90000', '754072151', '95', 'new');
 
 explain
-select insert_num,c1,c2,c3,c4,b from table_change_lower_to_higher_numeric_group_int order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_lower_to_higher_numeric_group_int;
 
-select insert_num,c1,c2,c3,c4,b from table_change_lower_to_higher_numeric_group_int order by insert_num;
+select insert_num,c1,c2,c3,c4,b from table_change_lower_to_higher_numeric_group_int;
 
 drop table table_change_lower_to_higher_numeric_group_int;
 
@@ -738,7 +738,7 @@ insert into table table_change_lower_to_higher_numeric_group_bigint
            (3, -5000, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 52927714, 'original');
 
-select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_bigint order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_bigint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_lower_to_higher_numeric_group_bigint replace columns (insert_num int, c1 decimal(38,18), c2 FLOAT, c3 DOUBLE, b STRING) ;
@@ -752,9 +752,9 @@ insert into table table_change_lower_to_higher_numeric_group_bigint
            (10, '17', '90000', '754072151', 'new');
 
 explain
-select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_bigint order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_bigint;
 
-select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_bigint order by insert_num;
+select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_bigint;
 
 drop table table_change_lower_to_higher_numeric_group_bigint;
 
@@ -770,7 +770,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
            (3, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 'original');
 
-select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING) ;
@@ -784,9 +784,9 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
            (10, '1.7', '17.8888', 'new');
 
 explain
-select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal;
 
-select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal;
 
 drop table table_change_lower_to_higher_numeric_group_decimal;
 
@@ -803,7 +803,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
            (3, -5000, 'original'),
            (4, 52927714, 'original');
 
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
@@ -817,8 +817,8 @@ insert into table table_change_lower_to_higher_numeric_group_float
            (10, '17', 'new');
 
 explain
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float;
 
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float;
 
-drop table table_change_lower_to_higher_numeric_group_float;
\ No newline at end of file
+drop table table_change_lower_to_higher_numeric_group_float;

http://git-wip-us.apache.org/repos/asf/hive/blob/9a798130/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
index 859dc65..d3eb43e 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
@@ -46,12 +46,12 @@ insert into table part_add_int_permute_select partition(part=1)
            (10, 6, 'new', 200);
 
 explain
-select insert_num,part,a,b from part_add_int_permute_select order by insert_num;
+select insert_num,part,a,b from part_add_int_permute_select;
 
 -- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,part,a,b from part_add_int_permute_select order by insert_num;
-select insert_num,part,a,b,c from part_add_int_permute_select order by insert_num;
-select insert_num,part,c from part_add_int_permute_select order by insert_num;
+select insert_num,part,a,b from part_add_int_permute_select;
+select insert_num,part,a,b,c from part_add_int_permute_select;
+select insert_num,part,c from part_add_int_permute_select;
 
 drop table part_add_int_permute_select;
 
@@ -83,16 +83,16 @@ insert into table part_add_int_string_permute_select partition(part=1)
            (10, 6, 'new', 200, 'two hundred');
 
 explain
-select insert_num,part,a,b from part_add_int_string_permute_select order by insert_num;
+select insert_num,part,a,b from part_add_int_string_permute_select;
 
 -- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,part,a,b from part_add_int_string_permute_select order by insert_num;
-select insert_num,part,a,b,c from part_add_int_string_permute_select order by insert_num;
-select insert_num,part,a,b,c,d from part_add_int_string_permute_select order by insert_num;
-select insert_num,part,a,c,d from part_add_int_string_permute_select order by insert_num;
-select insert_num,part,a,d from part_add_int_string_permute_select order by insert_num;
-select insert_num,part,c from part_add_int_string_permute_select order by insert_num;
-select insert_num,part,d from part_add_int_string_permute_select order by insert_num;
+select insert_num,part,a,b from part_add_int_string_permute_select;
+select insert_num,part,a,b,c from part_add_int_string_permute_select;
+select insert_num,part,a,b,c,d from part_add_int_string_permute_select;
+select insert_num,part,a,c,d from part_add_int_string_permute_select;
+select insert_num,part,a,d from part_add_int_string_permute_select;
+select insert_num,part,c from part_add_int_string_permute_select;
+select insert_num,part,d from part_add_int_string_permute_select;
 
 drop table part_add_int_string_permute_select;
 
@@ -127,9 +127,9 @@ insert into table part_change_string_group_double partition(part=1)
            (10, 9250340.75 , 9250340.75 , 9250340.75 , 'new');
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_string_group_double order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_string_group_double;
 
-select insert_num,part,c1,c2,c3,b from part_change_string_group_double order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_string_group_double;
 
 drop table part_change_string_group_double;
 
@@ -160,9 +160,9 @@ insert into table part_change_date_group_string_group_timestamp partition(part=1
            (9, '5966-07-09 03:30:50.597', '5966-07-09 03:30:50.597', '5966-07-09 03:30:50.597', '5966-07-09 03:30:50.597', '5966-07-09 03:30:50.597', 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,b from part_change_date_group_string_group_timestamp order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,b from part_change_date_group_string_group_timestamp;
 
-select insert_num,part,c1,c2,c3,c4,c5,b from part_change_date_group_string_group_timestamp order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,b from part_change_date_group_string_group_timestamp;
 
 drop table part_change_date_group_string_group_timestamp;
 
@@ -190,9 +190,9 @@ insert into table part_change_date_group_string_group_date partition(part=2)
            (9, '5966-07-09', '5966-07-09', '5966-07-09', '5966-07-09', '5966-07-09', 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,b from part_change_date_group_string_group_date order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,b from part_change_date_group_string_group_date;
 
-select insert_num,part,c1,c2,c3,c4,c5,b from part_change_date_group_string_group_date order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,b from part_change_date_group_string_group_date;
 
 drop table part_change_date_group_string_group_date;
 
@@ -213,7 +213,7 @@ insert into table part_change_numeric_group_string_group_multi_ints_string parti
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_string;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_multi_ints_string replace columns (insert_num int, c1 STRING, c2 STRING, c3 STRING, c4 STRING, b STRING) ;
@@ -227,9 +227,9 @@ insert into table part_change_numeric_group_string_group_multi_ints_string parti
            (10, '17', '90000', '754072151', '3289094', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_string;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_string;
 
 drop table part_change_numeric_group_string_group_multi_ints_string;
 
@@ -246,7 +246,7 @@ insert into table part_change_numeric_group_string_group_multi_ints_char partiti
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_multi_ints_char replace columns (insert_num int, c1 CHAR(50), c2 CHAR(50), c3 CHAR(50), c4 CHAR(50), b STRING) ;
@@ -260,9 +260,9 @@ insert into table part_change_numeric_group_string_group_multi_ints_char partiti
            (10, '17', '90000', '754072151', '3289094', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char;
 
 drop table part_change_numeric_group_string_group_multi_ints_char;
 
@@ -278,7 +278,7 @@ insert into table part_change_numeric_group_string_group_multi_ints_char_trunc p
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_multi_ints_char_trunc replace columns (insert_num int, c1 CHAR(5), c2 CHAR(5), c3 CHAR(5), c4 CHAR(5), b STRING) ;
@@ -292,9 +292,9 @@ insert into table part_change_numeric_group_string_group_multi_ints_char_trunc p
            (10, '17', '90000', '754072151', '3289094', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char_trunc;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_char_trunc;
 
 drop table part_change_numeric_group_string_group_multi_ints_char_trunc;
 
@@ -311,7 +311,7 @@ insert into table part_change_numeric_group_string_group_multi_ints_varchar part
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_multi_ints_varchar replace columns (insert_num int, c1 VARCHAR(50), c2 VARCHAR(50), c3 VARCHAR(50), c4 VARCHAR(50), b STRING) ;
@@ -325,9 +325,9 @@ insert into table part_change_numeric_group_string_group_multi_ints_varchar part
            (10, '17', '90000', '754072151', '3289094', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar;
 
 drop table part_change_numeric_group_string_group_multi_ints_varchar;
 
@@ -343,7 +343,7 @@ insert into table part_change_numeric_group_string_group_multi_ints_varchar_trun
            (3, -255, 4957, 832222222, 9000000000, 'original'),
            (4, 0, 20435, 847492223, -999999999999, 'original');
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_multi_ints_varchar_trunc replace columns (insert_num int, c1 VARCHAR(5), c2 VARCHAR(5), c3 VARCHAR(5), c4 VARCHAR(5), b STRING) ;
@@ -357,9 +357,9 @@ insert into table part_change_numeric_group_string_group_multi_ints_varchar_trun
            (10, '17', '90000', '754072151', '3289094', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
 drop table part_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
@@ -375,7 +375,7 @@ insert into table part_change_numeric_group_string_group_floating_string partiti
            (3, - 832222222, 255, 4957,'original'),
            (4, 847492223, 0, 20435, 'original');
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_string order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_string;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_floating_string replace columns (insert_num int, c1 STRING, c2 STRING, c3 STRING, b STRING) ;
@@ -389,9 +389,9 @@ insert into table part_change_numeric_group_string_group_floating_string partiti
            (10, '17', '90000', '754072151', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_string order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_string;
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_string order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_string;
 
 drop table part_change_numeric_group_string_group_floating_string;
 
@@ -407,7 +407,7 @@ insert into table part_change_numeric_group_string_group_floating_char partition
            (3,  9000000000, -255, 4957,'original'),
            (4, -999999999999, 0, 20435, 'original');
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_floating_char replace columns (insert_num int, c1 CHAR(50), c2 CHAR(50), c3 CHAR(50), b STRING) ;
@@ -421,9 +421,9 @@ insert into table part_change_numeric_group_string_group_floating_char partition
            (10, '17', '90000', '754072151', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char;
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char;
 
 drop table part_change_numeric_group_string_group_floating_char;
 
@@ -439,7 +439,7 @@ insert into table part_change_numeric_group_string_group_floating_char_trunc par
            (3, 832222222, -255, 4957, 'original'),
            (4, 847492223, 0, 20435, 'original');
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_floating_char_trunc replace columns (insert_num int, c1 CHAR(7), c2 CHAR(7), c3 CHAR(7), b STRING) ;
@@ -453,9 +453,9 @@ insert into table part_change_numeric_group_string_group_floating_char_trunc par
            (10, '17', '90000', '754072151', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char_trunc;
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_char_trunc;
 
 drop table part_change_numeric_group_string_group_floating_char_trunc;
 
@@ -471,7 +471,7 @@ insert into table part_change_numeric_group_string_group_floating_varchar partit
            (3, 9000000000, -255, 4957, 'original'),
            (4, -999999999999, 0, 20435, 'original');
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_floating_varchar replace columns (insert_num int, c1 VARCHAR(50), c2 VARCHAR(50), c3 VARCHAR(50), b STRING) ;
@@ -485,9 +485,9 @@ insert into table part_change_numeric_group_string_group_floating_varchar partit
            (10, '17', '90000', '754072151', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar;
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar;
 
 drop table part_change_numeric_group_string_group_floating_varchar;
 
@@ -503,7 +503,7 @@ insert into table part_change_numeric_group_string_group_floating_varchar_trunc
            (3, 9000000000, -255, 4957, 'original'),
            (4, -999999999999, 0, 20435, 'original');
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_numeric_group_string_group_floating_varchar_trunc replace columns (insert_num int, c1 VARCHAR(7), c2 VARCHAR(7), c3 VARCHAR(7), b STRING) ;
@@ -517,9 +517,9 @@ insert into table part_change_numeric_group_string_group_floating_varchar_trunc
            (10, '17', '90000', '754072151', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar_trunc;
 
-select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_numeric_group_string_group_floating_varchar_trunc;
 
 drop table part_change_numeric_group_string_group_floating_varchar_trunc;
 
@@ -539,7 +539,7 @@ insert into table part_change_string_group_string_group_string partition(part=1)
            (3, 'dynamic reptile', 'dynamic reptile', 'dynamic reptile', 'dynamic reptile', 'original'),
            (4, 'blank pads   ', 'blank pads   ', 'blank pads   ', 'blank pads   ', 'original');
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_string_group_string_group_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_string_group_string_group_string;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_string_group_string_group_string replace columns (insert_num int, c1 CHAR(50), c2 CHAR(9), c3 VARCHAR(50), c4 CHAR(9), b STRING) ;
@@ -553,9 +553,9 @@ insert into table part_change_string_group_string_group_string partition(part)
            (10, 'bottom  ', 'bottom  ', 'bottom  ', 'bottom  ', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,b from part_change_string_group_string_group_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_string_group_string_group_string;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_string_group_string_group_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_string_group_string_group_string;
 
 drop table part_change_string_group_string_group_string;
 
@@ -572,7 +572,7 @@ insert into table part_change_string_group_string_group_char partition(part=1)
            (3, 'dynamic reptile', 'dynamic reptile', 'dynamic reptile', 'original'),
            (4, 'blank pads   ', 'blank pads   ', 'blank pads   ', 'original');
 
-select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_char order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_char;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_string_group_string_group_char replace columns (insert_num int, c1 VARCHAR(50), c2 VARCHAR(9), c3 STRING, b STRING) ;
@@ -586,9 +586,9 @@ insert into table part_change_string_group_string_group_char partition(part)
            (10, 'bottom  ', 'bottom  ', 'bottom  ', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_char order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_char;
 
-select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_char order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_char;
 
 drop table part_change_string_group_string_group_char;
 
@@ -605,7 +605,7 @@ insert into table part_change_string_group_string_group_varchar partition(part=1
            (3, 'dynamic reptile', 'dynamic reptile', 'dynamic reptile', 'original'),
            (4, 'blank pads   ', 'blank pads   ', 'blank pads   ', 'original');
 
-select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_varchar;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_string_group_string_group_varchar replace columns (insert_num int, c1 CHAR(50), c2 CHAR(9), c3 STRING, b STRING) ;
@@ -619,9 +619,9 @@ insert into table part_change_string_group_string_group_varchar partition(part)
            (10, 'bottom  ', 'bottom  ', 'bottom  ', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_varchar;
 
-select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_string_group_string_group_varchar;
 
 drop table part_change_string_group_string_group_varchar;
 
@@ -642,7 +642,7 @@ insert into table part_change_lower_to_higher_numeric_group_tinyint partition(pa
            (3, -255, -255, -255, -255, -255, -255, 'original'),
            (4, 100, 100, 100, 100, 100, 100, 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_lower_to_higher_numeric_group_tinyint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_lower_to_higher_numeric_group_tinyint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_lower_to_higher_numeric_group_tinyint replace columns (insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, c6 DOUBLE, b STRING) ;
@@ -656,9 +656,9 @@ insert into table part_change_lower_to_higher_numeric_group_tinyint partition(pa
            (10, '17', '90000', '754072151', '95', '20', '18', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_lower_to_higher_numeric_group_tinyint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_lower_to_higher_numeric_group_tinyint;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_lower_to_higher_numeric_group_tinyint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_lower_to_higher_numeric_group_tinyint;
 
 drop table part_change_lower_to_higher_numeric_group_tinyint;
 
@@ -674,7 +674,7 @@ insert into table part_change_lower_to_higher_numeric_group_smallint partition(p
            (3, -5000, -5000, -5000, -5000, -5000, 'original'),
            (4, 100, 100, 100, 100, 100, 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,b from part_change_lower_to_higher_numeric_group_smallint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,b from part_change_lower_to_higher_numeric_group_smallint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_lower_to_higher_numeric_group_smallint replace columns (insert_num int, c1 INT, c2 BIGINT, c3 decimal(38,18), c4 FLOAT, c5 DOUBLE, b STRING) ;
@@ -688,9 +688,9 @@ insert into table part_change_lower_to_higher_numeric_group_smallint partition(p
            (10, '17', '90000', '754072151', '95', '20', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,b from part_change_lower_to_higher_numeric_group_smallint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,b from part_change_lower_to_higher_numeric_group_smallint;
 
-select insert_num,part,c1,c2,c3,c4,c5,b from part_change_lower_to_higher_numeric_group_smallint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,b from part_change_lower_to_higher_numeric_group_smallint;
 
 drop table part_change_lower_to_higher_numeric_group_smallint;
 
@@ -707,7 +707,7 @@ insert into table part_change_lower_to_higher_numeric_group_int partition(part=1
            (3, -5000, -5000, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 52927714, 52927714, 'original');
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_lower_to_higher_numeric_group_int order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_lower_to_higher_numeric_group_int;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_lower_to_higher_numeric_group_int replace columns (insert_num int, c1 BIGINT, c2 decimal(38,18), c3 FLOAT, c4 DOUBLE,  b STRING) ;
@@ -721,9 +721,9 @@ insert into table part_change_lower_to_higher_numeric_group_int partition(part)
            (10, '17', '90000', '754072151', '95', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,c4,b from part_change_lower_to_higher_numeric_group_int order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_lower_to_higher_numeric_group_int;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_lower_to_higher_numeric_group_int order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_lower_to_higher_numeric_group_int;
 
 drop table part_change_lower_to_higher_numeric_group_int;
 
@@ -739,7 +739,7 @@ insert into table part_change_lower_to_higher_numeric_group_bigint partition(par
            (3, -5000, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 52927714, 'original');
 
-select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_bigint order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_bigint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_lower_to_higher_numeric_group_bigint replace columns (insert_num int, c1 decimal(38,18), c2 FLOAT, c3 DOUBLE, b STRING) ;
@@ -753,9 +753,9 @@ insert into table part_change_lower_to_higher_numeric_group_bigint partition(par
            (10, '17', '90000', '754072151', 'new', 1);
 
 explain
-select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_bigint order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_bigint;
 
-select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_bigint order by insert_num;
+select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_bigint;
 
 drop table part_change_lower_to_higher_numeric_group_bigint;
 
@@ -771,7 +771,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
            (3, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 'original');
 
-select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING) ;
@@ -785,9 +785,9 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
            (10, '1.7', '17.8888', 'new', 1);
 
 explain
-select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal;
 
-select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal;
 
 drop table part_change_lower_to_higher_numeric_group_decimal;
 
@@ -803,7 +803,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
            (3, -5000, 'original'),
            (4, 52927714, 'original');
 
-select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num;
+select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
@@ -817,9 +817,9 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
            (10, '17',  'new', 1);
 
 explain
-select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num;
+select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float;
 
-select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num;
+select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float;
 
 drop table part_change_lower_to_higher_numeric_group_float;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/9a798130/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part_all_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part_all_complex.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part_all_complex.q
index 27cea8d..c392d4b 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part_all_complex.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part_all_complex.q
@@ -29,7 +29,7 @@ load data local inpath '../../data/files/struct1_a.txt' overwrite into table str
 
 insert into table part_change_various_various_struct1 partition(part=1) select * from struct1_a_txt;
 
-select insert_num,part,s1,b from part_change_various_various_struct1 order by insert_num;
+select insert_num,part,s1,b from part_change_various_various_struct1;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_struct1 replace columns (insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING);
@@ -51,9 +51,9 @@ load data local inpath '../../data/files/struct1_c.txt' overwrite into table str
 insert into table part_change_various_various_struct1 partition(part=1) select * from struct1_c_txt;
 
 explain
-select insert_num,part,s1,b from part_change_various_various_struct1 order by insert_num;
+select insert_num,part,s1,b from part_change_various_various_struct1;
 
-select insert_num,part,s1,b from part_change_various_various_struct1 order by insert_num;
+select insert_num,part,s1,b from part_change_various_various_struct1;
 
 drop table part_change_various_various_struct1;
 
@@ -68,7 +68,7 @@ insert into table part_add_various_various_struct2 partition(part=1)
     values(1, 'original'),
           (2, 'original');
 
-select insert_num,part,b from part_add_various_various_struct2 order by insert_num;
+select insert_num,part,b from part_add_various_various_struct2;
 
 -- Table-Non-Cascade ADD COLUMN ...
 alter table part_add_various_various_struct2 ADD columns (s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
@@ -89,7 +89,7 @@ load data local inpath '../../data/files/struct2_b.txt' overwrite into table str
 
 insert into table part_add_various_various_struct2 partition(part=2) select * from struct2_b_txt;
 
-select insert_num,part,b,s2 from part_add_various_various_struct2 order by insert_num;
+select insert_num,part,b,s2 from part_add_various_various_struct2;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_add_various_various_struct2 REPLACE columns (insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>);
@@ -111,9 +111,9 @@ load data local inpath '../../data/files/struct2_d.txt' overwrite into table str
 insert into table part_add_various_various_struct2 partition(part=1) select * from struct2_d_txt;
 
 explain
-select insert_num,part,b,s2 from part_add_various_various_struct2 order by insert_num;
+select insert_num,part,b,s2 from part_add_various_various_struct2;
 
-select insert_num,part,b,s2 from part_add_various_various_struct2 order by insert_num;
+select insert_num,part,b,s2 from part_add_various_various_struct2;
 
 drop table part_add_various_various_struct2;
 
@@ -133,7 +133,7 @@ load data local inpath '../../data/files/struct4_a.txt' overwrite into table str
 
 insert into table part_add_to_various_various_struct4 partition(part=1) select * from struct4_a_txt;
 
-select insert_num,part,b,s3 from part_add_to_various_various_struct4 order by insert_num;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_add_to_various_various_struct4 replace columns (insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
@@ -155,8 +155,8 @@ load data local inpath '../../data/files/struct4_c.txt' overwrite into table str
 insert into table part_add_to_various_various_struct4 partition(part=1) select * from struct4_c_txt;
 
 explain
-select insert_num,part,b,s3 from part_add_to_various_various_struct4 order by insert_num;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4;
 
-select insert_num,part,b,s3 from part_add_to_various_various_struct4 order by insert_num;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4;
 
 drop table part_add_to_various_various_struct4;