HIVE-17543: Enable PerfCliDriver for HoS (Sahil Takiar, reviewed by Peter Vary) 
(addendum)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9244fdc7
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9244fdc7
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9244fdc7

Branch: refs/heads/master
Commit: 9244fdc7e1035c69ec41f0131f3b41027dabfda0
Parents: c9f5605
Author: Sahil Takiar <takiar.sa...@gmail.com>
Authored: Fri Sep 29 22:40:52 2017 -0700
Committer: Sahil Takiar <stak...@cloudera.com>
Committed: Fri Sep 29 22:40:52 2017 -0700

----------------------------------------------------------------------
 data/conf/perf-reg/hive-site.xml                |  285 ----
 data/conf/perf-reg/tez-site.xml                 |   10 -
 data/conf/perf-reg/tez/hive-site.xml            |  285 ++++
 data/conf/perf-reg/tez/tez-site.xml             |   10 +
 .../results/clientpositive/perf/query1.q.out    |  169 ---
 .../results/clientpositive/perf/query10.q.out   |  288 ----
 .../results/clientpositive/perf/query11.q.out   |  351 -----
 .../results/clientpositive/perf/query12.q.out   |  138 --
 .../results/clientpositive/perf/query13.q.out   |  205 ---
 .../results/clientpositive/perf/query14.q.out   | 1286 ------------------
 .../results/clientpositive/perf/query15.q.out   |  119 --
 .../results/clientpositive/perf/query16.q.out   |  192 ---
 .../results/clientpositive/perf/query17.q.out   |  225 ---
 .../results/clientpositive/perf/query18.q.out   |  194 ---
 .../results/clientpositive/perf/query19.q.out   |  161 ---
 .../results/clientpositive/perf/query2.q.out    |  255 ----
 .../results/clientpositive/perf/query20.q.out   |  130 --
 .../results/clientpositive/perf/query21.q.out   |  139 --
 .../results/clientpositive/perf/query22.q.out   |  121 --
 .../results/clientpositive/perf/query23.q.out   |  556 --------
 .../results/clientpositive/perf/query24.q.out   |  290 ----
 .../results/clientpositive/perf/query25.q.out   |  229 ----
 .../results/clientpositive/perf/query26.q.out   |  132 --
 .../results/clientpositive/perf/query27.q.out   |  140 --
 .../results/clientpositive/perf/query28.q.out   |  256 ----
 .../results/clientpositive/perf/query29.q.out   |  230 ----
 .../results/clientpositive/perf/query3.q.out    |  102 --
 .../results/clientpositive/perf/query30.q.out   |  211 ---
 .../results/clientpositive/perf/query31.q.out   |  358 -----
 .../results/clientpositive/perf/query32.q.out   |  144 --
 .../results/clientpositive/perf/query33.q.out   |  393 ------
 .../results/clientpositive/perf/query34.q.out   |  156 ---
 .../results/clientpositive/perf/query35.q.out   |  284 ----
 .../results/clientpositive/perf/query36.q.out   |  149 --
 .../results/clientpositive/perf/query37.q.out   |  103 --
 .../results/clientpositive/perf/query38.q.out   |  212 ---
 .../results/clientpositive/perf/query39.q.out   |  255 ----
 .../results/clientpositive/perf/query4.q.out    |  500 -------
 .../results/clientpositive/perf/query40.q.out   |  148 --
 .../results/clientpositive/perf/query42.q.out   |  108 --
 .../results/clientpositive/perf/query43.q.out   |  100 --
 .../results/clientpositive/perf/query44.q.out   |  258 ----
 .../results/clientpositive/perf/query45.q.out   |  180 ---
 .../results/clientpositive/perf/query46.q.out   |  191 ---
 .../results/clientpositive/perf/query47.q.out   |  325 -----
 .../results/clientpositive/perf/query48.q.out   |  218 ---
 .../results/clientpositive/perf/query49.q.out   |  496 -------
 .../results/clientpositive/perf/query5.q.out    |  473 -------
 .../results/clientpositive/perf/query50.q.out   |  210 ---
 .../results/clientpositive/perf/query51.q.out   |  188 ---
 .../results/clientpositive/perf/query52.q.out   |  106 --
 .../results/clientpositive/perf/query53.q.out   |  141 --
 .../results/clientpositive/perf/query54.q.out   |  386 ------
 .../results/clientpositive/perf/query55.q.out   |   88 --
 .../results/clientpositive/perf/query56.q.out   |  379 ------
 .../results/clientpositive/perf/query57.q.out   |  319 -----
 .../results/clientpositive/perf/query58.q.out   |  440 ------
 .../results/clientpositive/perf/query59.q.out   |  230 ----
 .../results/clientpositive/perf/query6.q.out    |  226 ---
 .../results/clientpositive/perf/query60.q.out   |  399 ------
 .../results/clientpositive/perf/query61.q.out   |  280 ----
 .../results/clientpositive/perf/query63.q.out   |  143 --
 .../results/clientpositive/perf/query64.q.out   |  772 -----------
 .../results/clientpositive/perf/query65.q.out   |  169 ---
 .../results/clientpositive/perf/query66.q.out   |  612 ---------
 .../results/clientpositive/perf/query67.q.out   |  179 ---
 .../results/clientpositive/perf/query68.q.out   |  205 ---
 .../results/clientpositive/perf/query69.q.out   |  268 ----
 .../results/clientpositive/perf/query7.q.out    |  132 --
 .../results/clientpositive/perf/query70.q.out   |  205 ---
 .../results/clientpositive/perf/query71.q.out   |  208 ---
 .../results/clientpositive/perf/query72.q.out   |  250 ----
 .../results/clientpositive/perf/query73.q.out   |  150 --
 .../results/clientpositive/perf/query74.q.out   |  313 -----
 .../results/clientpositive/perf/query75.q.out   |  481 -------
 .../results/clientpositive/perf/query76.q.out   |  187 ---
 .../results/clientpositive/perf/query77.q.out   |  481 -------
 .../results/clientpositive/perf/query78.q.out   |  292 ----
 .../results/clientpositive/perf/query79.q.out   |  140 --
 .../results/clientpositive/perf/query8.q.out    |  358 -----
 .../results/clientpositive/perf/query80.q.out   |  478 -------
 .../results/clientpositive/perf/query81.q.out   |  214 ---
 .../results/clientpositive/perf/query82.q.out   |  103 --
 .../results/clientpositive/perf/query83.q.out   |  372 -----
 .../results/clientpositive/perf/query84.q.out   |  135 --
 .../results/clientpositive/perf/query85.q.out   |  304 -----
 .../results/clientpositive/perf/query86.q.out   |  126 --
 .../results/clientpositive/perf/query87.q.out   |  239 ----
 .../results/clientpositive/perf/query88.q.out   |  569 --------
 .../results/clientpositive/perf/query89.q.out   |  147 --
 .../results/clientpositive/perf/query9.q.out    |  414 ------
 .../results/clientpositive/perf/query90.q.out   |  170 ---
 .../results/clientpositive/perf/query91.q.out   |  184 ---
 .../results/clientpositive/perf/query92.q.out   |  155 ---
 .../results/clientpositive/perf/query93.q.out   |   98 --
 .../results/clientpositive/perf/query94.q.out   |  188 ---
 .../results/clientpositive/perf/query95.q.out   |  231 ----
 .../results/clientpositive/perf/query96.q.out   |  108 --
 .../results/clientpositive/perf/query97.q.out   |  132 --
 .../results/clientpositive/perf/query98.q.out   |  134 --
 .../results/clientpositive/perf/query99.q.out   |  164 ---
 .../clientpositive/perf/tez/query1.q.out        |  169 +++
 .../clientpositive/perf/tez/query10.q.out       |  288 ++++
 .../clientpositive/perf/tez/query11.q.out       |  351 +++++
 .../clientpositive/perf/tez/query12.q.out       |  138 ++
 .../clientpositive/perf/tez/query13.q.out       |  205 +++
 .../clientpositive/perf/tez/query14.q.out       | 1286 ++++++++++++++++++
 .../clientpositive/perf/tez/query15.q.out       |  119 ++
 .../clientpositive/perf/tez/query16.q.out       |  192 +++
 .../clientpositive/perf/tez/query17.q.out       |  225 +++
 .../clientpositive/perf/tez/query18.q.out       |  194 +++
 .../clientpositive/perf/tez/query19.q.out       |  161 +++
 .../clientpositive/perf/tez/query2.q.out        |  255 ++++
 .../clientpositive/perf/tez/query20.q.out       |  130 ++
 .../clientpositive/perf/tez/query21.q.out       |  139 ++
 .../clientpositive/perf/tez/query22.q.out       |  121 ++
 .../clientpositive/perf/tez/query23.q.out       |  556 ++++++++
 .../clientpositive/perf/tez/query24.q.out       |  290 ++++
 .../clientpositive/perf/tez/query25.q.out       |  229 ++++
 .../clientpositive/perf/tez/query26.q.out       |  132 ++
 .../clientpositive/perf/tez/query27.q.out       |  140 ++
 .../clientpositive/perf/tez/query28.q.out       |  256 ++++
 .../clientpositive/perf/tez/query29.q.out       |  230 ++++
 .../clientpositive/perf/tez/query3.q.out        |  102 ++
 .../clientpositive/perf/tez/query30.q.out       |  211 +++
 .../clientpositive/perf/tez/query31.q.out       |  358 +++++
 .../clientpositive/perf/tez/query32.q.out       |  144 ++
 .../clientpositive/perf/tez/query33.q.out       |  393 ++++++
 .../clientpositive/perf/tez/query34.q.out       |  156 +++
 .../clientpositive/perf/tez/query35.q.out       |  284 ++++
 .../clientpositive/perf/tez/query36.q.out       |  149 ++
 .../clientpositive/perf/tez/query37.q.out       |  103 ++
 .../clientpositive/perf/tez/query38.q.out       |  212 +++
 .../clientpositive/perf/tez/query39.q.out       |  255 ++++
 .../clientpositive/perf/tez/query4.q.out        |  500 +++++++
 .../clientpositive/perf/tez/query40.q.out       |  148 ++
 .../clientpositive/perf/tez/query42.q.out       |  108 ++
 .../clientpositive/perf/tez/query43.q.out       |  100 ++
 .../clientpositive/perf/tez/query44.q.out       |  258 ++++
 .../clientpositive/perf/tez/query45.q.out       |  180 +++
 .../clientpositive/perf/tez/query46.q.out       |  191 +++
 .../clientpositive/perf/tez/query47.q.out       |  325 +++++
 .../clientpositive/perf/tez/query48.q.out       |  218 +++
 .../clientpositive/perf/tez/query49.q.out       |  496 +++++++
 .../clientpositive/perf/tez/query5.q.out        |  473 +++++++
 .../clientpositive/perf/tez/query50.q.out       |  210 +++
 .../clientpositive/perf/tez/query51.q.out       |  188 +++
 .../clientpositive/perf/tez/query52.q.out       |  106 ++
 .../clientpositive/perf/tez/query53.q.out       |  141 ++
 .../clientpositive/perf/tez/query54.q.out       |  386 ++++++
 .../clientpositive/perf/tez/query55.q.out       |   88 ++
 .../clientpositive/perf/tez/query56.q.out       |  379 ++++++
 .../clientpositive/perf/tez/query57.q.out       |  319 +++++
 .../clientpositive/perf/tez/query58.q.out       |  440 ++++++
 .../clientpositive/perf/tez/query59.q.out       |  230 ++++
 .../clientpositive/perf/tez/query6.q.out        |  226 +++
 .../clientpositive/perf/tez/query60.q.out       |  399 ++++++
 .../clientpositive/perf/tez/query61.q.out       |  280 ++++
 .../clientpositive/perf/tez/query63.q.out       |  143 ++
 .../clientpositive/perf/tez/query64.q.out       |  772 +++++++++++
 .../clientpositive/perf/tez/query65.q.out       |  169 +++
 .../clientpositive/perf/tez/query66.q.out       |  612 +++++++++
 .../clientpositive/perf/tez/query67.q.out       |  179 +++
 .../clientpositive/perf/tez/query68.q.out       |  205 +++
 .../clientpositive/perf/tez/query69.q.out       |  268 ++++
 .../clientpositive/perf/tez/query7.q.out        |  132 ++
 .../clientpositive/perf/tez/query70.q.out       |  205 +++
 .../clientpositive/perf/tez/query71.q.out       |  208 +++
 .../clientpositive/perf/tez/query72.q.out       |  250 ++++
 .../clientpositive/perf/tez/query73.q.out       |  150 ++
 .../clientpositive/perf/tez/query74.q.out       |  313 +++++
 .../clientpositive/perf/tez/query75.q.out       |  481 +++++++
 .../clientpositive/perf/tez/query76.q.out       |  187 +++
 .../clientpositive/perf/tez/query77.q.out       |  481 +++++++
 .../clientpositive/perf/tez/query78.q.out       |  292 ++++
 .../clientpositive/perf/tez/query79.q.out       |  140 ++
 .../clientpositive/perf/tez/query8.q.out        |  358 +++++
 .../clientpositive/perf/tez/query80.q.out       |  478 +++++++
 .../clientpositive/perf/tez/query81.q.out       |  214 +++
 .../clientpositive/perf/tez/query82.q.out       |  103 ++
 .../clientpositive/perf/tez/query83.q.out       |  372 +++++
 .../clientpositive/perf/tez/query84.q.out       |  135 ++
 .../clientpositive/perf/tez/query85.q.out       |  304 +++++
 .../clientpositive/perf/tez/query86.q.out       |  126 ++
 .../clientpositive/perf/tez/query87.q.out       |  239 ++++
 .../clientpositive/perf/tez/query88.q.out       |  569 ++++++++
 .../clientpositive/perf/tez/query89.q.out       |  147 ++
 .../clientpositive/perf/tez/query9.q.out        |  414 ++++++
 .../clientpositive/perf/tez/query90.q.out       |  170 +++
 .../clientpositive/perf/tez/query91.q.out       |  184 +++
 .../clientpositive/perf/tez/query92.q.out       |  155 +++
 .../clientpositive/perf/tez/query93.q.out       |   98 ++
 .../clientpositive/perf/tez/query94.q.out       |  188 +++
 .../clientpositive/perf/tez/query95.q.out       |  231 ++++
 .../clientpositive/perf/tez/query96.q.out       |  108 ++
 .../clientpositive/perf/tez/query97.q.out       |  132 ++
 .../clientpositive/perf/tez/query98.q.out       |  134 ++
 .../clientpositive/perf/tez/query99.q.out       |  164 +++
 198 files changed, 25067 insertions(+), 25067 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/9244fdc7/data/conf/perf-reg/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/perf-reg/hive-site.xml b/data/conf/perf-reg/hive-site.xml
