You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/06/28 02:23:57 UTC

svn commit: r1606275 [3/3] - in /hive/branches/cbo: ./ common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src/test/queries/clientnegative/ contrib/src/test/queries/clientpositive/ data/conf/ hbase-handler/src/java/org/apache/hadoop/hive/hbase/ ...

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt20.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt20.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt20.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt20.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,4 @@
 set hive.mapred.supports.subdirectories=true;
-set hive.internal.ddl.list.bucketing.enable=true;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt3.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt3.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt3.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt3.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,4 @@
 set hive.mapred.supports.subdirectories=true;
-set hive.internal.ddl.list.bucketing.enable=true;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt4.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt4.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt4.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt4.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,4 @@
 set hive.mapred.supports.subdirectories=true;
-set hive.internal.ddl.list.bucketing.enable=true;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt5.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt5.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt5.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt5.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,4 @@
 set hive.mapred.supports.subdirectories=true;
-set hive.internal.ddl.list.bucketing.enable=true;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt6.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt6.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt6.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt6.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,4 @@
 set hive.mapred.supports.subdirectories=true;
-set hive.internal.ddl.list.bucketing.enable=true;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt7.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt7.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt7.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt7.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,4 @@
 set hive.mapred.supports.subdirectories=true;
-set hive.internal.ddl.list.bucketing.enable=true;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt8.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt8.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt8.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt8.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,4 @@
 set hive.mapred.supports.subdirectories=true;
-set hive.internal.ddl.list.bucketing.enable=true;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE;

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt9.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt9.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt9.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/skewjoinopt9.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,4 @@
 set hive.mapred.supports.subdirectories=true;
-set hive.internal.ddl.list.bucketing.enable=true;
 set hive.optimize.skewjoin.compiletime = true;
 
 CREATE TABLE T1(key STRING, val STRING)

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/smb_mapjoin_25.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/smb_mapjoin_25.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/smb_mapjoin_25.q Sat Jun 28 00:23:54 2014
@@ -22,11 +22,9 @@ set hive.optimize.bucketmapjoin.sortedme
 set hive.mapred.reduce.tasks.speculative.execution=false;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
-set hive.auto.convert.sortmerge.join.noconditionaltask=true;
 set hive.auto.convert.join.noconditionaltask=true;
 set hive.auto.convert.join.noconditionaltask.size=10000000000;
 set hive.optimize.reducededuplication.min.reducer=1;
-set hive.optimize.mapjoin.mapreduce=true;
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
 
 -- explain

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/stats15.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/stats15.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/stats15.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/stats15.q Sat Jun 28 00:23:54 2014
@@ -1,5 +1,5 @@
 set datanucleus.cache.collections=false;
-set hive.stats.collect.uncompressedsize=false;
+set hive.stats.collect.rawdatasize=false;
 
 create table stats_src like src;
 insert overwrite table stats_src select * from src;

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/truncate_table.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/truncate_table.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/truncate_table.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/truncate_table.q Sat Jun 28 00:23:54 2014
@@ -12,7 +12,7 @@ load data local inpath '../../data/files
 load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-09', hr='11');
 load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-09', hr='12');
 
-set hive.fetch.task.convertion=more;
+set hive.fetch.task.conversion=more;
 
 -- truncate non-partitioned table
 explain TRUNCATE TABLE src_truncate;

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/udtf_explode.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/udtf_explode.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/udtf_explode.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/udtf_explode.q Sat Jun 28 00:23:54 2014
@@ -22,6 +22,7 @@ SELECT src.key, myKey, myVal FROM src la
 -- HIVE-4295
 SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3;
 
-set hive.optimize.cp=false;
-SELECT src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3;
-SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3;
+-- cp knob is removed, hardly convincible
+-- set hive.optimize.cp=false;
+-- SELECT src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3;
+-- SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3;
\ No newline at end of file

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q Sat Jun 28 00:23:54 2014
@@ -5,8 +5,8 @@ CREATE TABLE decimal_mapjoin STORED AS O
   FROM alltypesorc;
  
 SET hive.auto.convert.join=true;
-SET hive.auto.convert.join.nonconditionaltask=true;
-SET hive.auto.convert.join.nonconditionaltask.size=1000000000;
+SET hive.auto.convert.join.noconditionaltask=true;
+SET hive.auto.convert.join.noconditionaltask.size=1000000000;
 SET hive.vectorized.execution.enabled=true;
 
 EXPLAIN SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q Sat Jun 28 00:23:54 2014
@@ -25,7 +25,6 @@ insert into table vsmb_bucket_TXT select
 set hive.vectorized.execution.enabled=true;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
