diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index edc3d38..8f138c1 100644
--- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -601,6 +601,10 @@
HIVEOPTSORTMERGEBUCKETMAPJOIN("hive.optimize.bucketmapjoin.sortedmerge", false), // try to use sorted merge bucket map join
HIVEOPTREDUCEDEDUPLICATION("hive.optimize.reducededuplication", true),
HIVEOPTREDUCEDEDUPLICATIONMINREDUCER("hive.optimize.reducededuplication.min.reducer", 4),
+ // when enabled dynamic partitioning column will be globally sorted.
+ // this way we can keep only one record writer open for each partition value
+ // in the reducer thereby reducing the memory pressure on reducer
+ HIVEOPTSORTDYNAMICPARTITION("hive.optimize.sort.dynamic.partition", true),
HIVESAMPLINGFORORDERBY("hive.optimize.sampling.orderby", false),
HIVESAMPLINGNUMBERFORORDERBY("hive.optimize.sampling.orderby.number", 1000),
diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
index 2cd8756..af9ba38 100644
--- ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
+++ ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
@@ -33,25 +33,25 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.common.FileUtils;
import org.apache.hadoop.hive.common.StatsSetupConst;
+import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.ErrorMsg;
import org.apache.hadoop.hive.ql.io.FSRecordWriter;
import org.apache.hadoop.hive.ql.io.FSRecordWriter.StatsProvidingRecordWriter;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.metadata.HiveFatalException;
import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils;
import org.apache.hadoop.hive.ql.io.HiveKey;
import org.apache.hadoop.hive.ql.io.HiveOutputFormat;
import org.apache.hadoop.hive.ql.io.HivePartitioner;
import org.apache.hadoop.hive.ql.io.HivePassThroughOutputFormat;
import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.apache.hadoop.hive.ql.metadata.HiveFatalException;
import org.apache.hadoop.hive.ql.plan.DynamicPartitionCtx;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.FileSinkDesc;
+import org.apache.hadoop.hive.ql.plan.FileSinkDesc.DPSortState;
import org.apache.hadoop.hive.ql.plan.ListBucketingCtx;
import org.apache.hadoop.hive.ql.plan.PlanUtils;
import org.apache.hadoop.hive.ql.plan.SkewedColumnPositionPair;
import org.apache.hadoop.hive.ql.plan.api.OperatorType;
-import org.apache.hadoop.hive.ql.stats.CounterStatsPublisher;
import org.apache.hadoop.hive.ql.stats.StatsCollectionTaskIndependent;
import org.apache.hadoop.hive.ql.stats.StatsPublisher;
import org.apache.hadoop.hive.serde2.SerDeException;
@@ -68,6 +68,8 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.util.ReflectionUtils;
+import com.google.common.collect.Lists;
+
/**
* File Sink operator implementation.
**/
@@ -93,6 +95,12 @@
protected transient boolean statsCollectRawDataSize;
private transient boolean[] statsFromRecordWriter;
private transient boolean isCollectRWStats;
+ private transient FSPaths prevFsp;
+ private transient FSPaths fpaths;
+ private transient ObjectInspector keyOI;
+ private transient List
+
+
+
1
@@ -662,6 +667,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/cast1.q.xml ql/src/test/results/compiler/plan/cast1.q.xml
index 8e254aa..ce1d68b 100644
--- ql/src/test/results/compiler/plan/cast1.q.xml
+++ ql/src/test/results/compiler/plan/cast1.q.xml
@@ -168,6 +168,11 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/groupby1.q.xml ql/src/test/results/compiler/plan/groupby1.q.xml
index e257d4b..6e610b2 100755
--- ql/src/test/results/compiler/plan/groupby1.q.xml
+++ ql/src/test/results/compiler/plan/groupby1.q.xml
@@ -387,6 +387,9 @@
+
+ -1
+
1
@@ -1064,6 +1067,11 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/groupby2.q.xml ql/src/test/results/compiler/plan/groupby2.q.xml
index 6041e9e..fb8421d 100755
--- ql/src/test/results/compiler/plan/groupby2.q.xml
+++ ql/src/test/results/compiler/plan/groupby2.q.xml
@@ -286,6 +286,9 @@
+
+ -1
+
1
@@ -1183,6 +1186,11 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/groupby3.q.xml ql/src/test/results/compiler/plan/groupby3.q.xml
index b2c70b1..ab54c9e 100644
--- ql/src/test/results/compiler/plan/groupby3.q.xml
+++ ql/src/test/results/compiler/plan/groupby3.q.xml
@@ -338,6 +338,9 @@
+
+ -1
+
1
@@ -1404,6 +1407,11 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/groupby4.q.xml ql/src/test/results/compiler/plan/groupby4.q.xml
index cf7b100..04e7d48 100644
--- ql/src/test/results/compiler/plan/groupby4.q.xml
+++ ql/src/test/results/compiler/plan/groupby4.q.xml
@@ -225,6 +225,9 @@
+
+ -1
+
1
@@ -805,6 +808,11 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/groupby5.q.xml ql/src/test/results/compiler/plan/groupby5.q.xml
index 8f022b3..25db3df 100644
--- ql/src/test/results/compiler/plan/groupby5.q.xml
+++ ql/src/test/results/compiler/plan/groupby5.q.xml
@@ -243,6 +243,9 @@
+
+ -1
+
1
@@ -911,6 +914,11 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/groupby6.q.xml ql/src/test/results/compiler/plan/groupby6.q.xml
index ff372d3..92567de 100644
--- ql/src/test/results/compiler/plan/groupby6.q.xml
+++ ql/src/test/results/compiler/plan/groupby6.q.xml
@@ -225,6 +225,9 @@
+
+ -1
+
1
@@ -805,6 +808,11 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/input1.q.xml ql/src/test/results/compiler/plan/input1.q.xml
index 4365afe..44d5d2d 100755
--- ql/src/test/results/compiler/plan/input1.q.xml
+++ ql/src/test/results/compiler/plan/input1.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+
1
@@ -319,7 +324,7 @@
-
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -709,6 +659,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/input2.q.xml ql/src/test/results/compiler/plan/input2.q.xml
index 5b17981..be0263c 100755
--- ql/src/test/results/compiler/plan/input2.q.xml
+++ ql/src/test/results/compiler/plan/input2.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -622,6 +572,9 @@
#### A masked pattern was here ####
+
+
+
1
@@ -1097,6 +1050,9 @@
#### A masked pattern was here ####
+
+
+
1
@@ -1672,6 +1628,9 @@
#### A masked pattern was here ####
+
+
+
true
@@ -1939,6 +1898,9 @@
#### A masked pattern was here ####
+
+
+
true
@@ -2220,6 +2182,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/input20.q.xml ql/src/test/results/compiler/plan/input20.q.xml
index 912e9e3..b6dee85 100644
--- ql/src/test/results/compiler/plan/input20.q.xml
+++ ql/src/test/results/compiler/plan/input20.q.xml
@@ -240,6 +240,9 @@
+
+ -1
+
1
@@ -905,6 +908,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/input3.q.xml ql/src/test/results/compiler/plan/input3.q.xml
index 4f2eafe..4461c96 100755
--- ql/src/test/results/compiler/plan/input3.q.xml
+++ ql/src/test/results/compiler/plan/input3.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -622,6 +572,9 @@
#### A masked pattern was here ####
+
+
+
1
@@ -849,7 +802,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -947,62 +900,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest2
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest2 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -1152,6 +1050,9 @@
#### A masked pattern was here ####
+
+
+
1
@@ -1383,7 +1284,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -1490,62 +1391,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest3
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest3 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -1660,6 +1506,9 @@
#### A masked pattern was here ####
+
+
+
1
@@ -2122,6 +1971,9 @@
#### A masked pattern was here ####
+
+
+
true
@@ -2389,6 +2241,9 @@
#### A masked pattern was here ####
+
+
+
true
@@ -2670,6 +2525,9 @@
#### A masked pattern was here ####
+
+
+
true
@@ -2945,6 +2803,9 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/input4.q.xml ql/src/test/results/compiler/plan/input4.q.xml
index 47fe9ff..4b3e09a 100755
--- ql/src/test/results/compiler/plan/input4.q.xml
+++ ql/src/test/results/compiler/plan/input4.q.xml
@@ -387,6 +387,9 @@
+
+ -1
+
1
@@ -1061,6 +1064,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
true
diff --git ql/src/test/results/compiler/plan/input5.q.xml ql/src/test/results/compiler/plan/input5.q.xml
index 31b599c..e2c0d7a 100644
--- ql/src/test/results/compiler/plan/input5.q.xml
+++ ql/src/test/results/compiler/plan/input5.q.xml
@@ -392,6 +392,9 @@
+
+ -1
+
1
@@ -1127,6 +1130,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
true
diff --git ql/src/test/results/compiler/plan/input6.q.xml ql/src/test/results/compiler/plan/input6.q.xml
index d27978c..f934c3e 100644
--- ql/src/test/results/compiler/plan/input6.q.xml
+++ ql/src/test/results/compiler/plan/input6.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -709,6 +659,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/input7.q.xml ql/src/test/results/compiler/plan/input7.q.xml
index 0889df4..1c6fd1d 100644
--- ql/src/test/results/compiler/plan/input7.q.xml
+++ ql/src/test/results/compiler/plan/input7.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -706,6 +656,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/input8.q.xml ql/src/test/results/compiler/plan/input8.q.xml
index e2c9439..edba6b8 100644
--- ql/src/test/results/compiler/plan/input8.q.xml
+++ ql/src/test/results/compiler/plan/input8.q.xml
@@ -165,6 +165,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/input9.q.xml ql/src/test/results/compiler/plan/input9.q.xml
index c4fcee8..985da9c 100644
--- ql/src/test/results/compiler/plan/input9.q.xml
+++ ql/src/test/results/compiler/plan/input9.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -709,6 +659,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/input_part1.q.xml ql/src/test/results/compiler/plan/input_part1.q.xml
index 95075fe..de6ea09 100644
--- ql/src/test/results/compiler/plan/input_part1.q.xml
+++ ql/src/test/results/compiler/plan/input_part1.q.xml
@@ -189,6 +189,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/input_testsequencefile.q.xml ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
index 9d35abe..6d5f0b7 100644
--- ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
+++ ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -651,6 +656,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/input_testxpath.q.xml ql/src/test/results/compiler/plan/input_testxpath.q.xml
index 37ddde3..779c239 100644
--- ql/src/test/results/compiler/plan/input_testxpath.q.xml
+++ ql/src/test/results/compiler/plan/input_testxpath.q.xml
@@ -173,6 +173,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/input_testxpath2.q.xml ql/src/test/results/compiler/plan/input_testxpath2.q.xml
index 125cbfa..2d0c6ad 100644
--- ql/src/test/results/compiler/plan/input_testxpath2.q.xml
+++ ql/src/test/results/compiler/plan/input_testxpath2.q.xml
@@ -176,6 +176,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/join1.q.xml ql/src/test/results/compiler/plan/join1.q.xml
index 12b01ce..846946d 100644
--- ql/src/test/results/compiler/plan/join1.q.xml
+++ ql/src/test/results/compiler/plan/join1.q.xml
@@ -448,6 +448,9 @@
+
+ -1
+
1
@@ -760,6 +763,9 @@
+
+ -1
+
1
@@ -1107,6 +1113,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
true
diff --git ql/src/test/results/compiler/plan/join2.q.xml ql/src/test/results/compiler/plan/join2.q.xml
index ed5bbb8..d2427e1 100644
--- ql/src/test/results/compiler/plan/join2.q.xml
+++ ql/src/test/results/compiler/plan/join2.q.xml
@@ -415,6 +415,9 @@
+
+ -1
+
1
@@ -677,6 +680,9 @@
+
+ -1
+
1
@@ -1089,6 +1095,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
true
@@ -1732,6 +1743,9 @@
+
+ -1
+
1
@@ -2018,6 +2032,9 @@
+
+ -1
+
1
@@ -2353,6 +2370,9 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/join3.q.xml ql/src/test/results/compiler/plan/join3.q.xml
index 5437afa..6b6ed5f 100644
--- ql/src/test/results/compiler/plan/join3.q.xml
+++ ql/src/test/results/compiler/plan/join3.q.xml
@@ -495,6 +495,9 @@
+
+ -1
+
1
@@ -791,6 +794,9 @@
+
+ -1
+
1
@@ -1099,6 +1105,9 @@
+
+ -1
+
1
@@ -1449,6 +1458,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
true
diff --git ql/src/test/results/compiler/plan/join4.q.xml ql/src/test/results/compiler/plan/join4.q.xml
index aa69ada..32b80c4 100644
--- ql/src/test/results/compiler/plan/join4.q.xml
+++ ql/src/test/results/compiler/plan/join4.q.xml
@@ -301,6 +301,9 @@
+
+ -1
+
1
@@ -853,6 +856,9 @@
+
+ -1
+
1
@@ -1440,6 +1446,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/join5.q.xml ql/src/test/results/compiler/plan/join5.q.xml
index ef0c69d..64db806 100644
--- ql/src/test/results/compiler/plan/join5.q.xml
+++ ql/src/test/results/compiler/plan/join5.q.xml
@@ -301,6 +301,9 @@
+
+ -1
+
1
@@ -853,6 +856,9 @@
+
+ -1
+
1
@@ -1440,6 +1446,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/join6.q.xml ql/src/test/results/compiler/plan/join6.q.xml
index da528f5..b755753 100644
--- ql/src/test/results/compiler/plan/join6.q.xml
+++ ql/src/test/results/compiler/plan/join6.q.xml
@@ -301,6 +301,9 @@
+
+ -1
+
1
@@ -853,6 +856,9 @@
+
+ -1
+
1
@@ -1440,6 +1446,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/join7.q.xml ql/src/test/results/compiler/plan/join7.q.xml
index fcacc6d..b77513e 100644
--- ql/src/test/results/compiler/plan/join7.q.xml
+++ ql/src/test/results/compiler/plan/join7.q.xml
@@ -362,6 +362,9 @@
+
+ -1
+
1
@@ -914,6 +917,9 @@
+
+ -1
+
1
@@ -1457,6 +1463,9 @@
+
+ -1
+
1
@@ -2047,6 +2056,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/join8.q.xml ql/src/test/results/compiler/plan/join8.q.xml
index c7591a4..615e021 100644
--- ql/src/test/results/compiler/plan/join8.q.xml
+++ ql/src/test/results/compiler/plan/join8.q.xml
@@ -301,6 +301,9 @@
+
+ -1
+
1
@@ -894,6 +897,9 @@
+
+ -1
+
1
@@ -1525,6 +1531,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/sample1.q.xml ql/src/test/results/compiler/plan/sample1.q.xml
index 2021f69..381a9cc 100644
--- ql/src/test/results/compiler/plan/sample1.q.xml
+++ ql/src/test/results/compiler/plan/sample1.q.xml
@@ -189,6 +189,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/sample2.q.xml ql/src/test/results/compiler/plan/sample2.q.xml
index c8998f4..f76e75d 100644
--- ql/src/test/results/compiler/plan/sample2.q.xml
+++ ql/src/test/results/compiler/plan/sample2.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -717,6 +667,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/sample3.q.xml ql/src/test/results/compiler/plan/sample3.q.xml
index f12a43b..24bf326 100644
--- ql/src/test/results/compiler/plan/sample3.q.xml
+++ ql/src/test/results/compiler/plan/sample3.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -717,6 +667,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/sample4.q.xml ql/src/test/results/compiler/plan/sample4.q.xml
index c8998f4..f76e75d 100644
--- ql/src/test/results/compiler/plan/sample4.q.xml
+++ ql/src/test/results/compiler/plan/sample4.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -717,6 +667,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/sample5.q.xml ql/src/test/results/compiler/plan/sample5.q.xml
index aaee234..1f14570 100644
--- ql/src/test/results/compiler/plan/sample5.q.xml
+++ ql/src/test/results/compiler/plan/sample5.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -717,6 +667,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/sample6.q.xml ql/src/test/results/compiler/plan/sample6.q.xml
index 3dc8a84..61b32f2 100644
--- ql/src/test/results/compiler/plan/sample6.q.xml
+++ ql/src/test/results/compiler/plan/sample6.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -717,6 +667,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/sample7.q.xml ql/src/test/results/compiler/plan/sample7.q.xml
index 9bfe9a8..f60d933 100644
--- ql/src/test/results/compiler/plan/sample7.q.xml
+++ ql/src/test/results/compiler/plan/sample7.q.xml
@@ -88,6 +88,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -319,7 +324,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -417,62 +422,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- name
- default.dest1
-
-
- columns.types
- string:string
-
-
- serialization.ddl
- struct dest1 { string key, string value}
-
-
- serialization.format
- 1
-
-
- columns
- key,value
-
-
- bucket_count
- -1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- file.inputformat
- org.apache.hadoop.mapred.TextInputFormat
-
-
- file.outputformat
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
- location
- #### A masked pattern was here ####
-
-
- transient_lastDdlTime
- #### A masked pattern was here ####
-
-
-
-
+
@@ -717,6 +667,9 @@
#### A masked pattern was here ####
+
+
+
true
diff --git ql/src/test/results/compiler/plan/subq.q.xml ql/src/test/results/compiler/plan/subq.q.xml
index 38366e6..14b0856 100644
--- ql/src/test/results/compiler/plan/subq.q.xml
+++ ql/src/test/results/compiler/plan/subq.q.xml
@@ -53,6 +53,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -541,6 +546,9 @@
#### A masked pattern was here ####
+
+
+
1
diff --git ql/src/test/results/compiler/plan/udf1.q.xml ql/src/test/results/compiler/plan/udf1.q.xml
index ec0e2e1..7856fae 100644
--- ql/src/test/results/compiler/plan/udf1.q.xml
+++ ql/src/test/results/compiler/plan/udf1.q.xml
@@ -168,6 +168,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/udf4.q.xml ql/src/test/results/compiler/plan/udf4.q.xml
index 207e5b0..ddb667c 100644
--- ql/src/test/results/compiler/plan/udf4.q.xml
+++ ql/src/test/results/compiler/plan/udf4.q.xml
@@ -145,6 +145,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/udf6.q.xml ql/src/test/results/compiler/plan/udf6.q.xml
index cea326e..8ce5b79 100644
--- ql/src/test/results/compiler/plan/udf6.q.xml
+++ ql/src/test/results/compiler/plan/udf6.q.xml
@@ -165,6 +165,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/udf_case.q.xml ql/src/test/results/compiler/plan/udf_case.q.xml
index c155bb0..efaf240 100644
--- ql/src/test/results/compiler/plan/udf_case.q.xml
+++ ql/src/test/results/compiler/plan/udf_case.q.xml
@@ -168,6 +168,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/udf_when.q.xml ql/src/test/results/compiler/plan/udf_when.q.xml
index 0bc4b7f..78ffbfe 100644
--- ql/src/test/results/compiler/plan/udf_when.q.xml
+++ ql/src/test/results/compiler/plan/udf_when.q.xml
@@ -168,6 +168,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
diff --git ql/src/test/results/compiler/plan/union.q.xml ql/src/test/results/compiler/plan/union.q.xml
index 46351be..be378d5 100644
--- ql/src/test/results/compiler/plan/union.q.xml
+++ ql/src/test/results/compiler/plan/union.q.xml
@@ -53,6 +53,11 @@
#### A masked pattern was here ####
+
+
+ NONE
+
+
1
@@ -228,7 +233,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -438,7 +443,7 @@
-
+
org.apache.hadoop.mapred.TextInputFormat
@@ -574,7 +579,7 @@
-
+
@@ -608,6 +613,9 @@
#### A masked pattern was here ####
+
+
+
1
@@ -618,34 +626,7 @@
true
-
-
- org.apache.hadoop.mapred.TextInputFormat
-
-
- org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-
-
-
-
- columns
- _col0,_col1
-
-
- serialization.lib
- org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-
- serialization.format
- 1
-
-
- columns.types
- string:string
-
-
-
-
+
1
@@ -1539,7 +1520,7 @@
-
+