deleted file mode 100644
index 012369f..0000000
--- a/data/conf/perf-reg/hive-site.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<configuration>
-
-<property>
-  <name>hive.in.test</name>
-  <value>true</value>
-  <description>Internal marker for test. Used for masking env-dependent 
values</description>
-</property>
-
-<!-- Hive Configuration can either be stored in this file or in the hadoop 
configuration files  -->
-<!-- that are implied by Hadoop setup variables.                               
                 -->
-<!-- Aside from Hadoop setup variables - this file is provided as a 
convenience so that Hive    -->
-<!-- users do not have to edit hadoop configuration files (that may be managed 
as a centralized -->
-<!-- resource).                                                                
                 -->
-
-<!-- Hive Execution Parameters -->
-<property>
-  <name>hadoop.tmp.dir</name>
-  <value>${test.tmp.dir}/hadoop-tmp</value>
-  <description>A base for other temporary directories.</description>
-</property>
-
-<property>
-  <name>hive.tez.container.size</name>
-  <value>128</value>
-  <description></description>
-</property>
-
-<property>
-  <name>hive.merge.tezfiles</name>
-  <value>false</value>
-  <description>Merge small files at the end of a Tez DAG</description>
-</property>
-
-<property>
-  <name>hive.tez.input.format</name>
-  <value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value>
-  <description>The default input format for tez. Tez groups splits in the 
AM.</description>
-</property>
-
-<property>
-  <name>hive.exec.scratchdir</name>
-  <value>${test.tmp.dir}/scratchdir</value>
-  <description>Scratch space for Hive jobs</description>
-</property>
-
-<property>
-  <name>datanucleus.autoCreateSchema</name>
-  <value>true</value>
-</property>
-
-<property>
-  <name>datanucleus.fixedDatastore</name>
-  <value>false</value>
-</property>
-
-<property>
-  <name>hive.metastore.schema.verification</name>
-  <value>false</value>
-</property>
-
-<property>
-  <name>hive.exec.local.scratchdir</name>
-  <value>${test.tmp.dir}/localscratchdir/</value>
-  <description>Local scratch space for Hive jobs</description>
-</property>
-
-<property>
-  <name>javax.jdo.option.ConnectionURL</name>
-  
<value>jdbc:derby:;databaseName=${test.tmp.dir}/junit_metastore_db;create=true</value>
-</property>
-
-<property>
-  <name>javax.jdo.option.ConnectionDriverName</name>
-  <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-</property>
-
-<property>
-  <name>javax.jdo.option.ConnectionUserName</name>
-  <value>APP</value>
-</property>
-
-<property>
-  <name>javax.jdo.option.ConnectionPassword</name>
-  <value>mine</value>
-</property>
-
-<property>
-  <!--  this should eventually be deprecated since the metastore should supply 
this -->
-  <name>hive.metastore.warehouse.dir</name>
-  <value>${test.warehouse.dir}</value>
-  <description></description>
-</property>
-
-<property>
-  <name>hive.metastore.metadb.dir</name>
-  <value>file://${test.tmp.dir}/metadb/</value>
-  <description>
-  Required by metastore server or if the uris argument below is not supplied
-  </description>
-</property>
-
-<property>
-  <name>test.log.dir</name>
-  <value>${test.tmp.dir}/log/</value>
-  <description></description>
-</property>
-
-<property>
-  <name>test.data.files</name>
-  <value>${hive.root}/data/files</value>
-  <description></description>
-</property>
-
-<property>
-  <name>test.data.scripts</name>
-  <value>${hive.root}/data/scripts</value>
-  <description></description>
-</property>
-
-<property>
-  <name>hive.jar.path</name>
-  
<value>${maven.local.repository}/org/apache/hive/hive-exec/${hive.version}/hive-exec-${hive.version}.jar</value>
-  <description></description>
-</property>
-
-<property>
-  <name>hive.metastore.rawstore.impl</name>
-  <value>org.apache.hadoop.hive.metastore.ObjectStore</value>
-  <description>Name of the class that implements 
org.apache.hadoop.hive.metastore.rawstore interface. This class is used to 
store and retrieval of raw metadata objects such as table, 
database</description>
-</property>
-
-<property>
-  <name>hive.querylog.location</name>
-  <value>${test.tmp.dir}/tmp</value>
-  <description>Location of the structured hive logs</description>
-</property>
-
-<property>
-  <name>hive.exec.pre.hooks</name>
-  <value>org.apache.hadoop.hive.ql.hooks.PreExecutePrinter, 
org.apache.hadoop.hive.ql.hooks.EnforceReadOnlyTables</value>
-  <description>Pre Execute Hook for Tests</description>
-</property>
-
-<property>
-  <name>hive.exec.post.hooks</name>
-  <value>org.apache.hadoop.hive.ql.hooks.PostExecutePrinter</value>
-  <description>Post Execute Hook for Tests</description>
-</property>
-
-<property>
-  <name>hive.support.concurrency</name>
-  <value>false</value>
-  <description>Whether hive supports concurrency or not. A zookeeper instance 
must be up and running for the default hive lock manager to support read-write 
locks.</description>
-</property>
-
-<property>
-  <name>fs.pfile.impl</name>
-  <value>org.apache.hadoop.fs.ProxyLocalFileSystem</value>
-  <description>A proxy for local file system used for cross file system 
testing</description>
-</property>
-
-<property>
-  <name>hive.exec.mode.local.auto</name>
-  <value>false</value>
-  <description>
-    Let hive determine whether to run in local mode automatically
-    Disabling this for tests so that minimr is not affected
-  </description>
-</property>
-
-<property>
-  <name>hive.auto.convert.join</name>
-  <value>false</value>
-  <description>Whether Hive enable the optimization about converting common 
join into mapjoin based on the input file size</description>
-</property>
-
-<property>
-  <name>hive.ignore.mapjoin.hint</name>
-  <value>true</value>
-  <description>Whether Hive ignores the mapjoin hint</description>
-</property>
-
-<property>
-  <name>io.sort.mb</name>
-  <value>10</value>
-</property>
-
-<property>
-  <name>hive.input.format</name>
-  <value>org.apache.hadoop.hive.ql.io.CombineHiveInputFormat</value>
-  <description>The default input format, if it is not specified, the system 
assigns it. It is set to HiveInputFormat for hadoop versions 17, 18 and 19, 
whereas it is set to CombineHiveInputFormat for hadoop 20. The user can always 
overwrite it - if there is a bug in CombineHiveInputFormat, it can always be 
manually set to HiveInputFormat. </description>
-</property>
-
-<property>
-  <name>hive.default.rcfile.serde</name>
-  <value>org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe</value>
-  <description>The default SerDe hive will use for the rcfile 
format</description>
-</property>
-
-<property>
-  <name>hive.stats.dbclass</name>
-  <value>fs</value>
-  <description>The default storatge that stores temporary hive statistics. 
Currently, fs type is supported</description>
-</property>
-
-<property>
-  <name>hive.execution.engine</name>
-  <value>tez</value>
-  <description>Whether to use MR or Tez</description>
-</property>
-
-<property>
-  <name>tez.am.node-blacklisting.enabled</name>
-  <value>false</value>
-</property>
-
-<property>
-  <name>hive.prewarm.enabled</name>
-  <value>true</value>
-  <description>
-    Enables container prewarm for tez (hadoop 2 only)
-  </description>
-</property>
-
-<property>
-  <name>hive.prewarm.numcontainers</name>
-  <value>3</value>
-  <description>
-    Controls the number of containers to prewarm for tez (hadoop 2 only)
-  </description>
-</property>
-
-<property>
-  <name>hive.in.tez.test</name>
-  <value>true</value>
-  <description>
-    Indicates that we are in tez testing mode.
-  </description>
-</property>
-
-<property>
-  <name>hive.tez.java.opts</name>
-  <value> -Dlog4j.configurationFile=tez-container-log4j2.properties 
-Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
-</property>
-
-<property>
-  <name>tez.am.launch.cmd-opts</name>
-  <value> -Dlog4j.configurationFile=tez-container-log4j2.properties 
-Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
-</property>
-
-<property>
-  <name>hive.metastore.rawstore.impl</name>
-  <value>org.apache.hadoop.hive.metastore.ObjectStore</value>
-</property>
-
-<property>
-  <name>hive.orc.splits.ms.footer.cache.enabled</name>
-  <value>true</value>
-</property>
-
-<property>
-  <name>hive.optimize.filter.stats.reduction</name>
-  <value>true</value>
-</property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/9244fdc7/data/conf/perf-reg/tez-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/perf-reg/tez-site.xml b/data/conf/perf-reg/tez-site.xml
deleted file mode 100644
index c575544..0000000
--- a/data/conf/perf-reg/tez-site.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<configuration>
-  <property>
-    <name>tez.am.resource.memory.mb</name>
-    <value>128</value>
-  </property>
-  <property>
-    <name>tez.am.dag.scheduler.class</name>
-    
<value>org.apache.tez.dag.app.dag.impl.DAGSchedulerNaturalOrderControlled</value>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/9244fdc7/data/conf/perf-reg/tez/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/perf-reg/tez/hive-site.xml 
b/data/conf/perf-reg/tez/hive-site.xml
new file mode 100644
index 0000000..012369f
--- /dev/null
+++ b/data/conf/perf-reg/tez/hive-site.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<configuration>
+
+<property>
+  <name>hive.in.test</name>
+  <value>true</value>
+  <description>Internal marker for test. Used for masking env-dependent 
values</description>
+</property>
+
+<!-- Hive Configuration can either be stored in this file or in the hadoop 
configuration files  -->
+<!-- that are implied by Hadoop setup variables.                               
                 -->
