You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/05/30 19:37:15 UTC

svn commit: r1598678 [14/31] - in /hive/trunk: cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/common/io/ itests/util/src/main/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apache...

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out Fri May 30 17:37:05 2014
@@ -1,8 +1,10 @@
-PREHOOK: query: -- With multiple indexes, make sure we choose which to use in a consistent order
+PREHOOK: query: -- SORT_QUERY_RESULTS
+-- With multiple indexes, make sure we choose which to use in a consistent order
 
 CREATE INDEX src_key_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: -- With multiple indexes, make sure we choose which to use in a consistent order
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+-- With multiple indexes, make sure we choose which to use in a consistent order
 
 CREATE INDEX src_key_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
@@ -34,9 +36,9 @@ POSTHOOK: Output: default@default__src_s
 POSTHOOK: Lineage: default__src_src_val_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__src_src_val_index__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src_val_index__.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: EXPLAIN SELECT key, value FROM src WHERE key=86 ORDER BY key
+PREHOOK: query: EXPLAIN SELECT key, value FROM src WHERE key=86
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT key, value FROM src WHERE key=86 ORDER BY key
+POSTHOOK: query: EXPLAIN SELECT key, value FROM src WHERE key=86
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
@@ -97,21 +99,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 14 Data size: 2805 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 14 Data size: 2805 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 14 Data size: 2805 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 14 Data size: 2805 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-4
     Map Reduce
@@ -147,12 +141,12 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT key, value FROM src WHERE key=86 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key=86
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_src_key_index__
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key=86 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key=86
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src_key_index__
 POSTHOOK: Input: default@src

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,9 @@
-PREHOOK: query: -- test automatic use of index on table with partitions
+PREHOOK: query: -- SORT_QUERY_RESULTS
+-- test automatic use of index on table with partitions
 CREATE INDEX src_part_index ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: -- test automatic use of index on table with partitions
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+-- test automatic use of index on table with partitions
 CREATE INDEX src_part_index ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Output: default@default__srcpart_src_part_index__
@@ -30,9 +32,9 @@ POSTHOOK: Output: default@default__srcpa
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-09,hr=12)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09' ORDER BY key
+PREHOOK: query: EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09' ORDER BY key
+POSTHOOK: query: EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
@@ -93,21 +95,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-4
     Map Reduce
@@ -143,7 +137,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09' ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__srcpart_src_part_index__
 PREHOOK: Input: default@default__srcpart_src_part_index__@ds=2008-04-09/hr=11
@@ -152,7 +146,7 @@ PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09' ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_src_part_index__
 POSTHOOK: Input: default@default__srcpart_src_part_index__@ds=2008-04-09/hr=11

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out Fri May 30 17:37:05 2014
@@ -1,15 +1,16 @@
-PREHOOK: query: -- try the query without indexing, with manual indexing, and with automatic indexing
+PREHOOK: query: -- SORT_QUERY_RESULTS
+-- try the query without indexing, with manual indexing, and with automatic indexing
 
-EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
+EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 PREHOOK: type: QUERY
-POSTHOOK: query: -- try the query without indexing, with manual indexing, and with automatic indexing
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+-- try the query without indexing, with manual indexing, and with automatic indexing
 
-EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
+EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
+  Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
   Stage: Stage-1
@@ -54,30 +55,11 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-
-  Stage: Stage-2
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            Reduce Output Operator
-              key expressions: _col0 (type: string)
-              sort order: +
               Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -85,11 +67,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
