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

[pr...@apache.org]

http://git-wip-us.apache.org/repos/asf/hive/blob/9a798130/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
index 978e76d..bfcc1fb 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_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_text_nonvec_mapwork_part_all_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_complex.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_complex.q
index c1e8af6..717b752 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_complex.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_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;

http://git-wip-us.apache.org/repos/asf/hive/blob/9a798130/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
index 4ed92c7..3cfa690 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
@@ -30,7 +30,7 @@ insert into table part_change_various_various_boolean partition(part=1)
           (3, 200, 72909, 3244222, -93222, 30.774, -66475.561431, -66475.561431, '1', '6229-06-28 02:54:28.970117179', 'original'),
           (4, 1, 90000, 754072151, 3289094, 46114.284799488 ,9250340.75, 9250340.75, 'time will come', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,b from part_change_various_various_boolean order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,b from part_change_various_various_boolean;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_boolean replace columns (insert_num int, c1 BOOLEAN, c2 BOOLEAN, c3 BOOLEAN, c4 BOOLEAN, c5 BOOLEAN, c6 BOOLEAN, c7 BOOLEAN, c8 BOOLEAN, c9 BOOLEAN, b STRING);
@@ -42,9 +42,9 @@ insert into table part_change_various_various_boolean partition(part=1)
     values (6, 0, 1, 1, false, 0, true, false, true, 0, 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,b from part_change_various_various_boolean order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,b from part_change_various_various_boolean;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,b from part_change_various_various_boolean order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,b from part_change_various_various_boolean;
 
 drop table part_change_various_various_boolean;
 
@@ -63,7 +63,7 @@ insert into table part_change_various_various_tinyint partition(part=1)
           (4, false, -72, -127, 127, 30.774, 127.561431, -106.561431, '90.284799488', '90.284799488', '1', '6229-06-28 02:54:28.970117179', 'original'),
           (5, 1, -90, 75, -38, 109.284799488 ,-128.75, 98.75, '120.4', '33.333', '0.45', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_tinyint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_tinyint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_tinyint replace columns (insert_num int, c1 TINYINT, c2 TINYINT, c3 TINYINT, c4 TINYINT, c5 TINYINT, c6 TINYINT, c7 TINYINT, c8 TINYINT, c9 TINYINT, c10 TINYINT, c11 TINYINT, b STRING);
@@ -75,9 +75,9 @@ insert into table part_change_various_various_tinyint partition(part=1)
     values (7, -120, 85, -126, -167, 91, 113, -28, -63, 0, 8, 237, 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_tinyint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_tinyint;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_tinyint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_tinyint;
 
 drop table part_change_various_various_tinyint;
 
@@ -96,7 +96,7 @@ insert into table part_change_various_various_smallint partition(part=1)
           (4, false, 72, 32422, -9322, 30.774, -6675.561431, -6675.561431, '1', '1', '1', '6229-06-28 02:54:28.970117179', 'original'),
           (5, 1, -90, 7151, 3094, 30000.284799488 ,-9000.75, 0.75, '5299', '5299', '5299', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_smallint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_smallint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_smallint replace columns (insert_num int, c1 SMALLINT, c2 SMALLINT, c3 SMALLINT, c4 SMALLINT, c5 SMALLINT, c6 SMALLINT, c7 SMALLINT, c8 SMALLINT, c9 SMALLINT, c10 SMALLINT, c11 SMALLINT, b STRING);
@@ -108,9 +108,9 @@ insert into table part_change_various_various_smallint partition(part=1)
     values (7, -10542, -1805, -4844, 15507, 91, 22385, -28, -12268, 0, 66475, 774, 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_smallint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_smallint;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_smallint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_smallint;
 
 drop table part_change_various_various_smallint;
 
@@ -128,7 +128,7 @@ insert into table part_change_various_various_int partition(part=1)
           (4, false, 72, 3244222, -93222, 30.774, -66475.561431, -66475.561431, '1', '1', '1', '6229-06-28 02:54:28.970117179', 'original'),
           (5, 1, -90, 754072151, 3289094, 46114.284799488 ,9250340.75, 9250340.75, '5299', '5299', '5299', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_int order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_int;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_int replace columns (insert_num int, c1 INT, c2 INT, c3 INT, c4 INT, c5 INT, c6 INT, c7 INT, c8 INT, c9 INT, c10 INT, c11 INT, b STRING);
@@ -140,9 +140,9 @@ insert into table part_change_various_various_int partition(part=1)
     values (6, -1928921, 695025, -151775655, -167, 91, 113, -164341325, -134237413, 0, 6229, 4422, 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_int order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_int;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_int order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_int;
 
 drop table part_change_various_various_int;
 
@@ -161,7 +161,7 @@ insert into table part_change_various_various_bigint partition(part=1)
           (4, false, 72, 3244222, -93222, 30.774, -66475.561431, -66475.561431, '1', '1', '1', '6229-06-28 02:54:28.970117179', 'original'),
           (5, 1, -90, 754072151, 3289094, 46114.284799488 ,9250340.75, 9250340.75, '1998287.3541', '1998287.3541', '1998287.3541', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_bigint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_bigint;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_bigint replace columns (insert_num int, c1 BIGINT, c2 BIGINT, c3 BIGINT, c4 BIGINT, c5 BIGINT, c6 BIGINT, c7 BIGINT, c8 BIGINT, c9 BIGINT, c10 BIGINT, c11 BIGINT, b STRING);
@@ -173,9 +173,9 @@ insert into table part_change_various_various_bigint partition(part=1)
     values (7, -164341325, 9043162437544575070, -126, -6566204574741299000, 91, 113, -28, -63, 0, 3244222, -90, 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_bigint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_bigint;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_bigint order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_bigint;
 
 drop table part_change_various_various_bigint;
 
@@ -193,7 +193,7 @@ insert into table part_change_various_various_float partition(part=1)
           (4, false, 72, 3244222, -93222, 30.774, -66475.561431, -66475.561431, '2402.3', '2402.3', '2402.3', '6229-06-28 02:54:28.970117179', 'original'),
           (5, 1, -90, 754072151, 3289094, 46114.284799488 ,9250340.75, 9250340.75, '5299', '5299', '5299', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_float order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_float;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_float replace columns (insert_num int, c1 FLOAT, c2 FLOAT, c3 FLOAT, c4 FLOAT, c5 FLOAT, c6 FLOAT, c7 FLOAT, c8 FLOAT, c9 FLOAT, c10 FLOAT, c11 FLOAT, b STRING);
@@ -205,9 +205,9 @@ insert into table part_change_various_various_float partition(part=1)
     values (7, -1255178165.77663, 9043162437544575070.974, -4314.7918, -1240033819, 91, 1698.95, -100.3597812, -63, 0, -93222.200, 29.076, 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_float order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_float;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_float order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_float;
 
 drop table part_change_various_various_float;
 
@@ -225,7 +225,7 @@ insert into table part_change_various_various_double partition(part=1)
           (4, false, 72, 3244222, -93222, 30.774, -66475.561431, -66475.561431, '1', '1', '1', '6229-06-28 02:54:28.970117179', 'original'),
           (5, 1, -90, 754072151, 3289094, 46114.284799488 ,9250340.75, 9250340.75, '5299', '5299', '5299', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_double order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_double;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE, b STRING);
@@ -237,9 +237,9 @@ insert into table part_change_various_various_double partition(part=1)
     values (7, -1255178165.77663, 9043162437544575070.974, -4314.7918, -1240033819, 91, 1698.95, -100.3597812, -63, 0, -66475.0000008, -284799488.1, 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_double order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_double;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_double order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_double;
 
 drop table part_change_various_various_double;
 
@@ -257,7 +257,7 @@ insert into table part_change_various_various_decimal partition(part=1)
           (4, false, 72, 3244222, -93222, 30.774, -66475.561431, -66475.561431, '1', '1', '1', '6229-06-28 02:54:28.970117179', 'original'),
           (5, 1, -90, 754072151, 3289094, 46114.284799488 ,9250340.75, 9250340.75, '2402.3', '2402.3', '2402.3', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_decimal order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_decimal;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_decimal replace columns (insert_num int, c1 DECIMAL(38,18), c2 DECIMAL(38,18), c3 DECIMAL(38,18), c4 DECIMAL(38,18), c5 DECIMAL(38,18), c6 DECIMAL(38,18), c7 DECIMAL(38,18), c8 DECIMAL(38,18), c9 DECIMAL(38,18), c10 DECIMAL(38,18), c11 DECIMAL(38,18), b STRING);
@@ -269,9 +269,9 @@ insert into table part_change_various_various_decimal partition(part=1)
     values (7,-1255178165.77663, 9043162437544575070.974, -4314.7918, -1240033819, 91, 1698.95, -100.3597812, -63, 0, -66475.0000008, -284799488.1, 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_decimal order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_decimal;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_decimal order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,b from part_change_various_various_decimal;
 
 drop table part_change_various_various_decimal;
 
@@ -289,7 +289,7 @@ insert into table part_change_various_various_string partition(part=1)
           (4, false, 72,   3244222,    -93222,   30.774,       -   66475.561431, -66475.561431,    0.561431,          '1', '1',                                  '6229-06-28 02:54:28.970117179', '5966-07-09', 'binary', 'original'),
           (5, 1,    -90,   754072151,   3289094, 46114.284799488,  9250340.75,    9250340.75,      9250340.75,        'junkyard', 'junkyard',                    '2002-05-10 05:29:48.990818073', '1815-05-06', 'binary', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_string;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_string replace columns (insert_num int, 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);
@@ -301,9 +301,9 @@ insert into table part_change_various_various_string partition(part=1)
     values (7,-'false', '-67', '833',          '63993', ' 1255178165.77663', '905070.974', '-4314.7918',        -'1240033819',      'trial',   'trial',  '2016-03-07 03:02:22.0', '2016-03-07', 'binary', 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_string;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_string order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_string;
 
 drop table part_change_various_various_string;
 
@@ -321,7 +321,7 @@ insert into table part_change_various_various_char partition(part=1)
           (4, false, 72,   3244222,    -93222,   30.774,       -   66475.561431, -66475.561431,    0.561431,         '1', '1',                                  '6229-06-28 02:54:28.970117179', '5966-07-09', 'binary', 'original'),
           (5, 1,    -90,   754072151,   3289094, 46114.284799488,  9250340.75,    9250340.75,      9250340.75,        'junkyard', 'junkyard',                    '2002-05-10 05:29:48.990818073', '1815-05-06', 'binary', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_char replace columns (insert_num int, c1 CHAR(25), c2 CHAR(25), c3 CHAR(25), c4 CHAR(25), c5 CHAR(25), c6 CHAR(25), c7 CHAR(25), c8 CHAR(25), c9 CHAR(25), c10 CHAR(25), c11 CHAR(25), c12 CHAR(25), c13 CHAR(25), b STRING);
@@ -333,9 +333,9 @@ insert into table part_change_various_various_char partition(part=1)
     values (7,-'false', '-67', '833',          '63993', ' 1255178165.77663', '905070.974', '-4314.7918',        -'1240033819',      'trial',   'trial',  '2016-03-07 03:02:22.0', '2016-03-07', 'binary', 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char;
 
 drop table part_change_various_various_char;
 
@@ -353,7 +353,7 @@ insert into table part_change_various_various_char_trunc partition(part=1)
           (4, false, 72,   3244222,    -93222,   30.774,       -   66475.561431, -66475.561431,    0.561431,         '1', '1',                                  '6229-06-28 02:54:28.970117179', '5966-07-09', 'binary', 'original'),
           (5, 1,    -90,   754072151,   3289094, 46114.284799488,  9250340.75,    9250340.75,      9250340.75,        'junkyard', 'junkyard',                    '2002-05-10 05:29:48.990818073', '1815-05-06', 'binary', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_char_trunc replace columns (insert_num int, c1 CHAR(8), c2 CHAR(8), c3 CHAR(8), c4 CHAR(8), c5 CHAR(8), c6 CHAR(8), c7 CHAR(8), c8 CHAR(8), c9 CHAR(8), c10 CHAR(8), c11 CHAR(8), c12 CHAR(8), c13 CHAR(8), b STRING);
@@ -365,9 +365,9 @@ insert into table part_change_various_various_char_trunc partition(part=1)
     values (7,-'false', '-67', '833',          '63993', ' 1255178165.77663', '905070.974', '-4314.7918',        -'1240033819',      'trial',   'trial',  '2016-03-07 03:02:22.0', '2016-03-07', 'binary', 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char_trunc;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_char_trunc;
 
 drop table part_change_various_various_char_trunc;
 
@@ -385,7 +385,7 @@ insert into table part_change_various_various_varchar partition(part=1)
           (4, false, 72,   3244222,    -93222,   30.774,       -   66475.561431, -66475.561431,    0.561431,         '1', '1',                                  '6229-06-28 02:54:28.970117179', '5966-07-09', 'binary', 'original'),
           (5, 1,    -90,   754072151,   3289094, 46114.284799488,  9250340.75,    9250340.75,      9250340.75,        'junkyard', 'junkyard',                    '2002-05-10 05:29:48.990818073', '1815-05-06', 'binary', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_varchar replace columns (insert_num int, c1 VARCHAR(25), c2 VARCHAR(25), c3 VARCHAR(25), c4 VARCHAR(25), c5 VARCHAR(25), c6 VARCHAR(25), c7 VARCHAR(25), c8 VARCHAR(25), c9 VARCHAR(25), c10 VARCHAR(25), c11 VARCHAR(25), c12 VARCHAR(25), c13 VARCHAR(25), b STRING);
@@ -397,9 +397,9 @@ insert into table part_change_various_various_varchar partition(part=1)
     values (7,-'false', '-67', '833',          '63993', ' 1255178165.77663', '905070.974', '-4314.7918',        -'1240033819',      'trial',   'trial',  '2016-03-07 03:02:22.0', '2016-03-07', 'binary', 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar;
 
 drop table part_change_various_various_varchar;
 
@@ -417,7 +417,7 @@ insert into table part_change_various_various_varchar_trunc partition(part=1)
           (3, false, 72,   3244222,    -93222,   30.774,       -   66475.561431, -66475.561431,    0.561431,         '1', '1',                                  '6229-06-28 02:54:28.970117179', '5966-07-09', 'binary', 'original'),
           (4, 1,    -90,   754072151,   3289094, 46114.284799488,  9250340.75,    9250340.75,      9250340.75,        'junkyard', 'junkyard',                    '2002-05-10 05:29:48.990818073', '1815-05-06', 'binary', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar_trunc;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_varchar_trunc replace columns (insert_num int, c1 VARCHAR(8), c2 VARCHAR(8), c3 VARCHAR(8), c4 VARCHAR(8), c5 VARCHAR(8), c6 VARCHAR(8), c7 VARCHAR(8), c8 VARCHAR(8), c9 VARCHAR(8), c10 VARCHAR(8), c11 VARCHAR(8), c12 VARCHAR(8), c13 VARCHAR(8), b STRING);
@@ -429,9 +429,9 @@ insert into table part_change_various_various_varchar_trunc partition(part=1)
     values (6,-'false', '-67', '833',          '63993', ' 1255178165.77663', '905070.974', '-4314.7918',        -'1240033819',      'trial',   'trial',  '2016-03-07 03:02:22.0', '2016-03-07', 'binary', 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar_trunc;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar_trunc order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,b from part_change_various_various_varchar_trunc;
 
 drop table part_change_various_various_varchar_trunc;
 
@@ -449,7 +449,7 @@ insert into table part_change_various_various_timestamp partition(part=1)
           (4, false, 72,   3244222,    -93222,   30.774,       -   66475.561431, -66475.561431,    0.561431,          '6229-06-28 02:54:28.970117179', '6229-06-28 02:54:28.970117179',  '6229-06-28 02:54:28.970117179', '5966-07-09', 'original'),
           (5, 1,    -90,   754072151,   3289094, 46114.284799488,  9250340.75,    9250340.75,      9250340.75,        '2002-05-10 05:29:48.990818073', '2002-05-10 05:29:48.990818073',  '2002-05-10 05:29:48.990818073', '1815-05-06', 'original');
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_timestamp replace columns (insert_num int, c1 TIMESTAMP, c2 TIMESTAMP, c3 TIMESTAMP, c4 TIMESTAMP, c5 TIMESTAMP, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, c11 TIMESTAMP, c12 TIMESTAMP, b STRING);
@@ -461,9 +461,9 @@ insert into table part_change_various_various_timestamp partition(part=1)
     values (7,-'false', '-67', '833',          '63993', ' 1255178165.77663', '905070.974', '-4314.7918',        -'1240033819',      '2016-03-07 03:02:22.0',   '2016-03-07 03:02:22.0',  '2016-03-07 03:02:22.0', '2016-03-07', 'new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp;
 
 drop table part_change_various_various_timestamp;
 
@@ -479,7 +479,7 @@ insert into table part_change_various_various_date partition(part=1)
           (3, '6229-06-28 02:54:28.970117179', '6229-06-28 02:54:28.970117179',  '6229-06-28 02:54:28.970117179', '6229-06-28 02:54:28.970117179', 'original'),
           (4, '2002-05-10 05:29:48.990818073', '2002-05-10 05:29:48.990818073',  '2002-05-10 05:29:48.990818073', '2002-05-10 05:29:48.990818073', 'original');
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_various_various_date replace columns (insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, b STRING);
@@ -491,9 +491,9 @@ insert into table part_change_various_various_date partition(part=1)
     values (6,-'2002-05-10', '2002-05-10', '2002-05-10', '2002-05-10','new');
 
 explain
-select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date order by insert_num;
+select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date;
 
 drop table part_change_various_various_date;
 
@@ -512,7 +512,7 @@ select * from same_type1_a_txt;
 
 insert into table part_change_same_type_different_params partition(part=1) select * from same_type1_a_txt;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
 alter table part_change_same_type_different_params replace columns (insert_num int, c1 CHAR(8), c2 CHAR(32), c3 VARCHAR(15), c4 VARCHAR(18), c5 DECIMAL(10,2), c6 DECIMAL(25,15), b STRING);
@@ -536,8 +536,8 @@ select * from same_type1_c_txt;
 insert into table part_change_same_type_different_params partition(part=2) select * from same_type1_c_txt;
 
 explain
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params order by insert_num;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params;
 
 drop table part_change_same_type_different_params;