+<!-- Aside from Hadoop setup variables - this file is provided as a 
convenience so that Hive    -->
+<!-- users do not have to edit hadoop configuration files (that may be managed 
as a centralized -->
+<!-- resource).                                                                
                 -->
+
+<!-- Hive Execution Parameters -->
+<property>
+  <name>hadoop.tmp.dir</name>
+  <value>${test.tmp.dir}/hadoop-tmp</value>
+  <description>A base for other temporary directories.</description>
+</property>
+
+<property>
+  <name>hive.tez.container.size</name>
+  <value>128</value>
+  <description></description>
+</property>
+
+<property>
+  <name>hive.merge.tezfiles</name>
+  <value>false</value>
+  <description>Merge small files at the end of a Tez DAG</description>
+</property>
+
+<property>
+  <name>hive.tez.input.format</name>
+  <value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value>
+  <description>The default input format for tez. Tez groups splits in the 
AM.</description>
+</property>
+
+<property>
+  <name>hive.exec.scratchdir</name>
+  <value>${test.tmp.dir}/scratchdir</value>
+  <description>Scratch space for Hive jobs</description>
+</property>
+
+<property>
+  <name>datanucleus.autoCreateSchema</name>
+  <value>true</value>
+</property>
+
+<property>
+  <name>datanucleus.fixedDatastore</name>
+  <value>false</value>
+</property>
+
+<property>
+  <name>hive.metastore.schema.verification</name>
+  <value>false</value>
+</property>
+
+<property>
+  <name>hive.exec.local.scratchdir</name>
+  <value>${test.tmp.dir}/localscratchdir/</value>
+  <description>Local scratch space for Hive jobs</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionURL</name>
+  
<value>jdbc:derby:;databaseName=${test.tmp.dir}/junit_metastore_db;create=true</value>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionDriverName</name>
+  <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionUserName</name>
+  <value>APP</value>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionPassword</name>
+  <value>mine</value>
+</property>
+
+<property>
+  <!--  this should eventually be deprecated since the metastore should supply 
this -->
+  <name>hive.metastore.warehouse.dir</name>
+  <value>${test.warehouse.dir}</value>
+  <description></description>
+</property>
+
+<property>
+  <name>hive.metastore.metadb.dir</name>
+  <value>file://${test.tmp.dir}/metadb/</value>
+  <description>
+  Required by metastore server or if the uris argument below is not supplied
+  </description>
+</property>
+
+<property>
+  <name>test.log.dir</name>
+  <value>${test.tmp.dir}/log/</value>
+  <description></description>
+</property>
+
+<property>
+  <name>test.data.files</name>
+  <value>${hive.root}/data/files</value>
+  <description></description>
+</property>
+
+<property>
+  <name>test.data.scripts</name>
+  <value>${hive.root}/data/scripts</value>
+  <description></description>
+</property>
+
+<property>
+  <name>hive.jar.path</name>
+  
<value>${maven.local.repository}/org/apache/hive/hive-exec/${hive.version}/hive-exec-${hive.version}.jar</value>
+  <description></description>
+</property>
+
+<property>
+  <name>hive.metastore.rawstore.impl</name>
+  <value>org.apache.hadoop.hive.metastore.ObjectStore</value>
+  <description>Name of the class that implements 
org.apache.hadoop.hive.metastore.rawstore interface. This class is used to 
store and retrieval of raw metadata objects such as table, 
database</description>
+</property>
+
+<property>
+  <name>hive.querylog.location</name>
+  <value>${test.tmp.dir}/tmp</value>
+  <description>Location of the structured hive logs</description>
+</property>
+
+<property>
+  <name>hive.exec.pre.hooks</name>
+  <value>org.apache.hadoop.hive.ql.hooks.PreExecutePrinter, 
org.apache.hadoop.hive.ql.hooks.EnforceReadOnlyTables</value>
+  <description>Pre Execute Hook for Tests</description>
+</property>
+
+<property>
+  <name>hive.exec.post.hooks</name>
+  <value>org.apache.hadoop.hive.ql.hooks.PostExecutePrinter</value>
+  <description>Post Execute Hook for Tests</description>
+</property>
+
+<property>
+  <name>hive.support.concurrency</name>
+  <value>false</value>
+  <description>Whether hive supports concurrency or not. A zookeeper instance 
must be up and running for the default hive lock manager to support read-write 
locks.</description>
+</property>
+
+<property>
+  <name>fs.pfile.impl</name>
+  <value>org.apache.hadoop.fs.ProxyLocalFileSystem</value>
+  <description>A proxy for local file system used for cross file system 
testing</description>
+</property>
+
+<property>
+  <name>hive.exec.mode.local.auto</name>
+  <value>false</value>
+  <description>
+    Let hive determine whether to run in local mode automatically
+    Disabling this for tests so that minimr is not affected
+  </description>
+</property>
+
+<property>
+  <name>hive.auto.convert.join</name>
+  <value>false</value>
+  <description>Whether Hive enable the optimization about converting common 
join into mapjoin based on the input file size</description>
+</property>
+
+<property>
+  <name>hive.ignore.mapjoin.hint</name>
+  <value>true</value>
+  <description>Whether Hive ignores the mapjoin hint</description>
+</property>
+
+<property>
+  <name>io.sort.mb</name>
+  <value>10</value>
+</property>
+
+<property>
+  <name>hive.input.format</name>
+  <value>org.apache.hadoop.hive.ql.io.CombineHiveInputFormat</value>
+  <description>The default input format, if it is not specified, the system 
assigns it. It is set to HiveInputFormat for hadoop versions 17, 18 and 19, 
whereas it is set to CombineHiveInputFormat for hadoop 20. The user can always 
overwrite it - if there is a bug in CombineHiveInputFormat, it can always be 
manually set to HiveInputFormat. </description>
+</property>
+
+<property>
+  <name>hive.default.rcfile.serde</name>
+  <value>org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe</value>
+  <description>The default SerDe hive will use for the rcfile 
format</description>
+</property>
+
+<property>
+  <name>hive.stats.dbclass</name>
+  <value>fs</value>
+  <description>The default storatge that stores temporary hive statistics. 
Currently, fs type is supported</description>
+</property>
+
+<property>
+  <name>hive.execution.engine</name>
+  <value>tez</value>
+  <description>Whether to use MR or Tez</description>
+</property>
+
+<property>
+  <name>tez.am.node-blacklisting.enabled</name>
+  <value>false</value>
+</property>
+
+<property>
+  <name>hive.prewarm.enabled</name>
+  <value>true</value>
+  <description>
+    Enables container prewarm for tez (hadoop 2 only)
+  </description>
+</property>
+
+<property>
+  <name>hive.prewarm.numcontainers</name>
+  <value>3</value>
+  <description>
+    Controls the number of containers to prewarm for tez (hadoop 2 only)
+  </description>
+</property>
+
+<property>
+  <name>hive.in.tez.test</name>
+  <value>true</value>
+  <description>
+    Indicates that we are in tez testing mode.
+  </description>
+</property>
+
+<property>
+  <name>hive.tez.java.opts</name>
+  <value> -Dlog4j.configurationFile=tez-container-log4j2.properties 
-Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
+</property>
+
+<property>
+  <name>tez.am.launch.cmd-opts</name>
+  <value> -Dlog4j.configurationFile=tez-container-log4j2.properties 
-Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
+</property>
+
+<property>
+  <name>hive.metastore.rawstore.impl</name>
+  <value>org.apache.hadoop.hive.metastore.ObjectStore</value>
+</property>
+
+<property>
+  <name>hive.orc.splits.ms.footer.cache.enabled</name>
+  <value>true</value>
+</property>
+
+<property>
+  <name>hive.optimize.filter.stats.reduction</name>
+  <value>true</value>
+</property>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/9244fdc7/data/conf/perf-reg/tez/tez-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/perf-reg/tez/tez-site.xml 
b/data/conf/perf-reg/tez/tez-site.xml
new file mode 100644
index 0000000..c575544
--- /dev/null
+++ b/data/conf/perf-reg/tez/tez-site.xml
@@ -0,0 +1,10 @@
+<configuration>
+  <property>
+    <name>tez.am.resource.memory.mb</name>
+    <value>128</value>
+  </property>
+  <property>
+    <name>tez.am.dag.scheduler.class</name>
+    
<value>org.apache.tez.dag.app.dag.impl.DAGSchedulerNaturalOrderControlled</value>
+  </property>
+</configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/9244fdc7/ql/src/test/results/clientpositive/perf/query1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query1.q.out 
b/ql/src/test/results/clientpositive/perf/query1.q.out
deleted file mode 100644
index ad350c1..0000000
--- a/ql/src/test/results/clientpositive/perf/query1.q.out
+++ /dev/null
@@ -1,169 +0,0 @@
-PREHOOK: query: explain
-with customer_total_return as
-(select sr_customer_sk as ctr_customer_sk
-,sr_store_sk as ctr_store_sk
-,sum(SR_FEE) as ctr_total_return
-from store_returns
-,date_dim
-where sr_returned_date_sk = d_date_sk
-and d_year =2000
-group by sr_customer_sk
-,sr_store_sk)
- select  c_customer_id
-from customer_total_return ctr1
-,store
-,customer
-where ctr1.ctr_total_return > (select avg(ctr_total_return)*1.2
-from customer_total_return ctr2
-where ctr1.ctr_store_sk = ctr2.ctr_store_sk)
-and s_store_sk = ctr1.ctr_store_sk
-and s_state = 'NM'
-and ctr1.ctr_customer_sk = c_customer_sk
-order by c_customer_id
-limit 100
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-with customer_total_return as
-(select sr_customer_sk as ctr_customer_sk
-,sr_store_sk as ctr_store_sk
-,sum(SR_FEE) as ctr_total_return
-from store_returns
-,date_dim
-where sr_returned_date_sk = d_date_sk
-and d_year =2000
-group by sr_customer_sk
-,sr_store_sk)
- select  c_customer_id
-from customer_total_return ctr1
-,store
-,customer
-where ctr1.ctr_total_return > (select avg(ctr_total_return)*1.2
-from customer_total_return ctr2
-where ctr1.ctr_store_sk = ctr2.ctr_store_sk)
-and s_store_sk = ctr1.ctr_store_sk
-and s_state = 'NM'
-and ctr1.ctr_customer_sk = c_customer_sk
-order by c_customer_id
-limit 100
-POSTHOOK: type: QUERY
-Plan optimized by CBO.
-
-Vertex dependency in root stage
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 10 (SIMPLE_EDGE)
-Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 11 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Map 12 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Reducer 5 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE)
-Reducer 7 <- Reducer 6 (SIMPLE_EDGE)
-Reducer 8 <- Map 1 (SIMPLE_EDGE), Map 10 (SIMPLE_EDGE)
-Reducer 9 <- Reducer 8 (SIMPLE_EDGE)
-
-Stage-0
-  Fetch Operator
-    limit:100
-    Stage-1
-      Reducer 7
-      File Output Operator [FS_53]
-        Limit [LIM_52] (rows=100 width=860)
-          Number of rows:100
-          Select Operator [SEL_51] (rows=32266667 width=860)
-            Output:["_col0"]
-          <-Reducer 6 [SIMPLE_EDGE]
-            SHUFFLE [RS_50]
-              Select Operator [SEL_49] (rows=32266667 width=860)
-                Output:["_col0"]
-                Filter Operator [FIL_48] (rows=32266667 width=860)
-                  predicate:(_col2 > CASE WHEN (_col8 is null) THEN (null) 
ELSE (_col7) END)
-                  Merge Join Operator [MERGEJOIN_81] (rows=96800003 width=860)
-                    
Conds:RS_45._col1=RS_46._col2(Inner),Output:["_col2","_col6","_col7","_col8"]
-                  <-Reducer 5 [SIMPLE_EDGE]
-                    SHUFFLE [RS_45]
-                      PartitionCols:_col1
-                      Merge Join Operator [MERGEJOIN_79] (rows=88000001 
width=860)
-                        
Conds:RS_42._col0=RS_43._col0(Inner),Output:["_col1","_col2","_col6"]
-                      <-Map 12 [SIMPLE_EDGE]
-                        SHUFFLE [RS_43]
-                          PartitionCols:_col0
-                          Select Operator [SEL_19] (rows=80000000 width=860)
-                            Output:["_col0","_col1"]
-                            Filter Operator [FIL_74] (rows=80000000 width=860)
-                              predicate:c_customer_sk is not null
-                              TableScan [TS_17] (rows=80000000 width=860)
-                                
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_customer_id"]
-                      <-Reducer 4 [SIMPLE_EDGE]
-                        SHUFFLE [RS_42]
-                          PartitionCols:_col0
-                          Merge Join Operator [MERGEJOIN_78] (rows=34842647 
width=77)
-                            
Conds:RS_39._col1=RS_40._col0(Inner),Output:["_col0","_col1","_col2"]
-                          <-Map 11 [SIMPLE_EDGE]
-                            SHUFFLE [RS_40]
-                              PartitionCols:_col0
-                              Select Operator [SEL_16] (rows=852 width=1910)
-                                Output:["_col0"]
-                                Filter Operator [FIL_73] (rows=852 width=1910)
-                                  predicate:((s_state = 'NM') and s_store_sk 
is not null)
-                                  TableScan [TS_14] (rows=1704 width=1910)
-                                    
default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_state"]
-                          <-Reducer 3 [SIMPLE_EDGE]
-                            SHUFFLE [RS_39]
-                              PartitionCols:_col1
-                              Select Operator [SEL_13] (rows=31675133 width=77)
-                                Output:["_col0","_col1","_col2"]
-                                Group By Operator [GBY_12] (rows=31675133 
width=77)
-                                  
Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1
-                                <-Reducer 2 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_11]
-                                    PartitionCols:_col0, _col1
-                                    Group By Operator [GBY_10] (rows=63350266 
width=77)
-                                      
Output:["_col0","_col1","_col2"],aggregations:["sum(_col3)"],keys:_col2, _col1
-                                      Merge Join Operator [MERGEJOIN_77] 
(rows=63350266 width=77)
-                                        
Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col1","_col2","_col3"]
-                                      <-Map 1 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_6]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_2] 
(rows=57591150 width=77)
-                                            
Output:["_col0","_col1","_col2","_col3"]
-                                            Filter Operator [FIL_71] 
(rows=57591150 width=77)
-                                              predicate:(sr_customer_sk is not 
null and sr_returned_date_sk is not null and sr_store_sk is not null)
-                                              TableScan [TS_0] (rows=57591150 
width=77)
-                                                
default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_customer_sk","sr_store_sk","sr_fee"]
-                                      <-Map 10 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_7]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_5] (rows=36524 
width=1119)
-                                            Output:["_col0"]
-                                            Filter Operator [FIL_72] 
(rows=36524 width=1119)
-                                              predicate:((d_year = 2000) and 
d_date_sk is not null)
-                                              TableScan [TS_3] (rows=73049 
width=1119)
-                                                
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
-                  <-Reducer 9 [SIMPLE_EDGE]
-                    SHUFFLE [RS_46]
-                      PartitionCols:_col2
-                      Select Operator [SEL_38] (rows=15837566 width=77)
-                        Output:["_col0","_col1","_col2"]
-                        Group By Operator [GBY_37] (rows=15837566 width=77)
-                          
Output:["_col0","_col1"],aggregations:["avg(_col2)"],keys:_col1
-                          Select Operator [SEL_33] (rows=31675133 width=77)
-                            Output:["_col1","_col2"]
-                            Group By Operator [GBY_32] (rows=31675133 width=77)
-                              
Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1
-                            <-Reducer 8 [SIMPLE_EDGE]
-                              SHUFFLE [RS_31]
-                                PartitionCols:_col0
-                                Group By Operator [GBY_30] (rows=63350266 
width=77)
-                                  
Output:["_col0","_col1","_col2"],aggregations:["sum(_col3)"],keys:_col2, _col1
-                                  Merge Join Operator [MERGEJOIN_80] 
(rows=63350266 width=77)
-                                    
Conds:RS_26._col0=RS_27._col0(Inner),Output:["_col1","_col2","_col3"]
-                                  <-Map 1 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_26]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_22] (rows=57591150 
width=77)
-                                        
Output:["_col0","_col1","_col2","_col3"]
-                                        Filter Operator [FIL_75] 
(rows=57591150 width=77)
-                                          predicate:(sr_returned_date_sk is 
not null and sr_store_sk is not null)
-                                           Please refer to the previous 
TableScan [TS_0]
-                                  <-Map 10 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_27]
-                                      PartitionCols:_col0
-                                       Please refer to the previous Select 
Operator [SEL_5]
-