+PREHOOK: query: SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
+POSTHOOK: query: SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -122,21 +104,20 @@ POSTHOOK: Lineage: default__src_src_inde
 POSTHOOK: Lineage: default__src_src_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__._offset SIMPLE [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
+PREHOOK: query: EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
+POSTHOOK: query: EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4, Stage-6
-  Stage-2 depends on stages: Stage-1
-  Stage-7 is a root stage
-  Stage-6 depends on stages: Stage-7
-  Stage-0 depends on stages: Stage-2
+  Stage-4 is a root stage
+  Stage-3 depends on stages: Stage-4
+  Stage-1 depends on stages: Stage-3, Stage-5
+  Stage-6 is a root stage
+  Stage-5 depends on stages: Stage-6
+  Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
+  Stage: Stage-4
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -173,7 +154,7 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
-  Stage: Stage-4
+  Stage: Stage-3
     Move Operator
       files:
           hdfs directory: true
@@ -223,32 +204,13 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-
-  Stage: Stage-2
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            Reduce Output Operator
-              key expressions: _col0 (type: string)
-              sort order: +
               Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 3 Data size: 661 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
-  Stage: Stage-7
+  Stage: Stage-6
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -285,7 +247,7 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
-  Stage: Stage-6
+  Stage: Stage-5
     Move Operator
       files:
           hdfs directory: true
@@ -297,12 +259,12 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
+PREHOOK: query: SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_src_index__
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
+POSTHOOK: query: SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src_index__
 POSTHOOK: Input: default@src

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out Fri May 30 17:37:05 2014
@@ -1,8 +1,10 @@
-PREHOOK: query: -- test cases where the index should not be used automatically
+PREHOOK: query: -- SORT_QUERY_RESULTS
+-- test cases where the index should not be used automatically
 
 CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: -- test cases where the index should not be used automatically
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+-- test cases where the index should not be used automatically
 
 CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
@@ -19,10 +21,10 @@ POSTHOOK: Lineage: default__src_src_inde
 POSTHOOK: Lineage: default__src_src_index__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 PREHOOK: query: -- min size too large (src is less than 5G)
-EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 POSTHOOK: query: -- min size too large (src is less than 5G)
-EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -43,21 +45,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -65,11 +59,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+PREHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+POSTHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -93,10 +87,10 @@ POSTHOOK: Input: default@src
 98	val_98
 98	val_98
 PREHOOK: query: -- max size too small
-EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 POSTHOOK: query: -- max size too small
-EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -117,21 +111,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -139,11 +125,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+PREHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+POSTHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -167,10 +153,10 @@ POSTHOOK: Input: default@src
 98	val_98
 98	val_98
 PREHOOK: query: -- OR predicate not supported by compact indexes
-EXPLAIN SELECT * FROM src WHERE key < 10 OR key > 480 ORDER BY key
+EXPLAIN SELECT * FROM src WHERE key < 10 OR key > 480
 PREHOOK: type: QUERY
 POSTHOOK: query: -- OR predicate not supported by compact indexes
-EXPLAIN SELECT * FROM src WHERE key < 10 OR key > 480 ORDER BY key
+EXPLAIN SELECT * FROM src WHERE key < 10 OR key > 480
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -191,21 +177,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 18 Data size: 3607 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 18 Data size: 3607 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 18 Data size: 3607 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 18 Data size: 3607 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -213,11 +191,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT * FROM src WHERE key < 10 OR key > 480 ORDER BY key
+PREHOOK: query: SELECT * FROM src WHERE key < 10 OR key > 480
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM src WHERE key < 10 OR key > 480 ORDER BY key
+POSTHOOK: query: SELECT * FROM src WHERE key < 10 OR key > 480
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -275,9 +253,9 @@ POSTHOOK: Output: default@default__src_s
 POSTHOOK: Lineage: default__src_src_val_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__src_src_val_index__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src_val_index__.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+PREHOOK: query: EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+POSTHOOK: query: EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -298,21 +276,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -320,11 +290,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+PREHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100 ORDER BY key
+POSTHOOK: query: SELECT * FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -371,9 +341,9 @@ POSTHOOK: Output: default@default__srcpa
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-08,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-08,hr=11)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: EXPLAIN SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10 ORDER BY key
+PREHOOK: query: EXPLAIN SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10 ORDER BY key
+POSTHOOK: query: EXPLAIN SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -394,21 +364,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 9 Data size: 1803 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 9 Data size: 1803 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 9 Data size: 1803 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 9 Data size: 1803 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -416,12 +378,12 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10 ORDER BY key
+PREHOOK: query: SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10 ORDER BY key
+POSTHOOK: query: SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: DROP INDEX srcpart_index_proj on srcpart
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP INDEX srcpart_index_proj on srcpart
 PREHOOK: type: DROPINDEX
-POSTHOOK: query: DROP INDEX srcpart_index_proj on srcpart
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP INDEX srcpart_index_proj on srcpart
 POSTHOOK: type: DROPINDEX
 PREHOOK: query: EXPLAIN
 CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD
@@ -45,12 +49,12 @@ POSTHOOK: Lineage: default__srcpart_srcp
 POSTHOOK: Lineage: default__srcpart_srcpart_index_proj__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__srcpart_srcpart_index_proj__ PARTITION(ds=2008-04-09,hr=12)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__srcpart_srcpart_index_proj__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11 ORDER BY key
+PREHOOK: query: SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__srcpart_srcpart_index_proj__
 PREHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11 ORDER BY key
+POSTHOOK: query: SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=11
@@ -69,13 +73,13 @@ POSTHOOK: Input: default@default__srcpar
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -98,24 +102,24 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -203,7 +207,7 @@ POSTHOOK: Input: default@default__srcpar
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -211,7 +215,7 @@ PREHOOK: Input: default@srcpart@ds=2008-
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -227,7 +231,7 @@ POSTHOOK: Input: default@srcpart@ds=2008
 100	val_100
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -235,7 +239,7 @@ PREHOOK: Input: default@srcpart@ds=2008-
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap1.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap1.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 STAGE DEPENDENCIES:
@@ -27,11 +31,11 @@ POSTHOOK: Lineage: default__src_src_inde
 POSTHOOK: Lineage: default__src_src_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__._offset SIMPLE [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: SELECT x.* FROM default__src_src_index__ x ORDER BY key
+PREHOOK: query: SELECT x.* FROM default__src_src_index__ x
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_src_index__
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT x.* FROM default__src_src_index__ x ORDER BY key
+POSTHOOK: query: SELECT x.* FROM default__src_src_index__ x
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src_index__
 #### A masked pattern was here ####
@@ -45,21 +49,21 @@ EWAH_BITMAP_EMPTY(`_bitmaps`) AND key=10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src_index__
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap2.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap2.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 STAGE DEPENDENCIES:
@@ -56,19 +60,19 @@ POSTHOOK: Lineage: default__src_src2_ind
 POSTHOOK: Lineage: default__src_src2_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__src_src2_index__._offset SIMPLE [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src2_index__.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: SELECT * FROM default__src_src1_index__ ORDER BY key
+PREHOOK: query: SELECT * FROM default__src_src1_index__
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_src1_index__
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM default__src_src1_index__ ORDER BY key
+POSTHOOK: query: SELECT * FROM default__src_src1_index__
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src1_index__
 #### A masked pattern was here ####
-PREHOOK: query: SELECT * FROM default__src_src2_index__ ORDER BY value
+PREHOOK: query: SELECT * FROM default__src_src2_index__
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_src2_index__
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM default__src_src2_index__ ORDER BY value
+POSTHOOK: query: SELECT * FROM default__src_src2_index__
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src2_index__
 #### A masked pattern was here ####
@@ -96,11 +100,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src1_index__
 POSTHOOK: Input: default@default__src_src2_index__
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM src WHERE key=0 OR value = "val_2" ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key=0 OR value = "val_2"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key=0 OR value = "val_2" ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key=0 OR value = "val_2"
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -108,11 +112,11 @@ POSTHOOK: Input: default@src
 0	val_0
 0	val_0
 2	val_2
-PREHOOK: query: SELECT key, value FROM src WHERE key=0 OR value = "val_2" ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key=0 OR value = "val_2"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key=0 OR value = "val_2" ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key=0 OR value = "val_2"
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: -- test automatic use of index on table with partitions
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- test automatic use of index on table with partitions
 CREATE INDEX src_part_index ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: -- test automatic use of index on table with partitions
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- test automatic use of index on table with partitions
 CREATE INDEX src_part_index ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Output: default@default__srcpart_src_part_index__
@@ -31,9 +35,9 @@ POSTHOOK: Lineage: default__srcpart_src_
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-09,hr=12)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__srcpart_src_part_index__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09' ORDER BY key
+PREHOOK: query: EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09' ORDER BY key
+POSTHOOK: query: EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
@@ -99,21 +103,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -121,7 +117,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09' ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__srcpart_src_part_index__
 PREHOOK: Input: default@default__srcpart_src_part_index__@ds=2008-04-09/hr=11
@@ -130,7 +126,7 @@ PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09' ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_src_part_index__
 POSTHOOK: Input: default@default__srcpart_src_part_index__@ds=2008-04-09/hr=11

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Output: default@default__src_src_index__
 PREHOOK: query: ALTER INDEX src_index ON src REBUILD
@@ -16,10 +20,10 @@ POSTHOOK: Lineage: default__src_src_inde
 POSTHOOK: Lineage: default__src_src_index__._offset SIMPLE [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 PREHOOK: query: -- automatic indexing
-EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100 ORDER BY key
+EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 POSTHOOK: query: -- automatic indexing
-EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100 ORDER BY key
+EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
@@ -85,21 +89,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -107,12 +103,12 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT key, value FROM src WHERE key > 80 AND key < 100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_src_index__
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key > 80 AND key < 100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src_index__
 POSTHOOK: Input: default@src

Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap_rc.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap_rc.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_bitmap_rc.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap_rc.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@srcpart_rc
@@ -96,12 +100,12 @@ POSTHOOK: Lineage: default__srcpart_rc_s
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart_rc)srcpart_rc.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12)._offset SIMPLE [(srcpart_rc)srcpart_rc.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart_rc)srcpart_rc.FieldSchema(name:key, type:int, comment:null), ]
-PREHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11 ORDER BY key
+PREHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__
 PREHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11 ORDER BY key
+POSTHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
@@ -120,13 +124,13 @@ POSTHOOK: Input: default@default__srcpar
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -149,24 +153,24 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -254,7 +258,7 @@ POSTHOOK: Input: default@default__srcpar
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -262,7 +266,7 @@ PREHOOK: Input: default@srcpart_rc@ds=20
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -278,7 +282,7 @@ POSTHOOK: Input: default@srcpart_rc@ds=2
 100	val_100
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -286,7 +290,7 @@ PREHOOK: Input: default@srcpart_rc@ds=20
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11

Modified: hive/trunk/ql/src/test/results/clientpositive/index_compact.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_compact.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_compact.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_compact.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: DROP INDEX srcpart_index_proj on srcpart
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP INDEX srcpart_index_proj on srcpart
 PREHOOK: type: DROPINDEX
-POSTHOOK: query: DROP INDEX srcpart_index_proj on srcpart
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP INDEX srcpart_index_proj on srcpart
 POSTHOOK: type: DROPINDEX
 PREHOOK: query: EXPLAIN
 CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD
@@ -44,12 +48,12 @@ POSTHOOK: Output: default@default__srcpa
 POSTHOOK: Lineage: default__srcpart_srcpart_index_proj__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__srcpart_srcpart_index_proj__ PARTITION(ds=2008-04-09,hr=12)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__srcpart_srcpart_index_proj__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11 ORDER BY key
+PREHOOK: query: SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__srcpart_srcpart_index_proj__
 PREHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11 ORDER BY key
+POSTHOOK: query: SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=11
@@ -64,13 +68,13 @@ POSTHOOK: Input: default@default__srcpar
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -89,24 +93,24 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -189,7 +193,7 @@ POSTHOOK: Input: default@default__srcpar
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@default__srcpart_srcpart_index_proj__@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -197,7 +201,7 @@ PREHOOK: Input: default@srcpart@ds=2008-
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -213,7 +217,7 @@ POSTHOOK: Input: default@srcpart@ds=2008
 100	val_100
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -221,7 +225,7 @@ PREHOOK: Input: default@srcpart@ds=2008-
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11

Modified: hive/trunk/ql/src/test/results/clientpositive/index_compact_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_compact_1.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_compact_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_compact_1.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 STAGE DEPENDENCIES:
@@ -26,11 +30,11 @@ POSTHOOK: Output: default@default__src_s
 POSTHOOK: Lineage: default__src_src_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: SELECT x.* FROM default__src_src_index__ x ORDER BY key
+PREHOOK: query: SELECT x.* FROM default__src_src_index__ x
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_src_index__
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT x.* FROM default__src_src_index__ x ORDER BY key
+POSTHOOK: query: SELECT x.* FROM default__src_src_index__ x
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src_index__
 #### A masked pattern was here ####
@@ -40,21 +44,21 @@ PREHOOK: Input: default@default__src_src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src_index__
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/index_compact_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_compact_2.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_compact_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_compact_2.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@srcpart_rc
@@ -83,12 +87,12 @@ POSTHOOK: Output: default@default__srcpa
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart_rc)srcpart_rc.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12)._offsets EXPRESSION [(srcpart_rc)srcpart_rc.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart_rc)srcpart_rc.FieldSchema(name:key, type:int, comment:null), ]
-PREHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11 ORDER BY key
+PREHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__
 PREHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11 ORDER BY key
+POSTHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
@@ -103,13 +107,13 @@ POSTHOOK: Input: default@default__srcpar
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -128,24 +132,24 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -198,7 +202,7 @@ POSTHOOK: Output: default@default__srcpa
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart_rc)srcpart_rc.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12)._offsets EXPRESSION [(srcpart_rc)srcpart_rc.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__srcpart_rc_srcpart_rc_index__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart_rc)srcpart_rc.FieldSchema(name:key, type:int, comment:null), ]
-PREHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x ORDER BY key
+PREHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__
 PREHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
@@ -206,7 +210,7 @@ PREHOOK: Input: default@default__srcpart
 PREHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-09/hr=11
 PREHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x ORDER BY key
+POSTHOOK: query: SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-08/hr=11
@@ -228,7 +232,7 @@ POSTHOOK: Input: default@default__srcpar
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@default__srcpart_rc_srcpart_rc_index__@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -236,7 +240,7 @@ PREHOOK: Input: default@srcpart_rc@ds=20
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -252,7 +256,7 @@ POSTHOOK: Input: default@srcpart_rc@ds=2
 100	val_100
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_rc
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11
@@ -260,7 +264,7 @@ PREHOOK: Input: default@srcpart_rc@ds=20
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart_rc@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM srcpart_rc WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_rc
 POSTHOOK: Input: default@srcpart_rc@ds=2008-04-08/hr=11

Modified: hive/trunk/ql/src/test/results/clientpositive/index_compact_3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_compact_3.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_compact_3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_compact_3.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_index_test_rc
@@ -31,11 +35,11 @@ POSTHOOK: Output: default@default__src_i
 POSTHOOK: Lineage: default__src_index_test_rc_src_index__._bucketname SIMPLE [(src_index_test_rc)src_index_test_rc.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: default__src_index_test_rc_src_index__._offsets EXPRESSION [(src_index_test_rc)src_index_test_rc.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_index_test_rc_src_index__.key SIMPLE [(src_index_test_rc)src_index_test_rc.FieldSchema(name:key, type:int, comment:null), ]
-PREHOOK: query: SELECT x.* FROM default__src_index_test_rc_src_index__ x ORDER BY key
+PREHOOK: query: SELECT x.* FROM default__src_index_test_rc_src_index__ x
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_index_test_rc_src_index__
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT x.* FROM default__src_index_test_rc_src_index__ x ORDER BY key
+POSTHOOK: query: SELECT x.* FROM default__src_index_test_rc_src_index__ x
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_index_test_rc_src_index__
 #### A masked pattern was here ####
@@ -45,21 +49,21 @@ PREHOOK: Input: default@default__src_ind
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_index_test_rc_src_index__
 #### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM src_index_test_rc WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src_index_test_rc WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_index_test_rc
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src_index_test_rc WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src_index_test_rc WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_index_test_rc
 #### A masked pattern was here ####
 100	val_100
 100	val_100
-PREHOOK: query: SELECT key, value FROM src_index_test_rc WHERE key=100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src_index_test_rc WHERE key=100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_index_test_rc
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src_index_test_rc WHERE key=100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src_index_test_rc WHERE key=100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_index_test_rc
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
-POSTHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Output: default@default__src_src_index__
 PREHOOK: query: ALTER INDEX src_index ON src REBUILD
@@ -15,10 +19,10 @@ POSTHOOK: Lineage: default__src_src_inde
 POSTHOOK: Lineage: default__src_src_index__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 PREHOOK: query: -- automatic indexing
-EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100 ORDER BY key
+EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 POSTHOOK: query: -- automatic indexing
-EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100 ORDER BY key
+EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-3 is a root stage
@@ -79,21 +83,13 @@ STAGE PLANS:
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string)
-      Reduce Operator Tree:
-        Extract
-          Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-4
     Map Reduce
@@ -129,12 +125,12 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT key, value FROM src WHERE key > 80 AND key < 100 ORDER BY key
+PREHOOK: query: SELECT key, value FROM src WHERE key > 80 AND key < 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@default__src_src_index__
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src WHERE key > 80 AND key < 100 ORDER BY key
+POSTHOOK: query: SELECT key, value FROM src WHERE key > 80 AND key < 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@default__src_src_index__
 POSTHOOK: Input: default@src