-set hive.auto.convert.sortmerge.join.noconditionaltask = true;
 set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
 
 explain

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_mapjoin.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_mapjoin.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_mapjoin.q Sat Jun 28 00:23:54 2014
@@ -1,7 +1,7 @@
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
-SET hive.auto.convert.join.nonconditionaltask=true;
-SET hive.auto.convert.join.nonconditionaltask.size=1000000000;
+SET hive.auto.convert.join.noconditionaltask=true;
+SET hive.auto.convert.join.noconditionaltask.size=1000000000;
 
 EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint)
   FROM alltypesorc t1

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q Sat Jun 28 00:23:54 2014
@@ -1,7 +1,7 @@
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
-SET hive.auto.convert.join.nonconditionaltask=true;
-SET hive.auto.convert.join.nonconditionaltask.size=1000000000;
+SET hive.auto.convert.join.noconditionaltask=true;
+SET hive.auto.convert.join.noconditionaltask.size=1000000000;
 
 explain select sum(t1.td) from (select  v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint;
 

Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_parquet.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_parquet.q?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_parquet.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/vectorized_parquet.q Sat Jun 28 00:23:54 2014
@@ -1,3 +1,6 @@
+set hive.exec.submitviachild=true;
+set hive.exec.submit.local.task.via.child=true;
+
 create table if not exists alltypes_parquet (
   cint int, 
   ctinyint tinyint, 

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/cachingprintstream.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/cachingprintstream.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/cachingprintstream.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/cachingprintstream.q.out Sat Jun 28 00:23:54 2014
@@ -8,30 +8,10 @@ PREHOOK: query: FROM src SELECT TRANSFOR
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 Begin cached logs.
 PREHOOK: query: FROM src SELECT TRANSFORM (key, value) USING 'FAKE_SCRIPT_SHOULD_NOT_EXIST' AS key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 End cached logs.
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/compute_stats_long.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/compute_stats_long.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/compute_stats_long.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/compute_stats_long.q.out Sat Jun 28 00:23:54 2014
@@ -20,14 +20,4 @@ select compute_stats(a, 10000) from tab_
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tab_int
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/dyn_part3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/dyn_part3.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/dyn_part3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/dyn_part3.q.out Sat Jun 28 00:23:54 2014
@@ -9,14 +9,5 @@ PREHOOK: query: insert overwrite table n
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@nzhang_part
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
 #### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out Sat Jun 28 00:23:54 2014
@@ -20,14 +20,5 @@ LIMIT 50
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@max_parts
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-2
-
-Logs:
-
 #### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out Sat Jun 28 00:23:54 2014
@@ -29,14 +29,5 @@ PREHOOK: query: SELECT key, value FROM s
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 1
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
+Job Submission failed with exception 'java.io.IOException(org.apache.hadoop.hive.ql.metadata.HiveException: Number of compact index entries loaded during the query exceeded the maximum of 5 set in hive.index.compact.query.max.entries)'
 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/index_compact_size_limit.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/index_compact_size_limit.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/index_compact_size_limit.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/index_compact_size_limit.q.out Sat Jun 28 00:23:54 2014
@@ -29,14 +29,5 @@ PREHOOK: query: SELECT key, value FROM s
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 1
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
+Job Submission failed with exception 'java.io.IOException(Size of data to read during a compact-index-based query exceeded the maximum of 1024 set in hive.index.compact.query.max.size)'
 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/local_mapred_error_cache.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/local_mapred_error_cache.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/local_mapred_error_cache.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/local_mapred_error_cache.q.out Sat Jun 28 00:23:54 2014
@@ -2,22 +2,4 @@ PREHOOK: query: FROM src SELECT TRANSFOR
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
-ID: Stage-1
-org.apache.hadoop.hive.ql.metadata.HiveException: [Error 20003]: An error occurred when trying to close the Operator running your custom script.
-#### A masked pattern was here ####
-org.apache.hadoop.hive.ql.metadata.HiveException: [Error 20003]: An error occurred when trying to close the Operator running your custom script.
-#### A masked pattern was here ####
-org.apache.hadoop.hive.ql.metadata.HiveException: [Error 20003]: An error occurred when trying to close the Operator running your custom script.
-#### A masked pattern was here ####
-Error during job, obtaining debugging information...
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/script_broken_pipe2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/script_broken_pipe2.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/script_broken_pipe2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/script_broken_pipe2.q.out Sat Jun 28 00:23:54 2014
@@ -3,14 +3,4 @@ SELECT TRANSFORM(key, value, key, value,
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/script_broken_pipe3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/script_broken_pipe3.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/script_broken_pipe3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/script_broken_pipe3.q.out Sat Jun 28 00:23:54 2014
@@ -3,14 +3,4 @@ SELECT TRANSFORM(*) USING 'false' AS a, 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/script_error.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/script_error.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/script_error.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/script_error.q.out Sat Jun 28 00:23:54 2014
@@ -47,14 +47,4 @@ FROM src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/serde_regex2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/serde_regex2.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/serde_regex2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/serde_regex2.q.out Sat Jun 28 00:23:54 2014
@@ -60,14 +60,4 @@ SELECT * FROM serde_regex ORDER BY time
 PREHOOK: type: QUERY
 PREHOOK: Input: default@serde_regex
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out Sat Jun 28 00:23:54 2014
@@ -8,4 +8,4 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@src
 key                 	string              	default             
 value               	string              	default             
-Query returned non-zero code: 1, cause: 'SET hive.join.cache.size=test' FAILED because hive.join.cache.size expects an INT value.
+Query returned non-zero code: 1, cause: 'SET hive.join.cache.size=test' FAILED because hive.join.cache.size expects INT type value.

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out Sat Jun 28 00:23:54 2014
@@ -8,4 +8,4 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@src
 key                 	string              	default             
 value               	string              	default             
-Query returned non-zero code: 1, cause: 'SET hive.map.aggr.hash.min.reduction=false' FAILED because hive.map.aggr.hash.min.reduction expects an FLOAT value.
+Query returned non-zero code: 1, cause: 'SET hive.map.aggr.hash.min.reduction=false' FAILED because hive.map.aggr.hash.min.reduction expects FLOAT type value.

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out Sat Jun 28 00:23:54 2014
@@ -30,14 +30,5 @@ PREHOOK: query: INSERT OVERWRITE TABLE t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@tmptable
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
 #### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out Sat Jun 28 00:23:54 2014
@@ -31,14 +31,5 @@ PREHOOK: query: INSERT OVERWRITE TABLE t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@tmptable
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
 #### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out Sat Jun 28 00:23:54 2014
@@ -30,14 +30,5 @@ PREHOOK: query: INSERT OVERWRITE TABLE t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@tmptable
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
 #### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/udf_assert_true.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/udf_assert_true.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/udf_assert_true.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/udf_assert_true.q.out Sat Jun 28 00:23:54 2014
@@ -151,14 +151,4 @@ PREHOOK: query: SELECT ASSERT_TRUE(x < 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/udf_assert_true2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/udf_assert_true2.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/udf_assert_true2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/udf_assert_true2.q.out Sat Jun 28 00:23:54 2014
@@ -69,14 +69,4 @@ PREHOOK: query: SELECT 1 + ASSERT_TRUE(x
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/udf_reflect_neg.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/udf_reflect_neg.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/udf_reflect_neg.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/udf_reflect_neg.q.out Sat Jun 28 00:23:54 2014
@@ -9,14 +9,4 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error.q.out Sat Jun 28 00:23:54 2014
@@ -8,14 +8,4 @@ PREHOOK: query: SELECT test_error(key < 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out Sat Jun 28 00:23:54 2014
@@ -13,14 +13,4 @@ FROM (
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 2
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-1
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/alter_db_owner.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_db_owner.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/alter_db_owner.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/alter_db_owner.q.out Sat Jun 28 00:23:54 2014
@@ -6,6 +6,7 @@ PREHOOK: query: describe database db_alt
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: describe database db_alter_onr
 POSTHOOK: type: DESCDATABASE
+db_alter_onr		location/in/test	hive_test_user	USER	
 #### A masked pattern was here ####
 PREHOOK: type: ALTERDATABASE_OWNER
 PREHOOK: Output: database:db_alter_onr
@@ -16,6 +17,7 @@ PREHOOK: query: describe database db_alt
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: describe database db_alter_onr
 POSTHOOK: type: DESCDATABASE
+db_alter_onr		location/in/test	user1	USER	
 #### A masked pattern was here ####
 PREHOOK: type: ALTERDATABASE_OWNER
 PREHOOK: Output: database:db_alter_onr
@@ -26,4 +28,4 @@ PREHOOK: query: describe database db_alt
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: describe database db_alter_onr
 POSTHOOK: type: DESCDATABASE
-#### A masked pattern was here ####
+db_alter_onr		location/in/test	role1	ROLE	

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out Sat Jun 28 00:23:54 2014
@@ -26,6 +26,7 @@ PREHOOK: query: desc database testdb
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: desc database testdb
 POSTHOOK: type: DESCDATABASE
+testdb		location/in/test	testrole	ROLE	
 #### A masked pattern was here ####
 -- create table
 use testdb

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join25.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join25.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join25.q.out Sat Jun 28 00:23:54 2014
@@ -19,16 +19,6 @@ 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
 PREHOOK: Output: default@dest1
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-7
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 POSTHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
@@ -72,28 +62,8 @@ INSERT OVERWRITE TABLE dest_j2 SELECT sr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dest_j2
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-14
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-12
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key + src2.key = src3.key)
@@ -134,16 +104,6 @@ INSERT OVERWRITE TABLE dest_j1 SELECT sr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dest_j1
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-7
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out Sat Jun 28 00:23:54 2014
@@ -935,28 +935,8 @@ select a.* from src a join src b on a.ke
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-14
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-11
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 POSTHOOK: query: -- fallback to common join

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/database_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/database_location.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/database_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/database_location.q.out Sat Jun 28 00:23:54 2014
@@ -6,7 +6,7 @@ PREHOOK: query: DESCRIBE DATABASE EXTEND
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: DESCRIBE DATABASE EXTENDED db1
 POSTHOOK: type: DESCDATABASE
-#### A masked pattern was here ####
+db1		location/in/test	hive_test_user	USER	
 PREHOOK: query: USE db1
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: USE db1
@@ -68,7 +68,7 @@ PREHOOK: query: DESCRIBE DATABASE EXTEND
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: DESCRIBE DATABASE EXTENDED db2
 POSTHOOK: type: DESCDATABASE
-#### A masked pattern was here ####
+db2	database 2	location/in/test	hive_test_user	USER	
 PREHOOK: query: USE db2
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: USE db2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/database_properties.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/database_properties.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/database_properties.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/database_properties.q.out Sat Jun 28 00:23:54 2014
@@ -22,7 +22,7 @@ PREHOOK: query: describe database db2
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: describe database db2
 POSTHOOK: type: DESCDATABASE
-#### A masked pattern was here ####
+db2		location/in/test	hive_test_user	USER	
 PREHOOK: query: describe database extended db2
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: describe database extended db2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/index_bitmap_compression.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/index_bitmap_compression.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/index_bitmap_compression.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/index_bitmap_compression.q.out Sat Jun 28 00:23:54 2014
@@ -90,7 +90,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
-                  compressed: false
+                  compressed: true
                   Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/index_compression.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/index_compression.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/index_compression.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/index_compression.q.out Sat Jun 28 00:23:54 2014
@@ -84,7 +84,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
-                  compressed: false
+                  compressed: true
                   Statistics: Num rows: 3 Data size: 601 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out Sat Jun 28 00:23:54 2014
@@ -76,16 +76,6 @@ SELECT a.key, b.value FROM src a JOIN sr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@test_table@part=1
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-7
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 POSTHOOK: query: -- This test tests the scenario when the mapper dies. So, create a conditional task for the mapjoin.

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_nullsafe.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_nullsafe.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_nullsafe.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_nullsafe.q.out Sat Jun 28 00:23:54 2014
@@ -555,6 +555,29 @@ NULL	35	NULL	NULL
 NULL	NULL	10	NULL
 NULL	NULL	48	NULL
 NULL	NULL	NULL	NULL
+PREHOOK: query: CREATE TABLE smb_input(key int, value int)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+POSTHOOK: query: CREATE TABLE smb_input(key int, value int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@smb_input
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in4.txt' into table smb_input
+PREHOOK: type: LOAD
+#### A masked pattern was here ####
+PREHOOK: Output: default@smb_input
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in4.txt' into table smb_input
+POSTHOOK: type: LOAD
+#### A masked pattern was here ####
+POSTHOOK: Output: default@smb_input
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in5.txt' into table smb_input
+PREHOOK: type: LOAD
+#### A masked pattern was here ####
+PREHOOK: Output: default@smb_input
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in5.txt' into table smb_input
+POSTHOOK: type: LOAD
+#### A masked pattern was here ####
+POSTHOOK: Output: default@smb_input
 PREHOOK: query: -- smbs
 CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
@@ -571,38 +594,24 @@ POSTHOOK: query: CREATE TABLE smb_input2
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@smb_input2
-PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input1
-PREHOOK: type: LOAD
-#### A masked pattern was here ####
-PREHOOK: Output: default@smb_input1
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input1
-POSTHOOK: type: LOAD
-#### A masked pattern was here ####
-POSTHOOK: Output: default@smb_input1
-PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input1
-PREHOOK: type: LOAD
-#### A masked pattern was here ####
+PREHOOK: query: from smb_input
+insert overwrite table smb_input1 select *
+insert overwrite table smb_input2 select *
+PREHOOK: type: QUERY
+PREHOOK: Input: default@smb_input
 PREHOOK: Output: default@smb_input1
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input1
-POSTHOOK: type: LOAD
-#### A masked pattern was here ####
-POSTHOOK: Output: default@smb_input1
-PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input2
-PREHOOK: type: LOAD
-#### A masked pattern was here ####
 PREHOOK: Output: default@smb_input2
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input2
-POSTHOOK: type: LOAD
-#### A masked pattern was here ####
-POSTHOOK: Output: default@smb_input2
-PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input2
-PREHOOK: type: LOAD
-#### A masked pattern was here ####
-PREHOOK: Output: default@smb_input2
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input2
-POSTHOOK: type: LOAD
-#### A masked pattern was here ####
+POSTHOOK: query: from smb_input
+insert overwrite table smb_input1 select *
+insert overwrite table smb_input2 select *
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@smb_input
+POSTHOOK: Output: default@smb_input1
 POSTHOOK: Output: default@smb_input2
+POSTHOOK: Lineage: smb_input1.key SIMPLE [(smb_input)smb_input.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: smb_input1.value SIMPLE [(smb_input)smb_input.FieldSchema(name:value, type:int, comment:null), ]
+POSTHOOK: Lineage: smb_input2.key SIMPLE [(smb_input)smb_input.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: smb_input2.value SIMPLE [(smb_input)smb_input.FieldSchema(name:value, type:int, comment:null), ]
 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@smb_input1
@@ -611,47 +620,59 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(a) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 #### A masked pattern was here ####
-10	NULL	10	NULL
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	1000
+10	100	10	1000
+10	1000	10	100
+10	1000	10	100
+10	1000	10	1000
 100	100	100	100
-110	NULL	110	NULL
-148	NULL	148	NULL
-200	200	200	200
-48	NULL	48	NULL
-NULL	10	NULL	10
-NULL	10	NULL	110
-NULL	10	NULL	135
-NULL	10	NULL	35
-NULL	10	NULL	NULL
-NULL	10	NULL	NULL
-NULL	110	NULL	10
-NULL	110	NULL	110
-NULL	110	NULL	135
-NULL	110	NULL	35
-NULL	110	NULL	NULL
-NULL	110	NULL	NULL
-NULL	135	NULL	10
-NULL	135	NULL	110
-NULL	135	NULL	135
-NULL	135	NULL	35
-NULL	135	NULL	NULL
-NULL	135	NULL	NULL
-NULL	35	NULL	10
-NULL	35	NULL	110
-NULL	35	NULL	135
+12	100	12	100
+12	100	12	NULL
+12	NULL	12	100
+12	NULL	12	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	NULL	10050
+NULL	10050	NULL	35
+NULL	10050	NULL	NULL
+NULL	35	NULL	10050
 NULL	35	NULL	35
 NULL	35	NULL	NULL
-NULL	35	NULL	NULL
-NULL	NULL	NULL	10
-NULL	NULL	NULL	10
-NULL	NULL	NULL	110
-NULL	NULL	NULL	110
-NULL	NULL	NULL	135
-NULL	NULL	NULL	135
+NULL	NULL	NULL	10050
 NULL	NULL	NULL	35
-NULL	NULL	NULL	35
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value
 PREHOOK: type: QUERY
@@ -661,20 +682,48 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(a) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 #### A masked pattern was here ####
-10	NULL	10	NULL
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	1000	10	1000
 100	100	100	100
-110	NULL	110	NULL
-148	NULL	148	NULL
-200	200	200	200
-48	NULL	48	NULL
-NULL	10	NULL	10
-NULL	110	NULL	110
-NULL	135	NULL	135
+12	100	12	100
+12	NULL	12	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	NULL	10050
 NULL	35	NULL	35
 NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@smb_input1
@@ -683,47 +732,59 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(a) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 #### A masked pattern was here ####
-10	NULL	10	NULL
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	1000
+10	100	10	1000
+10	1000	10	100
+10	1000	10	100
+10	1000	10	1000
 100	100	100	100
-110	NULL	110	NULL
-148	NULL	148	NULL
-200	200	200	200
-48	NULL	48	NULL
-NULL	10	NULL	10
-NULL	10	NULL	110
-NULL	10	NULL	135
-NULL	10	NULL	35
-NULL	10	NULL	NULL
-NULL	10	NULL	NULL
-NULL	110	NULL	10
-NULL	110	NULL	110
-NULL	110	NULL	135
-NULL	110	NULL	35
-NULL	110	NULL	NULL
-NULL	110	NULL	NULL
-NULL	135	NULL	10
-NULL	135	NULL	110
-NULL	135	NULL	135
-NULL	135	NULL	35
-NULL	135	NULL	NULL
-NULL	135	NULL	NULL
-NULL	35	NULL	10
-NULL	35	NULL	110
-NULL	35	NULL	135
+12	100	12	100
+12	100	12	NULL
+12	NULL	12	100
+12	NULL	12	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	NULL	10050
+NULL	10050	NULL	35
+NULL	10050	NULL	NULL
+NULL	35	NULL	10050
 NULL	35	NULL	35
 NULL	35	NULL	NULL
-NULL	35	NULL	NULL
-NULL	NULL	NULL	10
-NULL	NULL	NULL	10
-NULL	NULL	NULL	110
-NULL	NULL	NULL	110
-NULL	NULL	NULL	135
-NULL	NULL	NULL	135
+NULL	NULL	NULL	10050
 NULL	NULL	NULL	35
-NULL	NULL	NULL	35
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key
 PREHOOK: type: QUERY
@@ -733,48 +794,60 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(b) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 #### A masked pattern was here ####
-10	NULL	10	NULL
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	1000
+10	100	10	1000
+10	1000	10	100
+10	1000	10	100
+10	1000	10	1000
 100	100	100	100
-110	NULL	110	NULL
-148	NULL	148	NULL
-200	200	200	200
-48	NULL	48	NULL
-NULL	10	NULL	10
-NULL	10	NULL	110
-NULL	10	NULL	135
-NULL	10	NULL	35
-NULL	10	NULL	NULL
-NULL	10	NULL	NULL
-NULL	110	NULL	10
-NULL	110	NULL	110
-NULL	110	NULL	135
-NULL	110	NULL	35
-NULL	110	NULL	NULL
-NULL	110	NULL	NULL
-NULL	135	NULL	10
-NULL	135	NULL	110
-NULL	135	NULL	135
-NULL	135	NULL	35
-NULL	135	NULL	NULL
-NULL	135	NULL	NULL
-NULL	35	NULL	10
-NULL	35	NULL	110
-NULL	35	NULL	135
+12	100	12	100
+12	100	12	NULL
+12	NULL	12	100
+12	NULL	12	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	NULL	10050
+NULL	10050	NULL	35
+NULL	10050	NULL	NULL
+NULL	35	NULL	10050
 NULL	35	NULL	35
 NULL	35	NULL	NULL
-NULL	35	NULL	NULL
-NULL	NULL	NULL	10
-NULL	NULL	NULL	10
-NULL	NULL	NULL	110
-NULL	NULL	NULL	110
-NULL	NULL	NULL	135
-NULL	NULL	NULL	135
-NULL	NULL	NULL	35
+NULL	NULL	NULL	10050
 NULL	NULL	NULL	35
 NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@smb_input1
@@ -783,48 +856,60 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(b) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 #### A masked pattern was here ####
-10	NULL	10	NULL
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	1000
+10	100	10	1000
+10	1000	10	100
+10	1000	10	100
+10	1000	10	1000
 100	100	100	100
-110	NULL	110	NULL
-148	NULL	148	NULL
-200	200	200	200
-48	NULL	48	NULL
-NULL	10	NULL	10
-NULL	10	NULL	110
-NULL	10	NULL	135
-NULL	10	NULL	35
-NULL	10	NULL	NULL
-NULL	10	NULL	NULL
-NULL	110	NULL	10
-NULL	110	NULL	110
-NULL	110	NULL	135
-NULL	110	NULL	35
-NULL	110	NULL	NULL
-NULL	110	NULL	NULL
-NULL	135	NULL	10
-NULL	135	NULL	110
-NULL	135	NULL	135
-NULL	135	NULL	35
-NULL	135	NULL	NULL
-NULL	135	NULL	NULL
-NULL	35	NULL	10
-NULL	35	NULL	110
-NULL	35	NULL	135
+12	100	12	100
+12	100	12	NULL
+12	NULL	12	100
+12	NULL	12	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	NULL	10050
+NULL	10050	NULL	35
+NULL	10050	NULL	NULL
+NULL	35	NULL	10050
 NULL	35	NULL	35
 NULL	35	NULL	NULL
-NULL	35	NULL	NULL
-NULL	NULL	NULL	10
-NULL	NULL	NULL	10
-NULL	NULL	NULL	110
-NULL	NULL	NULL	110
-NULL	NULL	NULL	135
-NULL	NULL	NULL	135
-NULL	NULL	NULL	35
+NULL	NULL	NULL	10050
 NULL	NULL	NULL	35
 NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@smb_input1
@@ -835,45 +920,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 POSTHOOK: Input: default@smb_input2
 #### A masked pattern was here ####
-10	NULL	NULL	10
+100	100	10	100
+100	100	10	100
 100	100	100	100
-110	NULL	NULL	110
-200	200	200	200
-NULL	10	10	NULL
-NULL	10	110	NULL
-NULL	10	148	NULL
-NULL	10	48	NULL
-NULL	10	NULL	NULL
-NULL	10	NULL	NULL
-NULL	110	10	NULL
-NULL	110	110	NULL
-NULL	110	148	NULL
-NULL	110	48	NULL
-NULL	110	NULL	NULL
-NULL	110	NULL	NULL
-NULL	135	10	NULL
-NULL	135	110	NULL
-NULL	135	148	NULL
-NULL	135	48	NULL
-NULL	135	NULL	NULL
-NULL	135	NULL	NULL
-NULL	35	10	NULL
-NULL	35	110	NULL
-NULL	35	148	NULL
-NULL	35	48	NULL
-NULL	35	NULL	NULL
+100	100	12	100
+35	10035	NULL	35
+NULL	10050	12	NULL
+NULL	10050	NULL	NULL
+NULL	35	12	NULL
 NULL	35	NULL	NULL
-NULL	NULL	10	NULL
-NULL	NULL	10	NULL
-NULL	NULL	110	NULL
-NULL	NULL	110	NULL
-NULL	NULL	148	NULL
-NULL	NULL	148	NULL
-NULL	NULL	48	NULL
-NULL	NULL	48	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
+NULL	NULL	12	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value
 PREHOOK: type: QUERY
@@ -885,45 +941,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 POSTHOOK: Input: default@smb_input2
 #### A masked pattern was here ####
-10	NULL	NULL	10
+100	100	10	100
+100	100	10	100
 100	100	100	100
-110	NULL	NULL	110
-200	200	200	200
-NULL	10	10	NULL
-NULL	10	110	NULL
-NULL	10	148	NULL
-NULL	10	48	NULL
-NULL	10	NULL	NULL
-NULL	10	NULL	NULL
-NULL	110	10	NULL
-NULL	110	110	NULL
-NULL	110	148	NULL
-NULL	110	48	NULL
-NULL	110	NULL	NULL
-NULL	110	NULL	NULL
-NULL	135	10	NULL
-NULL	135	110	NULL
-NULL	135	148	NULL
-NULL	135	48	NULL
-NULL	135	NULL	NULL
-NULL	135	NULL	NULL
-NULL	35	10	NULL
-NULL	35	110	NULL
-NULL	35	148	NULL
-NULL	35	48	NULL
-NULL	35	NULL	NULL
+100	100	12	100
+35	10035	NULL	35
+NULL	10050	12	NULL
+NULL	10050	NULL	NULL
+NULL	35	12	NULL
 NULL	35	NULL	NULL
-NULL	NULL	10	NULL
-NULL	NULL	10	NULL
-NULL	NULL	110	NULL
-NULL	NULL	110	NULL
-NULL	NULL	148	NULL
-NULL	NULL	148	NULL
-NULL	NULL	48	NULL
-NULL	NULL	48	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
+NULL	NULL	12	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value
 PREHOOK: type: QUERY
@@ -935,47 +962,37 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 POSTHOOK: Input: default@smb_input2
 #### A masked pattern was here ####
-10	NULL	NULL	10
+10	100	NULL	NULL
+10	100	NULL	NULL
+10	1000	NULL	NULL
+100	100	10	100
+100	100	10	100
 100	100	100	100
-110	NULL	NULL	110
-148	NULL	NULL	NULL
-200	200	200	200
-48	NULL	NULL	NULL
-NULL	10	10	NULL
-NULL	10	110	NULL
-NULL	10	148	NULL
-NULL	10	48	NULL
-NULL	10	NULL	NULL
-NULL	10	NULL	NULL
-NULL	110	10	NULL
-NULL	110	110	NULL
-NULL	110	148	NULL
-NULL	110	48	NULL
-NULL	110	NULL	NULL
-NULL	110	NULL	NULL
-NULL	135	10	NULL
-NULL	135	110	NULL
-NULL	135	148	NULL
-NULL	135	48	NULL
-NULL	135	NULL	NULL
-NULL	135	NULL	NULL
-NULL	35	10	NULL
-NULL	35	110	NULL
-NULL	35	148	NULL
-NULL	35	48	NULL
+100	100	12	100
+12	100	NULL	NULL
+12	NULL	NULL	NULL
+15	10015	NULL	NULL
+20	10020	NULL	NULL
+25	10025	NULL	NULL
+30	10030	NULL	NULL
+35	10035	NULL	35
+40	10040	NULL	NULL
+40	10040	NULL	NULL
+5	10005	NULL	NULL
+50	10050	NULL	NULL
+50	10050	NULL	NULL
+50	10050	NULL	NULL
+60	10040	NULL	NULL
+60	10040	NULL	NULL
+70	10040	NULL	NULL
+70	10040	NULL	NULL
+80	10040	NULL	NULL
+80	10040	NULL	NULL
+NULL	10050	12	NULL
+NULL	10050	NULL	NULL
+NULL	35	12	NULL
 NULL	35	NULL	NULL
-NULL	35	NULL	NULL
-NULL	NULL	10	NULL
-NULL	NULL	10	NULL
-NULL	NULL	110	NULL
-NULL	NULL	110	NULL
-NULL	NULL	148	NULL
-NULL	NULL	148	NULL
-NULL	NULL	48	NULL
-NULL	NULL	48	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
+NULL	NULL	12	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value
 PREHOOK: type: QUERY
@@ -987,47 +1004,35 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input1
 POSTHOOK: Input: default@smb_input2
 #### A masked pattern was here ####
-10	NULL	NULL	10
+100	100	10	100
+100	100	10	100
 100	100	100	100
-110	NULL	NULL	110
-200	200	200	200
-NULL	10	10	NULL
-NULL	10	110	NULL
-NULL	10	148	NULL
-NULL	10	48	NULL
-NULL	10	NULL	NULL
-NULL	10	NULL	NULL
-NULL	110	10	NULL
-NULL	110	110	NULL
-NULL	110	148	NULL
-NULL	110	48	NULL
-NULL	110	NULL	NULL
-NULL	110	NULL	NULL
-NULL	135	10	NULL
-NULL	135	110	NULL
-NULL	135	148	NULL
-NULL	135	48	NULL
-NULL	135	NULL	NULL
-NULL	135	NULL	NULL
-NULL	35	10	NULL
-NULL	35	110	NULL
-NULL	35	148	NULL
-NULL	35	48	NULL
+100	100	12	100
+35	10035	NULL	35
+NULL	10050	12	NULL
+NULL	10050	NULL	NULL
+NULL	35	12	NULL
 NULL	35	NULL	NULL
-NULL	35	NULL	NULL
-NULL	NULL	10	NULL
-NULL	NULL	10	NULL
-NULL	NULL	110	NULL
-NULL	NULL	110	NULL
-NULL	NULL	148	NULL
-NULL	NULL	148	NULL
-NULL	NULL	48	NULL
-NULL	NULL	48	NULL
-NULL	NULL	NULL	135
-NULL	NULL	NULL	35
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
+NULL	NULL	10	1000
+NULL	NULL	12	NULL
+NULL	NULL	15	10015
+NULL	NULL	20	10020
+NULL	NULL	25	10025
+NULL	NULL	30	10030
+NULL	NULL	35	10035
+NULL	NULL	40	10040
+NULL	NULL	40	10040
+NULL	NULL	5	10005
+NULL	NULL	50	10050
+NULL	NULL	50	10050
+NULL	NULL	50	10050
+NULL	NULL	60	10040
+NULL	NULL	60	10040
+NULL	NULL	70	10040
+NULL	NULL	70	10040
+NULL	NULL	80	10040
+NULL	NULL	80	10040
+NULL	NULL	NULL	10050
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value
 PREHOOK: type: QUERY
@@ -1037,47 +1042,113 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(a) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input2
 #### A masked pattern was here ####
-10	NULL	10	NULL
-10	NULL	110	NULL
-10	NULL	148	NULL
-10	NULL	48	NULL
-10	NULL	NULL	NULL
-10	NULL	NULL	NULL
-100	100	100	100
-110	NULL	10	NULL
-110	NULL	110	NULL
-110	NULL	148	NULL
-110	NULL	48	NULL
-110	NULL	NULL	NULL
-110	NULL	NULL	NULL
-148	NULL	10	NULL
-148	NULL	110	NULL
-148	NULL	148	NULL
-148	NULL	48	NULL
-148	NULL	NULL	NULL
-148	NULL	NULL	NULL
-200	200	200	200
-48	NULL	10	NULL
-48	NULL	110	NULL
-48	NULL	148	NULL
-48	NULL	48	NULL
-48	NULL	NULL	NULL
-48	NULL	NULL	NULL
-NULL	10	NULL	10
-NULL	110	NULL	110
-NULL	135	NULL	135
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	100	100
+10	100	100	100
+10	100	12	100
+10	100	12	100
+10	1000	10	1000
+100	100	10	100
+100	100	10	100
+100	100	100	100
+100	100	12	100
+12	100	10	100
+12	100	10	100
+12	100	100	100
+12	100	12	100
+12	NULL	12	NULL
+12	NULL	NULL	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	80	10040
+40	10040	80	10040
+40	10040	80	10040
+40	10040	80	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	NULL	10050
+50	10050	NULL	10050
+50	10050	NULL	10050
+60	10040	40	10040
+60	10040	40	10040
+60	10040	40	10040
+60	10040	40	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	80	10040
+60	10040	80	10040
+60	10040	80	10040
+60	10040	80	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	80	10040
+70	10040	80	10040
+70	10040	80	10040
+70	10040	80	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	50	10050
+NULL	10050	50	10050
+NULL	10050	50	10050
+NULL	10050	NULL	10050
 NULL	35	NULL	35
-NULL	NULL	10	NULL
-NULL	NULL	10	NULL
-NULL	NULL	110	NULL
-NULL	NULL	110	NULL
-NULL	NULL	148	NULL
-NULL	NULL	148	NULL
-NULL	NULL	48	NULL
-NULL	NULL	48	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
+NULL	NULL	12	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value
 PREHOOK: type: QUERY
@@ -1087,47 +1158,113 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(a) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input2
 #### A masked pattern was here ####
-10	NULL	10	NULL
-10	NULL	110	NULL
-10	NULL	148	NULL
-10	NULL	48	NULL
-10	NULL	NULL	NULL
-10	NULL	NULL	NULL
-100	100	100	100
-110	NULL	10	NULL
-110	NULL	110	NULL
-110	NULL	148	NULL
-110	NULL	48	NULL
-110	NULL	NULL	NULL
-110	NULL	NULL	NULL
-148	NULL	10	NULL
-148	NULL	110	NULL
-148	NULL	148	NULL
-148	NULL	48	NULL
-148	NULL	NULL	NULL
-148	NULL	NULL	NULL
-200	200	200	200
-48	NULL	10	NULL
-48	NULL	110	NULL
-48	NULL	148	NULL
-48	NULL	48	NULL
-48	NULL	NULL	NULL
-48	NULL	NULL	NULL
-NULL	10	NULL	10
-NULL	110	NULL	110
-NULL	135	NULL	135
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	100	100
+10	100	100	100
+10	100	12	100
+10	100	12	100
+10	1000	10	1000
+100	100	10	100
+100	100	10	100
+100	100	100	100
+100	100	12	100
+12	100	10	100
+12	100	10	100
+12	100	100	100
+12	100	12	100
+12	NULL	12	NULL
+12	NULL	NULL	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	80	10040
+40	10040	80	10040
+40	10040	80	10040
+40	10040	80	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	NULL	10050
+50	10050	NULL	10050
+50	10050	NULL	10050
+60	10040	40	10040
+60	10040	40	10040
+60	10040	40	10040
+60	10040	40	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	80	10040
+60	10040	80	10040
+60	10040	80	10040
+60	10040	80	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	80	10040
+70	10040	80	10040
+70	10040	80	10040
+70	10040	80	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	50	10050
+NULL	10050	50	10050
+NULL	10050	50	10050
+NULL	10050	NULL	10050
 NULL	35	NULL	35
-NULL	NULL	10	NULL
-NULL	NULL	10	NULL
-NULL	NULL	110	NULL
-NULL	NULL	110	NULL
-NULL	NULL	148	NULL
-NULL	NULL	148	NULL
-NULL	NULL	48	NULL
-NULL	NULL	48	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
+NULL	NULL	12	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value
 PREHOOK: type: QUERY
@@ -1137,47 +1274,113 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(b) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input2
 #### A masked pattern was here ####
-10	NULL	10	NULL
-10	NULL	110	NULL
-10	NULL	148	NULL
-10	NULL	48	NULL
-10	NULL	NULL	NULL
-10	NULL	NULL	NULL
-100	100	100	100
-110	NULL	10	NULL
-110	NULL	110	NULL
-110	NULL	148	NULL
-110	NULL	48	NULL
-110	NULL	NULL	NULL
-110	NULL	NULL	NULL
-148	NULL	10	NULL
-148	NULL	110	NULL
-148	NULL	148	NULL
-148	NULL	48	NULL
-148	NULL	NULL	NULL
-148	NULL	NULL	NULL
-200	200	200	200
-48	NULL	10	NULL
-48	NULL	110	NULL
-48	NULL	148	NULL
-48	NULL	48	NULL
-48	NULL	NULL	NULL
-48	NULL	NULL	NULL
-NULL	10	NULL	10
-NULL	110	NULL	110
-NULL	135	NULL	135
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	100	100
+10	100	100	100
+10	100	12	100
+10	100	12	100
+10	1000	10	1000
+100	100	10	100
+100	100	10	100
+100	100	100	100
+100	100	12	100
+12	100	10	100
+12	100	10	100
+12	100	100	100
+12	100	12	100
+12	NULL	12	NULL
+12	NULL	NULL	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	80	10040
+40	10040	80	10040
+40	10040	80	10040
+40	10040	80	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	NULL	10050
+50	10050	NULL	10050
+50	10050	NULL	10050
+60	10040	40	10040
+60	10040	40	10040
+60	10040	40	10040
+60	10040	40	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	80	10040
+60	10040	80	10040
+60	10040	80	10040
+60	10040	80	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	80	10040
+70	10040	80	10040
+70	10040	80	10040
+70	10040	80	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	50	10050
+NULL	10050	50	10050
+NULL	10050	50	10050
+NULL	10050	NULL	10050
 NULL	35	NULL	35
-NULL	NULL	10	NULL
-NULL	NULL	10	NULL
-NULL	NULL	110	NULL
-NULL	NULL	110	NULL
-NULL	NULL	148	NULL
-NULL	NULL	148	NULL
-NULL	NULL	48	NULL
-NULL	NULL	48	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
+NULL	NULL	12	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value
 PREHOOK: type: QUERY
@@ -1187,47 +1390,113 @@ POSTHOOK: query: SELECT /*+ MAPJOIN(b) *
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_input2
 #### A masked pattern was here ####
-10	NULL	10	NULL
-10	NULL	110	NULL
-10	NULL	148	NULL
-10	NULL	48	NULL
-10	NULL	NULL	NULL
-10	NULL	NULL	NULL
-100	100	100	100
-110	NULL	10	NULL
-110	NULL	110	NULL
-110	NULL	148	NULL
-110	NULL	48	NULL
-110	NULL	NULL	NULL
-110	NULL	NULL	NULL
-148	NULL	10	NULL
-148	NULL	110	NULL
-148	NULL	148	NULL
-148	NULL	48	NULL
-148	NULL	NULL	NULL
-148	NULL	NULL	NULL
-200	200	200	200
-48	NULL	10	NULL
-48	NULL	110	NULL
-48	NULL	148	NULL
-48	NULL	48	NULL
-48	NULL	NULL	NULL
-48	NULL	NULL	NULL
-NULL	10	NULL	10
-NULL	110	NULL	110
-NULL	135	NULL	135
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	10	100
+10	100	100	100
+10	100	100	100
+10	100	12	100
+10	100	12	100
+10	1000	10	1000
+100	100	10	100
+100	100	10	100
+100	100	100	100
+100	100	12	100
+12	100	10	100
+12	100	10	100
+12	100	100	100
+12	100	12	100
+12	NULL	12	NULL
+12	NULL	NULL	NULL
+15	10015	15	10015
+20	10020	20	10020
+25	10025	25	10025
+30	10030	30	10030
+35	10035	35	10035
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	40	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	60	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	70	10040
+40	10040	80	10040
+40	10040	80	10040
+40	10040	80	10040
+40	10040	80	10040
+5	10005	5	10005
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	50	10050
+50	10050	NULL	10050
+50	10050	NULL	10050
+50	10050	NULL	10050
+60	10040	40	10040
+60	10040	40	10040
+60	10040	40	10040
+60	10040	40	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	60	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	70	10040
+60	10040	80	10040
+60	10040	80	10040
+60	10040	80	10040
+60	10040	80	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	40	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	60	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	70	10040
+70	10040	80	10040
+70	10040	80	10040
+70	10040	80	10040
+70	10040	80	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	40	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	60	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	70	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+80	10040	80	10040
+NULL	10050	50	10050
+NULL	10050	50	10050
+NULL	10050	50	10050
+NULL	10050	NULL	10050
 NULL	35	NULL	35
-NULL	NULL	10	NULL
-NULL	NULL	10	NULL
-NULL	NULL	110	NULL
-NULL	NULL	110	NULL
-NULL	NULL	148	NULL
-NULL	NULL	148	NULL
-NULL	NULL	48	NULL
-NULL	NULL	48	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL
+NULL	NULL	12	NULL
 NULL	NULL	NULL	NULL
 PREHOOK: query: --HIVE-3315 join predicate transitive
 explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin_hook.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin_hook.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin_hook.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin_hook.q.out Sat Jun 28 00:23:54 2014
@@ -37,16 +37,6 @@ 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
 PREHOOK: Output: default@dest1
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-7
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 [MapJoinCounter PostHook] COMMON_JOIN: 0 HINTED_MAPJOIN: 0 HINTED_MAPJOIN_LOCAL: 0 CONVERTED_MAPJOIN: 0 CONVERTED_MAPJOIN_LOCAL: 1 BACKUP_COMMON_JOIN: 1
@@ -60,28 +50,8 @@ INSERT OVERWRITE TABLE dest1 SELECT src1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dest1
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-14
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
-Execution failed with exit status: 3
-Obtaining error information
-
-Task failed!
-Task ID:
-  Stage-12
-
-Logs:
-
-#### A masked pattern was here ####
 FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 [MapJoinCounter PostHook] COMMON_JOIN: 0 HINTED_MAPJOIN: 0 HINTED_MAPJOIN_LOCAL: 0 CONVERTED_MAPJOIN: 0 CONVERTED_MAPJOIN_LOCAL: 2 BACKUP_COMMON_JOIN: 2

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/overridden_confs.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/overridden_confs.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/overridden_confs.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/overridden_confs.q.out Sat Jun 28 00:23:54 2014
@@ -3,5 +3,5 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
 Key: hive.exec.post.hooks, Value: org.apache.hadoop.hive.ql.hooks.VerifyOverriddenConfigsHook
-Key: hive.config.doesnt.exit, Value: abc
+Key: some.hive.config.doesnt.exit, Value: abc
 500

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample8.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample8.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample8.q.out Sat Jun 28 00:23:54 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/stats15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/stats15.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/stats15.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/stats15.q.out Sat Jun 28 00:23:54 2014
@@ -45,7 +45,7 @@ Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	1                   
 	numRows             	500                 
-	rawDataSize         	5312                
+	rawDataSize         	0                   
 	totalSize           	5812                
 #### A masked pattern was here ####
 	 	 
@@ -185,7 +185,7 @@ Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	1                   
 	numRows             	500                 
-	rawDataSize         	5312                
+	rawDataSize         	0                   
 	totalSize           	5812                
 #### A masked pattern was here ####
 	 	 
@@ -227,7 +227,7 @@ Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	1                   
 	numRows             	500                 
-	rawDataSize         	5312                
+	rawDataSize         	0                   
 	totalSize           	5812                
 #### A masked pattern was here ####
 	 	 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/udtf_explode.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/udtf_explode.q.out?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/udtf_explode.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/udtf_explode.q.out Sat Jun 28 00:23:54 2014 differ

Modified: hive/branches/cbo/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardStructObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardStructObjectInspector.java?rev=1606275&r1=1606274&r2=1606275&view=diff
==============================================================================
--- hive/branches/cbo/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardStructObjectInspector.java (original)
+++ hive/branches/cbo/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardStructObjectInspector.java Sat Jun 28 00:23:54 2014
@@ -112,9 +112,6 @@ public class StandardStructObjectInspect
   protected void init(List<String> structFieldNames,
       List<ObjectInspector> structFieldObjectInspectors,
       List<String> structFieldComments) {
-    assert (structFieldNames.size() == structFieldObjectInspectors.size());
-    assert (structFieldComments == null ||
-            (structFieldNames.size() == structFieldComments.size()));
 
     fields = new ArrayList<MyField>(structFieldNames.size());
     for (int i = 0; i < structFieldNames.size(); i++) {
@@ -182,7 +179,6 @@ public class StandardStructObjectInspect
       LOG.warn("ignoring similar errors.");
     }
     int fieldID = f.getFieldID();
-    assert (fieldID >= 0 && fieldID < fields.size());
 
     if (fieldID >= listSize) {
       return null;
@@ -205,7 +201,6 @@ public class StandardStructObjectInspect
       data = java.util.Arrays.asList((Object[]) data);
     }
     List<Object> list = (List<Object>) data;
-    assert (list.size() == fields.size());
     return list;
   }