http://git-wip-us.apache.org/repos/asf/hive/blob/9244fdc7/ql/src/test/results/clientpositive/perf/query10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query10.q.out 
b/ql/src/test/results/clientpositive/perf/query10.q.out
deleted file mode 100644
index cf3651b..0000000
--- a/ql/src/test/results/clientpositive/perf/query10.q.out
+++ /dev/null
@@ -1,288 +0,0 @@
-PREHOOK: query: explain
-select  
-  cd_gender,
-  cd_marital_status,
-  cd_education_status,
-  count(*) cnt1,
-  cd_purchase_estimate,
-  count(*) cnt2,
-  cd_credit_rating,
-  count(*) cnt3,
-  cd_dep_count,
-  count(*) cnt4,
-  cd_dep_employed_count,
-  count(*) cnt5,
-  cd_dep_college_count,
-  count(*) cnt6
- from
-  customer c,customer_address ca,customer_demographics
- where
-  c.c_current_addr_sk = ca.ca_address_sk and
-  ca_county in ('Walker County','Richland County','Gaines County','Douglas 
County','Dona Ana County') and
-  cd_demo_sk = c.c_current_cdemo_sk and 
-  exists (select *
-          from store_sales,date_dim
-          where c.c_customer_sk = ss_customer_sk and
-                ss_sold_date_sk = d_date_sk and
-                d_year = 2002 and
-                d_moy between 4 and 4+3) and
-   (exists (select *
-            from web_sales,date_dim
-            where c.c_customer_sk = ws_bill_customer_sk and
-                  ws_sold_date_sk = d_date_sk and
-                  d_year = 2002 and
-                  d_moy between 4 ANd 4+3) or 
-    exists (select * 
-            from catalog_sales,date_dim
-            where c.c_customer_sk = cs_ship_customer_sk and
-                  cs_sold_date_sk = d_date_sk and
-                  d_year = 2002 and
-                  d_moy between 4 and 4+3))
- group by cd_gender,
-          cd_marital_status,
-          cd_education_status,
-          cd_purchase_estimate,
-          cd_credit_rating,
-          cd_dep_count,
-          cd_dep_employed_count,
-          cd_dep_college_count
- order by cd_gender,
-          cd_marital_status,
-          cd_education_status,
-          cd_purchase_estimate,
-          cd_credit_rating,
-          cd_dep_count,
-          cd_dep_employed_count,
-          cd_dep_college_count
-limit 100
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-select  
-  cd_gender,
-  cd_marital_status,
-  cd_education_status,
-  count(*) cnt1,
-  cd_purchase_estimate,
-  count(*) cnt2,
-  cd_credit_rating,
-  count(*) cnt3,
-  cd_dep_count,
-  count(*) cnt4,
-  cd_dep_employed_count,
-  count(*) cnt5,
-  cd_dep_college_count,
-  count(*) cnt6
- from
-  customer c,customer_address ca,customer_demographics
- where
-  c.c_current_addr_sk = ca.ca_address_sk and
-  ca_county in ('Walker County','Richland County','Gaines County','Douglas 
County','Dona Ana County') and
-  cd_demo_sk = c.c_current_cdemo_sk and 
-  exists (select *
-          from store_sales,date_dim
-          where c.c_customer_sk = ss_customer_sk and
-                ss_sold_date_sk = d_date_sk and
-                d_year = 2002 and
-                d_moy between 4 and 4+3) and
-   (exists (select *
-            from web_sales,date_dim
-            where c.c_customer_sk = ws_bill_customer_sk and
-                  ws_sold_date_sk = d_date_sk and
-                  d_year = 2002 and
-                  d_moy between 4 ANd 4+3) or 
-    exists (select * 
-            from catalog_sales,date_dim
-            where c.c_customer_sk = cs_ship_customer_sk and
-                  cs_sold_date_sk = d_date_sk and
-                  d_year = 2002 and
-                  d_moy between 4 and 4+3))
- group by cd_gender,
-          cd_marital_status,
-          cd_education_status,
-          cd_purchase_estimate,
-          cd_credit_rating,
-          cd_dep_count,
-          cd_dep_employed_count,
-          cd_dep_college_count
- order by cd_gender,
-          cd_marital_status,
-          cd_education_status,
-          cd_purchase_estimate,
-          cd_credit_rating,
-          cd_dep_count,
-          cd_dep_employed_count,
-          cd_dep_college_count
-limit 100
-POSTHOOK: type: QUERY
-Plan optimized by CBO.
-
-Vertex dependency in root stage
-Reducer 11 <- Map 10 (SIMPLE_EDGE), Map 16 (SIMPLE_EDGE)
-Reducer 12 <- Reducer 11 (SIMPLE_EDGE)
-Reducer 14 <- Map 13 (SIMPLE_EDGE), Map 16 (SIMPLE_EDGE)
-Reducer 15 <- Reducer 14 (SIMPLE_EDGE)
-Reducer 17 <- Map 16 (SIMPLE_EDGE), Map 19 (SIMPLE_EDGE)
-Reducer 18 <- Reducer 17 (SIMPLE_EDGE)
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
-Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Reducer 12 (ONE_TO_ONE_EDGE), Reducer 15 (ONE_TO_ONE_EDGE), 
Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Reducer 18 (ONE_TO_ONE_EDGE), Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Reducer 6 (SIMPLE_EDGE)
-
-Stage-0
-  Fetch Operator
-    limit:100
-    Stage-1
-      Reducer 7
-      File Output Operator [FS_74]
-        Limit [LIM_73] (rows=100 width=88)
-          Number of rows:100
-          Select Operator [SEL_72] (rows=383325119 width=88)
-            
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"]
-          <-Reducer 6 [SIMPLE_EDGE]
-            SHUFFLE [RS_71]
-              Select Operator [SEL_70] (rows=383325119 width=88)
-                
Output:["_col0","_col1","_col2","_col3","_col4","_col6","_col8","_col10","_col12"]
-                Group By Operator [GBY_69] (rows=383325119 width=88)
-                  
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"],aggregations:["count(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7
-                <-Reducer 5 [SIMPLE_EDGE]
-                  SHUFFLE [RS_68]
-                    PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
-                    Group By Operator [GBY_67] (rows=766650239 width=88)
-                      
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"],aggregations:["count()"],keys:_col6,
 _col7, _col8, _col9, _col10, _col11, _col12, _col13
-                      Select Operator [SEL_66] (rows=766650239 width=88)
-                        
Output:["_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"]
-                        Filter Operator [FIL_65] (rows=766650239 width=88)
-                          predicate:(_col16 is not null or _col18 is not null)
-                          Merge Join Operator [MERGEJOIN_112] (rows=766650239 
width=88)
-                            Conds:RS_62._col0=RS_63._col0(Left 
Outer),Output:["_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col16","_col18"]
-                          <-Reducer 18 [ONE_TO_ONE_EDGE]
-                            FORWARD [RS_63]
-                              PartitionCols:_col0
-                              Select Operator [SEL_61] (rows=158394413 
width=135)
-                                Output:["_col0","_col1"]
-                                Group By Operator [GBY_60] (rows=158394413 
width=135)
-                                  Output:["_col0"],keys:KEY._col0
-                                <-Reducer 17 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_59]
-                                    PartitionCols:_col0
-                                    Group By Operator [GBY_58] (rows=316788826 
width=135)
-                                      Output:["_col0"],keys:_col1
-                                      Merge Join Operator [MERGEJOIN_110] 
(rows=316788826 width=135)
-                                        
Conds:RS_54._col0=RS_55._col0(Inner),Output:["_col1"]
-                                      <-Map 16 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_55]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_28] (rows=4058 
width=1119)
-                                            Output:["_col0"]
-                                            Filter Operator [FIL_103] 
(rows=4058 width=1119)
-                                              predicate:((d_year = 2002) and 
d_date_sk is not null and d_moy BETWEEN 4 AND 7)
-                                              TableScan [TS_26] (rows=73049 
width=1119)
-                                                
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                      <-Map 19 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_54]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_50] 
(rows=287989836 width=135)
-                                            Output:["_col0","_col1"]
-                                            Filter Operator [FIL_104] 
(rows=287989836 width=135)
-                                              predicate:(cs_ship_customer_sk 
is not null and cs_sold_date_sk is not null)
-                                              TableScan [TS_48] 
(rows=287989836 width=135)
-                                                
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_ship_customer_sk"]
-                          <-Reducer 4 [SIMPLE_EDGE]
-                            SHUFFLE [RS_62]
-                              PartitionCols:_col0
-                              Select Operator [SEL_47] (rows=696954748 
width=88)
-                                
Output:["_col0","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col16"]
-                                Merge Join Operator [MERGEJOIN_111] 
(rows=696954748 width=88)
-                                  Conds:RS_43._col0=RS_44._col0(Left 
Outer),RS_43._col0=RS_45._col0(Inner),Output:["_col0","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col15"]
-                                <-Reducer 12 [ONE_TO_ONE_EDGE]
-                                  FORWARD [RS_44]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_22] (rows=79201469 
width=135)
-                                      Output:["_col0","_col1"]
-                                      Group By Operator [GBY_21] 
(rows=79201469 width=135)
-                                        Output:["_col0"],keys:KEY._col0
-                                      <-Reducer 11 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_20]
-                                          PartitionCols:_col0
-                                          Group By Operator [GBY_19] 
(rows=158402938 width=135)
-                                            Output:["_col0"],keys:_col1
-                                            Merge Join Operator 
[MERGEJOIN_108] (rows=158402938 width=135)
-                                              
Conds:RS_15._col0=RS_16._col0(Inner),Output:["_col1"]
-                                            <-Map 16 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_16]
-                                                PartitionCols:_col0
-                                                 Please refer to the previous 
Select Operator [SEL_28]
-                                            <-Map 10 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_15]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_11] 
(rows=144002668 width=135)
-                                                  Output:["_col0","_col1"]
-                                                  Filter Operator [FIL_100] 
(rows=144002668 width=135)
-                                                    
predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null)
-                                                    TableScan [TS_9] 
(rows=144002668 width=135)
-                                                      
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_customer_sk"]
-                                <-Reducer 15 [ONE_TO_ONE_EDGE]
-                                  FORWARD [RS_45]
-                                    PartitionCols:_col0
-                                    Group By Operator [GBY_35] (rows=316797606 
width=88)
-                                      Output:["_col0"],keys:KEY._col0
-                                    <-Reducer 14 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_34]
-                                        PartitionCols:_col0
-                                        Group By Operator [GBY_33] 
(rows=633595212 width=88)
-                                          Output:["_col0"],keys:_col1
-                                          Merge Join Operator [MERGEJOIN_109] 
(rows=633595212 width=88)
-                                            
Conds:RS_29._col0=RS_30._col0(Inner),Output:["_col1"]
-                                          <-Map 16 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_30]
-                                              PartitionCols:_col0
-                                               Please refer to the previous 
Select Operator [SEL_28]
-                                          <-Map 13 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_29]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_25] 
(rows=575995635 width=88)
-                                                Output:["_col0","_col1"]
-                                                Filter Operator [FIL_102] 
(rows=575995635 width=88)
-                                                  predicate:(ss_customer_sk is 
not null and ss_sold_date_sk is not null)
-                                                  TableScan [TS_23] 
(rows=575995635 width=88)
-                                                    
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_customer_sk"]
-                                <-Reducer 3 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_43]
-                                    PartitionCols:_col0
-                                    Merge Join Operator [MERGEJOIN_107] 
(rows=96800003 width=860)
-                                      
Conds:RS_40._col1=RS_41._col0(Inner),Output:["_col0","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"]
-                                    <-Map 9 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_41]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_8] (rows=1861800 
width=385)
-                                          
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
-                                          Filter Operator [FIL_99] 
(rows=1861800 width=385)
-                                            predicate:cd_demo_sk is not null
-                                            TableScan [TS_6] (rows=1861800 
width=385)
-                                              
default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status","cd_purchase_estimate","cd_credit_rating","cd_dep_count","cd_dep_employed_count","cd_dep_college_count"]
-                                    <-Reducer 2 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_40]
-                                        PartitionCols:_col1
-                                        Merge Join Operator [MERGEJOIN_106] 
(rows=88000001 width=860)
-                                          
Conds:RS_37._col2=RS_38._col0(Inner),Output:["_col0","_col1"]
-                                        <-Map 1 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_37]
-                                            PartitionCols:_col2
-                                            Select Operator [SEL_2] 
(rows=80000000 width=860)
-                                              Output:["_col0","_col1","_col2"]
-                                              Filter Operator [FIL_97] 
(rows=80000000 width=860)
-                                                predicate:(c_current_addr_sk 
is not null and c_current_cdemo_sk is not null)
-                                                TableScan [TS_0] 
(rows=80000000 width=860)
-                                                  
default@customer,c,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk"]
-                                        <-Map 8 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_38]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_5] 
(rows=20000000 width=1014)
-                                              Output:["_col0"]
-                                              Filter Operator [FIL_98] 
(rows=20000000 width=1014)
-                                                predicate:((ca_county) IN 
('Walker County', 'Richland County', 'Gaines County', 'Douglas County', 'Dona 
Ana County') and ca_address_sk is not null)
-                                                TableScan [TS_3] 
(rows=40000000 width=1014)
-                                                  
default@customer_address,ca,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-

http://git-wip-us.apache.org/repos/asf/hive/blob/9244fdc7/ql/src/test/results/clientpositive/perf/query11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query11.q.out 
b/ql/src/test/results/clientpositive/perf/query11.q.out
deleted file mode 100644
index 69ced26..0000000
--- a/ql/src/test/results/clientpositive/perf/query11.q.out
+++ /dev/null
@@ -1,351 +0,0 @@
-PREHOOK: query: explain
-with year_total as (
- select c_customer_id customer_id
-       ,c_first_name customer_first_name
-       ,c_last_name customer_last_name
-       ,c_preferred_cust_flag
-       ,c_birth_country customer_birth_country
-       ,c_login customer_login
-       ,c_email_address customer_email_address
-       ,d_year dyear
-       ,sum(ss_ext_list_price-ss_ext_discount_amt) year_total
-       ,'s' sale_type
- from customer
-     ,store_sales
-     ,date_dim
- where c_customer_sk = ss_customer_sk
-   and ss_sold_date_sk = d_date_sk
- group by c_customer_id
-         ,c_first_name
-         ,c_last_name
-         ,d_year
-         ,c_preferred_cust_flag
-         ,c_birth_country
-         ,c_login
-         ,c_email_address
-         ,d_year 
- union all
- select c_customer_id customer_id
-       ,c_first_name customer_first_name
-       ,c_last_name customer_last_name
-       ,c_preferred_cust_flag
-       ,c_birth_country customer_birth_country
-       ,c_login customer_login
-       ,c_email_address customer_email_address
-       ,d_year dyear
-       ,sum(ws_ext_list_price-ws_ext_discount_amt) year_total
-       ,'w' sale_type
- from customer
-     ,web_sales
-     ,date_dim
- where c_customer_sk = ws_bill_customer_sk
-   and ws_sold_date_sk = d_date_sk
- group by c_customer_id
-         ,c_first_name
-         ,c_last_name
-         ,c_preferred_cust_flag
-         ,c_birth_country
-         ,c_login
-         ,c_email_address
-         ,d_year
-         )
-  select  t_s_secyear.c_preferred_cust_flag
- from year_total t_s_firstyear
-     ,year_total t_s_secyear
-     ,year_total t_w_firstyear
-     ,year_total t_w_secyear
- where t_s_secyear.customer_id = t_s_firstyear.customer_id
-         and t_s_firstyear.customer_id = t_w_secyear.customer_id
-         and t_s_firstyear.customer_id = t_w_firstyear.customer_id
-         and t_s_firstyear.sale_type = 's'
-         and t_w_firstyear.sale_type = 'w'
-         and t_s_secyear.sale_type = 's'
-         and t_w_secyear.sale_type = 'w'
-         and t_s_firstyear.dyear = 2001
-         and t_s_secyear.dyear = 2001+1
-         and t_w_firstyear.dyear = 2001
-         and t_w_secyear.dyear = 2001+1
-         and t_s_firstyear.year_total > 0
-         and t_w_firstyear.year_total > 0
-         and case when t_w_firstyear.year_total > 0 then 
t_w_secyear.year_total / t_w_firstyear.year_total else null end
-             > case when t_s_firstyear.year_total > 0 then 
t_s_secyear.year_total / t_s_firstyear.year_total else null end
- order by t_s_secyear.c_preferred_cust_flag
-limit 100
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-with year_total as (
- select c_customer_id customer_id
-       ,c_first_name customer_first_name
-       ,c_last_name customer_last_name
-       ,c_preferred_cust_flag
-       ,c_birth_country customer_birth_country
-       ,c_login customer_login
-       ,c_email_address customer_email_address
-       ,d_year dyear
-       ,sum(ss_ext_list_price-ss_ext_discount_amt) year_total
-       ,'s' sale_type
- from customer
-     ,store_sales
-     ,date_dim
- where c_customer_sk = ss_customer_sk
-   and ss_sold_date_sk = d_date_sk
- group by c_customer_id
-         ,c_first_name
-         ,c_last_name
-         ,d_year
-         ,c_preferred_cust_flag
-         ,c_birth_country
-         ,c_login
-         ,c_email_address
-         ,d_year 
- union all
- select c_customer_id customer_id
-       ,c_first_name customer_first_name
-       ,c_last_name customer_last_name
-       ,c_preferred_cust_flag
-       ,c_birth_country customer_birth_country
-       ,c_login customer_login
-       ,c_email_address customer_email_address
-       ,d_year dyear
-       ,sum(ws_ext_list_price-ws_ext_discount_amt) year_total
-       ,'w' sale_type
- from customer
-     ,web_sales
-     ,date_dim
- where c_customer_sk = ws_bill_customer_sk
-   and ws_sold_date_sk = d_date_sk
- group by c_customer_id
-         ,c_first_name
-         ,c_last_name
-         ,c_preferred_cust_flag
-         ,c_birth_country
-         ,c_login
-         ,c_email_address
-         ,d_year
-         )
-  select  t_s_secyear.c_preferred_cust_flag
- from year_total t_s_firstyear
-     ,year_total t_s_secyear
-     ,year_total t_w_firstyear
-     ,year_total t_w_secyear
- where t_s_secyear.customer_id = t_s_firstyear.customer_id
-         and t_s_firstyear.customer_id = t_w_secyear.customer_id
-         and t_s_firstyear.customer_id = t_w_firstyear.customer_id
-         and t_s_firstyear.sale_type = 's'
-         and t_w_firstyear.sale_type = 'w'
-         and t_s_secyear.sale_type = 's'
-         and t_w_secyear.sale_type = 'w'
-         and t_s_firstyear.dyear = 2001
-         and t_s_secyear.dyear = 2001+1
-         and t_w_firstyear.dyear = 2001
-         and t_w_secyear.dyear = 2001+1
-         and t_s_firstyear.year_total > 0
-         and t_w_firstyear.year_total > 0
-         and case when t_w_firstyear.year_total > 0 then 
t_w_secyear.year_total / t_w_firstyear.year_total else null end
-             > case when t_s_firstyear.year_total > 0 then 
t_s_secyear.year_total / t_s_firstyear.year_total else null end
- order by t_s_secyear.c_preferred_cust_flag
-limit 100
-POSTHOOK: type: QUERY
-Plan optimized by CBO.
-
-Vertex dependency in root stage
-Reducer 11 <- Map 10 (SIMPLE_EDGE), Map 17 (SIMPLE_EDGE)
-Reducer 12 <- Map 18 (SIMPLE_EDGE), Reducer 11 (SIMPLE_EDGE)
-Reducer 13 <- Reducer 12 (SIMPLE_EDGE)
-Reducer 14 <- Map 10 (SIMPLE_EDGE), Map 17 (SIMPLE_EDGE)
-Reducer 15 <- Map 18 (SIMPLE_EDGE), Reducer 14 (SIMPLE_EDGE)
-Reducer 16 <- Reducer 15 (SIMPLE_EDGE)
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 17 (SIMPLE_EDGE)
-Reducer 3 <- Map 18 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Reducer 13 (SIMPLE_EDGE), Reducer 16 (SIMPLE_EDGE), Reducer 4 
(SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE)
-Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Map 1 (SIMPLE_EDGE), Map 17 (SIMPLE_EDGE)
-Reducer 8 <- Map 18 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
-Reducer 9 <- Reducer 8 (SIMPLE_EDGE)
-
-Stage-0
-  Fetch Operator
-    limit:100
-    Stage-1
-      Reducer 6
-      File Output Operator [FS_96]
-        Limit [LIM_95] (rows=100 width=88)
-          Number of rows:100
-          Select Operator [SEL_94] (rows=574987679 width=88)
-            Output:["_col0"]
-          <-Reducer 5 [SIMPLE_EDGE]
-            SHUFFLE [RS_93]
-              Select Operator [SEL_92] (rows=574987679 width=88)
-                Output:["_col0"]
-                Filter Operator [FIL_91] (rows=574987679 width=88)
-                  predicate:CASE WHEN ((_col14 > 0)) THEN (CASE WHEN ((_col22 
> 0)) THEN (((_col7 / _col22) > (_col30 / _col14))) ELSE ((null > (_col30 / 
_col14))) END) ELSE (CASE WHEN ((_col22 > 0)) THEN (((_col7 / _col22) > null)) 
ELSE (null) END) END
-                  Merge Join Operator [MERGEJOIN_175] (rows=1149975359 
width=88)
-                    
Conds:RS_86._col0=RS_87._col0(Inner),RS_87._col0=RS_88._col0(Inner),RS_87._col0=RS_89._col0(Inner),Output:["_col7","_col14","_col22","_col26","_col30"]
-                  <-Reducer 13 [SIMPLE_EDGE]
-                    SHUFFLE [RS_89]
-                      PartitionCols:_col0
-                      Select Operator [SEL_85] (rows=348477374 width=88)
-                        Output:["_col0","_col3","_col7"]
-                        Group By Operator [GBY_84] (rows=348477374 width=88)
-                          
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6
-                        <-Reducer 12 [SIMPLE_EDGE]
-                          SHUFFLE [RS_83]
-                            PartitionCols:_col0, _col1, _col2, _col3, _col4, 
_col5, _col6
-                            Group By Operator [GBY_82] (rows=696954748 
width=88)
-                              
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(_col7)"],keys:_col0,
 _col1, _col2, _col3, _col4, _col5, _col6
-                              Select Operator [SEL_80] (rows=696954748 
width=88)
-                                
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                Merge Join Operator [MERGEJOIN_174] 
(rows=696954748 width=88)
-                                  
Conds:RS_77._col1=RS_78._col0(Inner),Output:["_col2","_col3","_col7","_col8","_col9","_col10","_col11","_col12","_col13"]
-                                <-Map 18 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_78]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_73] (rows=80000000 
width=860)
-                                      
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                      Filter Operator [FIL_164] (rows=80000000 
width=860)
-                                        predicate:(c_customer_id is not null 
and c_customer_sk is not null)
-                                        TableScan [TS_71] (rows=80000000 
width=860)
-                                          
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_customer_id","c_first_name","c_last_name","c_preferred_cust_flag","c_birth_country","c_login","c_email_address"]
-                                <-Reducer 11 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_77]
-                                    PartitionCols:_col1
-                                    Merge Join Operator [MERGEJOIN_173] 
(rows=633595212 width=88)
-                                      
Conds:RS_74._col0=RS_75._col0(Inner),Output:["_col1","_col2","_col3"]
-                                    <-Map 17 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_75]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_70] (rows=36524 
width=1119)
-                                          Output:["_col0"]
-                                          Filter Operator [FIL_163] 
(rows=36524 width=1119)
-                                            predicate:((d_year = 2002) and 
d_date_sk is not null)
-                                            TableScan [TS_68] (rows=73049 
width=1119)
-                                              
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
-                                    <-Map 10 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_74]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_67] 
(rows=575995635 width=88)
-                                          
Output:["_col0","_col1","_col2","_col3"]
-                                          Filter Operator [FIL_162] 
(rows=575995635 width=88)
-                                            predicate:(ss_customer_sk is not 
null and ss_sold_date_sk is not null)
-                                            TableScan [TS_65] (rows=575995635 
width=88)
-                                              
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_list_price"]
-                  <-Reducer 16 [SIMPLE_EDGE]
-                    SHUFFLE [RS_87]
-                      PartitionCols:_col0
-                      Select Operator [SEL_42] (rows=116159124 width=88)
-                        Output:["_col0","_col6"]
-                        Filter Operator [FIL_41] (rows=116159124 width=88)
-                          predicate:(_col7 > 0)
-                          Select Operator [SEL_166] (rows=348477374 width=88)
-                            Output:["_col0","_col7"]
-                            Group By Operator [GBY_40] (rows=348477374 
width=88)
-                              
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6
-                            <-Reducer 15 [SIMPLE_EDGE]
-                              SHUFFLE [RS_39]
-                                PartitionCols:_col0, _col1, _col2, _col3, 
_col4, _col5, _col6
-                                Group By Operator [GBY_38] (rows=696954748 
width=88)
-                                  
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(_col7)"],keys:_col0,
 _col1, _col2, _col3, _col4, _col5, _col6
-                                  Select Operator [SEL_36] (rows=696954748 
width=88)
-                                    
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                    Merge Join Operator [MERGEJOIN_170] 
(rows=696954748 width=88)
-                                      
Conds:RS_33._col1=RS_34._col0(Inner),Output:["_col2","_col3","_col7","_col8","_col9","_col10","_col11","_col12","_col13"]
-                                    <-Map 18 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_34]
-                                        PartitionCols:_col0
-                                         Please refer to the previous Select 
Operator [SEL_73]
-                                    <-Reducer 14 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_33]
-                                        PartitionCols:_col1
-                                        Merge Join Operator [MERGEJOIN_169] 
(rows=633595212 width=88)
-                                          
Conds:RS_30._col0=RS_31._col0(Inner),Output:["_col1","_col2","_col3"]
-                                        <-Map 17 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_31]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_26] 
(rows=36524 width=1119)
-                                              Output:["_col0"]
-                                              Filter Operator [FIL_157] 
(rows=36524 width=1119)
-                                                predicate:((d_year = 2001) and 
d_date_sk is not null)
-                                                 Please refer to the previous 
TableScan [TS_68]
-                                        <-Map 10 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_30]
-                                            PartitionCols:_col0
-                                             Please refer to the previous 
Select Operator [SEL_67]
-                  <-Reducer 4 [SIMPLE_EDGE]
-                    SHUFFLE [RS_86]
-                      PartitionCols:_col0
-                      Select Operator [SEL_20] (rows=87121617 width=135)
-                        Output:["_col0","_col7"]
-                        Group By Operator [GBY_19] (rows=87121617 width=135)
-                          
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6
-                        <-Reducer 3 [SIMPLE_EDGE]
-                          SHUFFLE [RS_18]
-                            PartitionCols:_col0, _col1, _col2, _col3, _col4, 
_col5, _col6
-                            Group By Operator [GBY_17] (rows=174243235 
width=135)
-                              
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(_col7)"],keys:_col0,
 _col1, _col2, _col3, _col4, _col5, _col6
-                              Select Operator [SEL_15] (rows=174243235 
width=135)
-                                
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                Merge Join Operator [MERGEJOIN_168] 
(rows=174243235 width=135)
-                                  
Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col3","_col7","_col8","_col9","_col10","_col11","_col12","_col13"]
-                                <-Map 18 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_13]
-                                    PartitionCols:_col0
-                                     Please refer to the previous Select 
Operator [SEL_73]
-                                <-Reducer 2 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_12]
-                                    PartitionCols:_col1
-                                    Merge Join Operator [MERGEJOIN_167] 
(rows=158402938 width=135)
-                                      
Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2","_col3"]
-                                    <-Map 17 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_10]
-                                        PartitionCols:_col0
-                                         Please refer to the previous Select 
Operator [SEL_70]
-                                    <-Map 1 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_9]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_2] 
(rows=144002668 width=135)
-                                          
Output:["_col0","_col1","_col2","_col3"]
-                                          Filter Operator [FIL_153] 
(rows=144002668 width=135)
-                                            predicate:(ws_bill_customer_sk is 
not null and ws_sold_date_sk is not null)
-                                            TableScan [TS_0] (rows=144002668 
width=135)
-                                              
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_list_price"]
-                  <-Reducer 9 [SIMPLE_EDGE]
-                    SHUFFLE [RS_88]
-                      PartitionCols:_col0
-                      Filter Operator [FIL_63] (rows=29040539 width=135)
-                        predicate:(_col7 > 0)
-                        Select Operator [SEL_165] (rows=87121617 width=135)
-                          Output:["_col0","_col7"]
-                          Group By Operator [GBY_62] (rows=87121617 width=135)
-                            
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6
-                          <-Reducer 8 [SIMPLE_EDGE]
-                            SHUFFLE [RS_61]
-                              PartitionCols:_col0, _col1, _col2, _col3, _col4, 
_col5, _col6
-                              Group By Operator [GBY_60] (rows=174243235 
width=135)
-                                
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(_col7)"],keys:_col0,
 _col1, _col2, _col3, _col4, _col5, _col6
-                                Select Operator [SEL_58] (rows=174243235 
width=135)
-                                  
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                  Merge Join Operator [MERGEJOIN_172] 
(rows=174243235 width=135)
-                                    
Conds:RS_55._col1=RS_56._col0(Inner),Output:["_col2","_col3","_col7","_col8","_col9","_col10","_col11","_col12","_col13"]
-                                  <-Map 18 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_56]
-                                      PartitionCols:_col0
-                                       Please refer to the previous Select 
Operator [SEL_73]
-                                  <-Reducer 7 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_55]
-                                      PartitionCols:_col1
-                                      Merge Join Operator [MERGEJOIN_171] 
(rows=158402938 width=135)
-                                        
Conds:RS_52._col0=RS_53._col0(Inner),Output:["_col1","_col2","_col3"]
-                                      <-Map 17 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_53]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_48] (rows=36524 
width=1119)
-                                            Output:["_col0"]
-                                            Filter Operator [FIL_160] 
(rows=36524 width=1119)
-                                              predicate:((d_year = 2001) and 
d_date_sk is not null)
-                                               Please refer to the previous 
TableScan [TS_68]
-                                      <-Map 1 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_52]
-                                          PartitionCols:_col0
-                                           Please refer to the previous Select 
Operator [SEL_2]
-

http://git-wip-us.apache.org/repos/asf/hive/blob/9244fdc7/ql/src/test/results/clientpositive/perf/query12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query12.q.out 
b/ql/src/test/results/clientpositive/perf/query12.q.out
deleted file mode 100644
index 0506eca..0000000
--- a/ql/src/test/results/clientpositive/perf/query12.q.out
+++ /dev/null
@@ -1,138 +0,0 @@
-PREHOOK: query: explain
-select  i_item_desc 
-      ,i_category 
-      ,i_class 
-      ,i_current_price
-      ,sum(ws_ext_sales_price) as itemrevenue 
-      ,sum(ws_ext_sales_price)*100/sum(sum(ws_ext_sales_price)) over
-          (partition by i_class) as revenueratio
-from   
-       web_sales
-       ,item 
-       ,date_dim
-where 
-       ws_item_sk = i_item_sk 
-       and i_category in ('Jewelry', 'Sports', 'Books')
-       and ws_sold_date_sk = d_date_sk
-       and d_date between cast('2001-01-12' as date) 
-                               and (cast('2001-01-12' as date) + 30 days)
-group by 
-       i_item_id
-        ,i_item_desc 
-        ,i_category
-        ,i_class
-        ,i_current_price
-order by 
-       i_category
-        ,i_class
-        ,i_item_id
-        ,i_item_desc
-        ,revenueratio
-limit 100
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-select  i_item_desc 
-      ,i_category 
-      ,i_class 
-      ,i_current_price
-      ,sum(ws_ext_sales_price) as itemrevenue 
-      ,sum(ws_ext_sales_price)*100/sum(sum(ws_ext_sales_price)) over
-          (partition by i_class) as revenueratio
-from   
-       web_sales
-       ,item 
-       ,date_dim
-where 
-       ws_item_sk = i_item_sk 
-       and i_category in ('Jewelry', 'Sports', 'Books')
-       and ws_sold_date_sk = d_date_sk
-       and d_date between cast('2001-01-12' as date) 
-                               and (cast('2001-01-12' as date) + 30 days)
-group by 
-       i_item_id
-        ,i_item_desc 
-        ,i_category
-        ,i_class
-        ,i_current_price
-order by 
-       i_category
-        ,i_class
-        ,i_item_id
-        ,i_item_desc
-        ,revenueratio
-limit 100
-POSTHOOK: type: QUERY
-Plan optimized by CBO.
-
-Vertex dependency in root stage
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
-Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
-
-Stage-0
-  Fetch Operator
-    limit:-1
-    Stage-1
-      Reducer 6
-      File Output Operator [FS_29]
-        Limit [LIM_27] (rows=100 width=135)
-          Number of rows:100
-          Select Operator [SEL_26] (rows=87121617 width=135)
-            Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-          <-Reducer 5 [SIMPLE_EDGE]
-            SHUFFLE [RS_25]
-              Select Operator [SEL_23] (rows=87121617 width=135)
-                
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                PTF Operator [PTF_22] (rows=87121617 width=135)
-                  Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col3 ASC NULLS 
FIRST","partition by:":"_col3"}]
-                  Select Operator [SEL_21] (rows=87121617 width=135)
-                    Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                  <-Reducer 4 [SIMPLE_EDGE]
-                    SHUFFLE [RS_20]
-                      PartitionCols:_col3
-                      Select Operator [SEL_19] (rows=87121617 width=135)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                        Group By Operator [GBY_18] (rows=87121617 width=135)
-                          
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2, KEY._col3, KEY._col4
-                        <-Reducer 3 [SIMPLE_EDGE]
-                          SHUFFLE [RS_17]
-                            PartitionCols:_col0, _col1, _col2, _col3, _col4
-                            Group By Operator [GBY_16] (rows=174243235 
width=135)
-                              
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)"],keys:_col10,
 _col9, _col6, _col7, _col8
-                              Merge Join Operator [MERGEJOIN_39] 
(rows=174243235 width=135)
-                                
Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col6","_col7","_col8","_col9","_col10"]
-                              <-Map 8 [SIMPLE_EDGE]
-                                SHUFFLE [RS_13]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_8] (rows=231000 
width=1436)
-                                    
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                    Filter Operator [FIL_37] (rows=231000 
width=1436)
-                                      predicate:((i_category) IN ('Jewelry', 
'Sports', 'Books') and i_item_sk is not null)
-                                      TableScan [TS_6] (rows=462000 width=1436)
-                                        
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id","i_item_desc","i_current_price","i_class","i_category"]
-                              <-Reducer 2 [SIMPLE_EDGE]
-                                SHUFFLE [RS_12]
-                                  PartitionCols:_col1
-                                  Merge Join Operator [MERGEJOIN_38] 
(rows=158402938 width=135)
-                                    
Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
-                                  <-Map 1 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_9]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_2] (rows=144002668 
width=135)
-                                        Output:["_col0","_col1","_col2"]
-                                        Filter Operator [FIL_35] 
(rows=144002668 width=135)
-                                          predicate:(ws_item_sk is not null 
and ws_sold_date_sk is not null)
-                                          TableScan [TS_0] (rows=144002668 
width=135)
-                                            
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"]
-                                  <-Map 7 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_10]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_5] (rows=8116 
width=1119)
-                                        Output:["_col0"]
-                                        Filter Operator [FIL_36] (rows=8116 
width=1119)
-                                          predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN 2001-01-12 00:00:00.0 AND 2001-02-11 00:00:00.0 and 
d_date_sk is not null)
-                                          TableScan [TS_3] (rows=73049 
width=1119)
-                                            
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-

Reply via email to