You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2018/10/26 21:12:01 UTC

[51/75] [abbrv] [partial] hive git commit: HIVE-20718: Add perf cli driver with constraints (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)

HIVE-20718: Add perf cli driver with constraints (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)


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

Branch: refs/heads/master-tez092
Commit: b829955177907acc3dc64efca0bc812b1420d793
Parents: 7b9540e
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Tue Oct 9 12:12:27 2018 -0700
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Sun Oct 21 19:09:45 2018 -0700

----------------------------------------------------------------------
 data/conf/perf-reg/spark/hive-site.xml          |    7 +-
 data/conf/perf-reg/tez/hive-site.xml            |   17 +-
 data/scripts/q_perf_test_init.sql               |   96 +-
 data/scripts/q_perf_test_init_constraints.sql   |  771 +++++++
 .../hadoop/hive/cli/TestTezPerfCliDriver.java   |    2 +-
 .../cli/TestTezPerfConstraintsCliDriver.java    |   73 +
 .../test/resources/testconfiguration.properties |   99 +-
 .../hadoop/hive/cli/control/CliConfigs.java     |   17 +-
 .../java/org/apache/hadoop/hive/ql/Context.java |    9 +
 .../apache/hadoop/hive/ql/exec/ExplainTask.java |   16 +-
 .../apache/hadoop/hive/ql/hooks/ATSHook.java    |    3 +-
 .../hive/ql/hooks/HiveProtoLoggingHook.java     |    3 +-
 .../ql/optimizer/calcite/HiveRelOptUtil.java    |  238 ++
 .../calcite/rules/HiveJoinConstraintsRule.java  |  228 +-
 .../hadoop/hive/ql/parse/CalcitePlanner.java    |   10 +-
 .../hive/ql/parse/ExplainConfiguration.java     |   18 +
 .../hive/ql/parse/ExplainSemanticAnalyzer.java  |   12 +-
 .../org/apache/hadoop/hive/ql/parse/HiveLexer.g |    1 +
 .../apache/hadoop/hive/ql/parse/HiveParser.g    |    1 +
 .../hadoop/hive/ql/parse/IdentifiersParser.g    |    2 +-
 .../apache/hadoop/hive/ql/plan/ExplainWork.java |   17 +-
 .../parse/TestUpdateDeleteSemanticAnalyzer.java |    2 +-
 .../queries/clientpositive/perf/cbo_query1.q    |   27 +
 .../queries/clientpositive/perf/cbo_query10.q   |   61 +
 .../queries/clientpositive/perf/cbo_query11.q   |   77 +
 .../queries/clientpositive/perf/cbo_query12.q   |   35 +
 .../queries/clientpositive/perf/cbo_query13.q   |   54 +
 .../queries/clientpositive/perf/cbo_query14.q   |  104 +
 .../queries/clientpositive/perf/cbo_query15.q   |   22 +
 .../queries/clientpositive/perf/cbo_query16.q   |   33 +
 .../queries/clientpositive/perf/cbo_query17.q   |   47 +
 .../queries/clientpositive/perf/cbo_query18.q   |   36 +
 .../queries/clientpositive/perf/cbo_query19.q   |   27 +
 .../queries/clientpositive/perf/cbo_query2.q    |   62 +
 .../queries/clientpositive/perf/cbo_query20.q   |   31 +
 .../queries/clientpositive/perf/cbo_query21.q   |   32 +
 .../queries/clientpositive/perf/cbo_query22.q   |   24 +
 .../queries/clientpositive/perf/cbo_query23.q   |   52 +
 .../queries/clientpositive/perf/cbo_query24.q   |   51 +
 .../queries/clientpositive/perf/cbo_query25.q   |   50 +
 .../queries/clientpositive/perf/cbo_query26.q   |   23 +
 .../queries/clientpositive/perf/cbo_query27.q   |   25 +
 .../queries/clientpositive/perf/cbo_query28.q   |   59 +
 .../queries/clientpositive/perf/cbo_query29.q   |   49 +
 .../queries/clientpositive/perf/cbo_query3.q    |   23 +
 .../queries/clientpositive/perf/cbo_query30.q   |   33 +
 .../queries/clientpositive/perf/cbo_query31.q   |   54 +
 .../queries/clientpositive/perf/cbo_query32.q   |   30 +
 .../queries/clientpositive/perf/cbo_query33.q   |   77 +
 .../queries/clientpositive/perf/cbo_query34.q   |   33 +
 .../queries/clientpositive/perf/cbo_query35.q   |   59 +
 .../queries/clientpositive/perf/cbo_query36.q   |   32 +
 .../queries/clientpositive/perf/cbo_query37.q   |   19 +
 .../queries/clientpositive/perf/cbo_query38.q   |   25 +
 .../queries/clientpositive/perf/cbo_query39.q   |   56 +
 .../queries/clientpositive/perf/cbo_query4.q    |  111 +
 .../queries/clientpositive/perf/cbo_query40.q   |   30 +
 .../queries/clientpositive/perf/cbo_query42.q   |   24 +
 .../queries/clientpositive/perf/cbo_query43.q   |   21 +
 .../queries/clientpositive/perf/cbo_query44.q   |   37 +
 .../queries/clientpositive/perf/cbo_query45.q   |   22 +
 .../queries/clientpositive/perf/cbo_query46.q   |   37 +
 .../queries/clientpositive/perf/cbo_query47.q   |   53 +
 .../queries/clientpositive/perf/cbo_query48.q   |   69 +
 .../queries/clientpositive/perf/cbo_query49.q   |  129 ++
 .../queries/clientpositive/perf/cbo_query5.q    |  130 ++
 .../queries/clientpositive/perf/cbo_query50.q   |   61 +
 .../queries/clientpositive/perf/cbo_query51.q   |   47 +
 .../queries/clientpositive/perf/cbo_query52.q   |   24 +
 .../queries/clientpositive/perf/cbo_query53.q   |   30 +
 .../queries/clientpositive/perf/cbo_query54.q   |   58 +
 .../queries/clientpositive/perf/cbo_query55.q   |   16 +
 .../queries/clientpositive/perf/cbo_query56.q   |   70 +
 .../queries/clientpositive/perf/cbo_query57.q   |   50 +
 .../queries/clientpositive/perf/cbo_query58.q   |   67 +
 .../queries/clientpositive/perf/cbo_query59.q   |   46 +
 .../queries/clientpositive/perf/cbo_query6.q    |   30 +
 .../queries/clientpositive/perf/cbo_query60.q   |   80 +
 .../queries/clientpositive/perf/cbo_query61.q   |   46 +
 .../queries/clientpositive/perf/cbo_query63.q   |   31 +
 .../queries/clientpositive/perf/cbo_query64.q   |  121 +
 .../queries/clientpositive/perf/cbo_query65.q   |   31 +
 .../queries/clientpositive/perf/cbo_query66.q   |  224 ++
 .../queries/clientpositive/perf/cbo_query67.q   |   46 +
 .../queries/clientpositive/perf/cbo_query68.q   |   44 +
 .../queries/clientpositive/perf/cbo_query69.q   |   49 +
 .../queries/clientpositive/perf/cbo_query7.q    |   23 +
 .../queries/clientpositive/perf/cbo_query70.q   |   40 +
 .../queries/clientpositive/perf/cbo_query71.q   |   42 +
 .../queries/clientpositive/perf/cbo_query72.q   |   33 +
 .../queries/clientpositive/perf/cbo_query73.q   |   30 +
 .../queries/clientpositive/perf/cbo_query74.q   |   63 +
 .../queries/clientpositive/perf/cbo_query75.q   |   72 +
 .../queries/clientpositive/perf/cbo_query76.q   |   26 +
 .../queries/clientpositive/perf/cbo_query77.q   |  109 +
 .../queries/clientpositive/perf/cbo_query78.q   |   60 +
 .../queries/clientpositive/perf/cbo_query79.q   |   25 +
 .../queries/clientpositive/perf/cbo_query8.q    |  110 +
 .../queries/clientpositive/perf/cbo_query80.q   |   98 +
 .../queries/clientpositive/perf/cbo_query81.q   |   33 +
 .../queries/clientpositive/perf/cbo_query82.q   |   19 +
 .../queries/clientpositive/perf/cbo_query83.q   |   69 +
 .../queries/clientpositive/perf/cbo_query84.q   |   23 +
 .../queries/clientpositive/perf/cbo_query85.q   |   86 +
 .../queries/clientpositive/perf/cbo_query86.q   |   28 +
 .../queries/clientpositive/perf/cbo_query87.q   |   25 +
 .../queries/clientpositive/perf/cbo_query88.q   |   96 +
 .../queries/clientpositive/perf/cbo_query89.q   |   30 +
 .../queries/clientpositive/perf/cbo_query9.q    |   53 +
 .../queries/clientpositive/perf/cbo_query90.q   |   24 +
 .../queries/clientpositive/perf/cbo_query91.q   |   33 +
 .../queries/clientpositive/perf/cbo_query92.q   |   32 +
 .../queries/clientpositive/perf/cbo_query93.q   |   20 +
 .../queries/clientpositive/perf/cbo_query94.q   |   31 +
 .../queries/clientpositive/perf/cbo_query95.q   |   34 +
 .../queries/clientpositive/perf/cbo_query96.q   |   18 +
 .../queries/clientpositive/perf/cbo_query97.q   |   27 +
 .../queries/clientpositive/perf/cbo_query98.q   |   34 +
 .../queries/clientpositive/perf/cbo_query99.q   |   37 +
 .../clientpositive/perf/tez/cbo_query1.q.out    |   91 +
 .../clientpositive/perf/tez/cbo_query10.q.out   |  178 ++
 .../clientpositive/perf/tez/cbo_query11.q.out   |  223 ++
 .../clientpositive/perf/tez/cbo_query12.q.out   |   89 +
 .../clientpositive/perf/tez/cbo_query13.q.out   |  141 ++
 .../clientpositive/perf/tez/cbo_query14.q.out   |  618 ++++++
 .../clientpositive/perf/tez/cbo_query15.q.out   |   69 +
 .../clientpositive/perf/tez/cbo_query16.q.out   |  104 +
 .../clientpositive/perf/tez/cbo_query17.q.out   |  141 ++
 .../clientpositive/perf/tez/cbo_query18.q.out   |  114 +
 .../clientpositive/perf/tez/cbo_query19.q.out   |   92 +
 .../clientpositive/perf/tez/cbo_query2.q.out    |  170 ++
 .../clientpositive/perf/tez/cbo_query20.q.out   |   81 +
 .../clientpositive/perf/tez/cbo_query21.q.out   |   90 +
 .../clientpositive/perf/tez/cbo_query22.q.out   |   72 +
 .../clientpositive/perf/tez/cbo_query23.q.out   |  281 +++
 .../clientpositive/perf/tez/cbo_query24.q.out   |  171 ++
 .../clientpositive/perf/tez/cbo_query25.q.out   |  146 ++
 .../clientpositive/perf/tez/cbo_query26.q.out   |   76 +
 .../clientpositive/perf/tez/cbo_query27.q.out   |   81 +
 .../clientpositive/perf/tez/cbo_query28.q.out   |  146 ++
 .../clientpositive/perf/tez/cbo_query29.q.out   |  144 ++
 .../clientpositive/perf/tez/cbo_query3.q.out    |   64 +
 .../clientpositive/perf/tez/cbo_query30.q.out   |  112 +
 .../clientpositive/perf/tez/cbo_query31.q.out   |  199 ++
 .../clientpositive/perf/tez/cbo_query32.q.out   |   89 +
 .../clientpositive/perf/tez/cbo_query33.q.out   |  238 ++
 .../clientpositive/perf/tez/cbo_query34.q.out   |   99 +
 .../clientpositive/perf/tez/cbo_query35.q.out   |  175 ++
 .../clientpositive/perf/tez/cbo_query36.q.out   |   91 +
 .../clientpositive/perf/tez/cbo_query37.q.out   |   63 +
 .../clientpositive/perf/tez/cbo_query38.q.out   |  111 +
 .../clientpositive/perf/tez/cbo_query39.q.out   |  168 ++
 .../clientpositive/perf/tez/cbo_query4.q.out    |  324 +++
 .../clientpositive/perf/tez/cbo_query40.q.out   |   91 +
 .../clientpositive/perf/tez/cbo_query42.q.out   |   68 +
 .../clientpositive/perf/tez/cbo_query43.q.out   |   61 +
 .../clientpositive/perf/tez/cbo_query44.q.out   |  115 +
 .../clientpositive/perf/tez/cbo_query45.q.out   |   89 +
 .../clientpositive/perf/tez/cbo_query46.q.out   |  115 +
 .../clientpositive/perf/tez/cbo_query47.q.out   |  177 ++
 .../clientpositive/perf/tez/cbo_query48.q.out   |  164 ++
 .../clientpositive/perf/tez/cbo_query49.q.out   |  330 +++
 .../clientpositive/perf/tez/cbo_query5.q.out    |  342 +++
 .../clientpositive/perf/tez/cbo_query50.q.out   |  151 ++
 .../clientpositive/perf/tez/cbo_query51.q.out   |  125 ++
 .../clientpositive/perf/tez/cbo_query52.q.out   |   67 +
 .../clientpositive/perf/tez/cbo_query53.q.out   |   87 +
 .../clientpositive/perf/tez/cbo_query54.q.out   |  213 ++
 .../clientpositive/perf/tez/cbo_query55.q.out   |   51 +
 .../clientpositive/perf/tez/cbo_query56.q.out   |  224 ++
 .../clientpositive/perf/tez/cbo_query57.q.out   |  171 ++
 .../clientpositive/perf/tez/cbo_query58.q.out   |  240 ++
 .../clientpositive/perf/tez/cbo_query59.q.out   |  136 ++
 .../clientpositive/perf/tez/cbo_query6.q.out    |  109 +
 .../clientpositive/perf/tez/cbo_query60.q.out   |  244 +++
 .../clientpositive/perf/tez/cbo_query61.q.out   |  164 ++
 .../clientpositive/perf/tez/cbo_query63.q.out   |   89 +
 .../clientpositive/perf/tez/cbo_query64.q.out   |  438 ++++
 .../clientpositive/perf/tez/cbo_query65.q.out   |   99 +
 .../clientpositive/perf/tez/cbo_query66.q.out   |  508 +++++
 .../clientpositive/perf/tez/cbo_query67.q.out   |  120 +
 .../clientpositive/perf/tez/cbo_query68.q.out   |  129 ++
 .../clientpositive/perf/tez/cbo_query69.q.out   |  156 ++
 .../clientpositive/perf/tez/cbo_query7.q.out    |   76 +
 .../clientpositive/perf/tez/cbo_query70.q.out   |  119 +
 .../clientpositive/perf/tez/cbo_query71.q.out   |  130 ++
 .../clientpositive/perf/tez/cbo_query72.q.out   |  130 ++
 .../clientpositive/perf/tez/cbo_query73.q.out   |   93 +
 .../clientpositive/perf/tez/cbo_query74.q.out   |  191 ++
 .../clientpositive/perf/tez/cbo_query75.q.out   |  278 +++
 .../clientpositive/perf/tez/cbo_query76.q.out   |  101 +
 .../clientpositive/perf/tez/cbo_query77.q.out   |  316 +++
 .../clientpositive/perf/tez/cbo_query78.q.out   |  183 ++
 .../clientpositive/perf/tez/cbo_query79.q.out   |   82 +
 .../clientpositive/perf/tez/cbo_query8.q.out    |  266 +++
 .../clientpositive/perf/tez/cbo_query80.q.out   |  301 +++
 .../clientpositive/perf/tez/cbo_query81.q.out   |  113 +
 .../clientpositive/perf/tez/cbo_query82.q.out   |   63 +
 .../clientpositive/perf/tez/cbo_query83.q.out   |  222 ++
 .../clientpositive/perf/tez/cbo_query84.q.out   |   84 +
 .../clientpositive/perf/tez/cbo_query85.q.out   |  219 ++
 .../clientpositive/perf/tez/cbo_query86.q.out   |   77 +
 .../clientpositive/perf/tez/cbo_query87.q.out   |  114 +
 .../clientpositive/perf/tez/cbo_query88.q.out   |  347 +++
 .../clientpositive/perf/tez/cbo_query89.q.out   |   88 +
 .../clientpositive/perf/tez/cbo_query9.q.out    |  200 ++
 .../clientpositive/perf/tez/cbo_query90.q.out   |   92 +
 .../clientpositive/perf/tez/cbo_query91.q.out   |  110 +
 .../clientpositive/perf/tez/cbo_query92.q.out   |   94 +
 .../clientpositive/perf/tez/cbo_query93.q.out   |   59 +
 .../clientpositive/perf/tez/cbo_query94.q.out   |  100 +
 .../clientpositive/perf/tez/cbo_query95.q.out   |  120 +
 .../clientpositive/perf/tez/cbo_query96.q.out   |   61 +
 .../clientpositive/perf/tez/cbo_query97.q.out   |   81 +
 .../clientpositive/perf/tez/cbo_query98.q.out   |   87 +
 .../clientpositive/perf/tez/cbo_query99.q.out   |  106 +
 .../perf/tez/constraints/cbo_query1.q.out       |   90 +
 .../perf/tez/constraints/cbo_query10.q.out      |  177 ++
 .../perf/tez/constraints/cbo_query11.q.out      |  215 ++
 .../perf/tez/constraints/cbo_query12.q.out      |   89 +
 .../perf/tez/constraints/cbo_query13.q.out      |  137 ++
 .../perf/tez/constraints/cbo_query14.q.out      |  612 ++++++
 .../perf/tez/constraints/cbo_query15.q.out      |   68 +
 .../perf/tez/constraints/cbo_query16.q.out      |  102 +
 .../perf/tez/constraints/cbo_query17.q.out      |  139 ++
 .../perf/tez/constraints/cbo_query18.q.out      |  111 +
 .../perf/tez/constraints/cbo_query19.q.out      |   90 +
 .../perf/tez/constraints/cbo_query2.q.out       |  170 ++
 .../perf/tez/constraints/cbo_query20.q.out      |   81 +
 .../perf/tez/constraints/cbo_query21.q.out      |   88 +
 .../perf/tez/constraints/cbo_query22.q.out      |   66 +
 .../perf/tez/constraints/cbo_query23.q.out      |  245 +++
 .../perf/tez/constraints/cbo_query24.q.out      |  168 ++
 .../perf/tez/constraints/cbo_query25.q.out      |  144 ++
 .../perf/tez/constraints/cbo_query26.q.out      |   75 +
 .../perf/tez/constraints/cbo_query27.q.out      |   80 +
 .../perf/tez/constraints/cbo_query28.q.out      |  146 ++
 .../perf/tez/constraints/cbo_query29.q.out      |  142 ++
 .../perf/tez/constraints/cbo_query3.q.out       |   64 +
 .../perf/tez/constraints/cbo_query30.q.out      |  112 +
 .../perf/tez/constraints/cbo_query31.q.out      |  199 ++
 .../perf/tez/constraints/cbo_query32.q.out      |   89 +
 .../perf/tez/constraints/cbo_query33.q.out      |  238 ++
 .../perf/tez/constraints/cbo_query34.q.out      |   98 +
 .../perf/tez/constraints/cbo_query35.q.out      |  173 ++
 .../perf/tez/constraints/cbo_query36.q.out      |   90 +
 .../perf/tez/constraints/cbo_query37.q.out      |   62 +
 .../perf/tez/constraints/cbo_query38.q.out      |  108 +
 .../perf/tez/constraints/cbo_query39.q.out      |  156 ++
 .../perf/tez/constraints/cbo_query4.q.out       |  312 +++
 .../perf/tez/constraints/cbo_query40.q.out      |   89 +
 .../perf/tez/constraints/cbo_query42.q.out      |   68 +
 .../perf/tez/constraints/cbo_query43.q.out      |   61 +
 .../perf/tez/constraints/cbo_query44.q.out      |  113 +
 .../perf/tez/constraints/cbo_query45.q.out      |   81 +
 .../perf/tez/constraints/cbo_query46.q.out      |  113 +
 .../perf/tez/constraints/cbo_query47.q.out      |  177 ++
 .../perf/tez/constraints/cbo_query48.q.out      |  160 ++
 .../perf/tez/constraints/cbo_query49.q.out      |  330 +++
 .../perf/tez/constraints/cbo_query5.q.out       |  339 +++
 .../perf/tez/constraints/cbo_query50.q.out      |  146 ++
 .../perf/tez/constraints/cbo_query51.q.out      |  125 ++
 .../perf/tez/constraints/cbo_query52.q.out      |   67 +
 .../perf/tez/constraints/cbo_query53.q.out      |   83 +
 .../perf/tez/constraints/cbo_query54.q.out      |  212 ++
 .../perf/tez/constraints/cbo_query55.q.out      |   51 +
 .../perf/tez/constraints/cbo_query56.q.out      |  221 ++
 .../perf/tez/constraints/cbo_query57.q.out      |  171 ++
 .../perf/tez/constraints/cbo_query58.q.out      |  237 ++
 .../perf/tez/constraints/cbo_query59.q.out      |  134 ++
 .../perf/tez/constraints/cbo_query6.q.out       |  108 +
 .../perf/tez/constraints/cbo_query60.q.out      |  241 ++
 .../perf/tez/constraints/cbo_query61.q.out      |  164 ++
 .../perf/tez/constraints/cbo_query63.q.out      |   85 +
 .../perf/tez/constraints/cbo_query64.q.out      |  390 ++++
 .../perf/tez/constraints/cbo_query65.q.out      |   97 +
 .../perf/tez/constraints/cbo_query66.q.out      |  506 +++++
 .../perf/tez/constraints/cbo_query67.q.out      |  118 +
 .../perf/tez/constraints/cbo_query68.q.out      |  127 ++
 .../perf/tez/constraints/cbo_query69.q.out      |  155 ++
 .../perf/tez/constraints/cbo_query7.q.out       |   75 +
 .../perf/tez/constraints/cbo_query70.q.out      |  119 +
 .../perf/tez/constraints/cbo_query71.q.out      |  130 ++
 .../perf/tez/constraints/cbo_query72.q.out      |  125 ++
 .../perf/tez/constraints/cbo_query73.q.out      |   92 +
 .../perf/tez/constraints/cbo_query74.q.out      |  187 ++
 .../perf/tez/constraints/cbo_query75.q.out      |  272 +++
 .../perf/tez/constraints/cbo_query76.q.out      |   95 +
 .../perf/tez/constraints/cbo_query77.q.out      |  304 +++
 .../perf/tez/constraints/cbo_query78.q.out      |  183 ++
 .../perf/tez/constraints/cbo_query79.q.out      |   81 +
 .../perf/tez/constraints/cbo_query8.q.out       |  266 +++
 .../perf/tez/constraints/cbo_query80.q.out      |  295 +++
 .../perf/tez/constraints/cbo_query81.q.out      |  113 +
 .../perf/tez/constraints/cbo_query82.q.out      |   62 +
 .../perf/tez/constraints/cbo_query83.q.out      |  219 ++
 .../perf/tez/constraints/cbo_query84.q.out      |   83 +
 .../perf/tez/constraints/cbo_query85.q.out      |  214 ++
 .../perf/tez/constraints/cbo_query86.q.out      |   76 +
 .../perf/tez/constraints/cbo_query87.q.out      |  111 +
 .../perf/tez/constraints/cbo_query88.q.out      |  347 +++
 .../perf/tez/constraints/cbo_query89.q.out      |   87 +
 .../perf/tez/constraints/cbo_query9.q.out       |  200 ++
 .../perf/tez/constraints/cbo_query90.q.out      |   92 +
 .../perf/tez/constraints/cbo_query91.q.out      |  109 +
 .../perf/tez/constraints/cbo_query92.q.out      |   94 +
 .../perf/tez/constraints/cbo_query93.q.out      |   58 +
 .../perf/tez/constraints/cbo_query94.q.out      |   98 +
 .../perf/tez/constraints/cbo_query95.q.out      |  112 +
 .../perf/tez/constraints/cbo_query96.q.out      |   61 +
 .../perf/tez/constraints/cbo_query97.q.out      |   81 +
 .../perf/tez/constraints/cbo_query98.q.out      |   87 +
 .../perf/tez/constraints/cbo_query99.q.out      |  102 +
 .../perf/tez/constraints/query1.q.out           |  177 ++
 .../perf/tez/constraints/query10.q.out          |  379 ++++
 .../perf/tez/constraints/query11.q.out          |  427 ++++
 .../perf/tez/constraints/query12.q.out          |  169 ++
 .../perf/tez/constraints/query13.q.out          |  255 +++
 .../perf/tez/constraints/query14.q.out          | 1400 ++++++++++++
 .../perf/tez/constraints/query15.q.out          |  142 ++
 .../perf/tez/constraints/query16.q.out          |  244 +++
 .../perf/tez/constraints/query17.q.out          |  319 +++
 .../perf/tez/constraints/query18.q.out          |  239 ++
 .../perf/tez/constraints/query19.q.out          |  196 ++
 .../perf/tez/constraints/query2.q.out           |  228 ++
 .../perf/tez/constraints/query20.q.out          |  161 ++
 .../perf/tez/constraints/query21.q.out          |  145 ++
 .../perf/tez/constraints/query22.q.out          |  112 +
 .../perf/tez/constraints/query23.q.out          |  540 +++++
 .../perf/tez/constraints/query24.q.out          |  343 +++
 .../perf/tez/constraints/query25.q.out          |  321 +++
 .../perf/tez/constraints/query26.q.out          |  171 ++
 .../perf/tez/constraints/query27.q.out          |  189 ++
 .../perf/tez/constraints/query28.q.out          |  296 +++
 .../perf/tez/constraints/query29.q.out          |  328 +++
 .../perf/tez/constraints/query3.q.out           |  135 ++
 .../perf/tez/constraints/query30.q.out          |  221 ++
 .../perf/tez/constraints/query31.q.out          |  492 +++++
 .../perf/tez/constraints/query32.q.out          |  210 ++
 .../perf/tez/constraints/query33.q.out          |  450 ++++
 .../perf/tez/constraints/query34.q.out          |  203 ++
 .../perf/tez/constraints/query35.q.out          |  361 +++
 .../perf/tez/constraints/query36.q.out          |  182 ++
 .../perf/tez/constraints/query37.q.out          |  146 ++
 .../perf/tez/constraints/query38.q.out          |  261 +++
 .../perf/tez/constraints/query39.q.out          |  236 ++
 .../perf/tez/constraints/query4.q.out           |  623 ++++++
 .../perf/tez/constraints/query40.q.out          |  183 ++
 .../perf/tez/constraints/query42.q.out          |  139 ++
 .../perf/tez/constraints/query43.q.out          |  135 ++
 .../perf/tez/constraints/query44.q.out          |  193 ++
 .../perf/tez/constraints/query45.q.out          |  183 ++
 .../perf/tez/constraints/query46.q.out          |  240 ++
 .../perf/tez/constraints/query47.q.out          |  266 +++
 .../perf/tez/constraints/query48.q.out          |  252 +++
 .../perf/tez/constraints/query49.q.out          |  555 +++++
 .../perf/tez/constraints/query5.q.out           |  531 +++++
 .../perf/tez/constraints/query50.q.out          |  242 ++
 .../perf/tez/constraints/query51.q.out          |  222 ++
 .../perf/tez/constraints/query52.q.out          |  139 ++
 .../perf/tez/constraints/query53.q.out          |  161 ++
 .../perf/tez/constraints/query54.q.out          |  439 ++++
 .../perf/tez/constraints/query55.q.out          |  123 ++
 .../perf/tez/constraints/query56.q.out          |  470 ++++
 .../perf/tez/constraints/query57.q.out          |  260 +++
 .../perf/tez/constraints/query58.q.out          |  397 ++++
 .../perf/tez/constraints/query59.q.out          |  234 ++
 .../perf/tez/constraints/query6.q.out           |  236 ++
 .../perf/tez/constraints/query60.q.out          |  496 +++++
 .../perf/tez/constraints/query61.q.out          |  388 ++++
 .../perf/tez/constraints/query63.q.out          |  163 ++
 .../perf/tez/constraints/query64.q.out          |  758 +++++++
 .../perf/tez/constraints/query65.q.out          |  220 ++
 .../perf/tez/constraints/query66.q.out          |  702 ++++++
 .../perf/tez/constraints/query67.q.out          |  196 ++
 .../perf/tez/constraints/query68.q.out          |  254 +++
 .../perf/tez/constraints/query69.q.out          |  359 +++
 .../perf/tez/constraints/query7.q.out           |  171 ++
 .../perf/tez/constraints/query70.q.out          |  216 ++
 .../perf/tez/constraints/query71.q.out          |  297 +++
 .../perf/tez/constraints/query72.q.out          |  297 +++
 .../perf/tez/constraints/query73.q.out          |  197 ++
 .../perf/tez/constraints/query74.q.out          |  397 ++++
 .../perf/tez/constraints/query75.q.out          |  662 ++++++
 .../perf/tez/constraints/query76.q.out          |  197 ++
 .../perf/tez/constraints/query77.q.out          |  504 +++++
 .../perf/tez/constraints/query78.q.out          |  345 +++
 .../perf/tez/constraints/query79.q.out          |  175 ++
 .../perf/tez/constraints/query8.q.out           |  397 ++++
 .../perf/tez/constraints/query80.q.out          |  609 ++++++
 .../perf/tez/constraints/query81.q.out          |  220 ++
 .../perf/tez/constraints/query82.q.out          |  146 ++
 .../perf/tez/constraints/query83.q.out          |  338 +++
 .../perf/tez/constraints/query84.q.out          |  153 ++
 .../perf/tez/constraints/query85.q.out          |  320 +++
 .../perf/tez/constraints/query86.q.out          |  145 ++
 .../perf/tez/constraints/query87.q.out          |  288 +++
 .../perf/tez/constraints/query88.q.out          |  946 ++++++++
 .../perf/tez/constraints/query89.q.out          |  178 ++
 .../perf/tez/constraints/query9.q.out           |  450 ++++
 .../perf/tez/constraints/query90.q.out          |  263 +++
 .../perf/tez/constraints/query91.q.out          |  196 ++
 .../perf/tez/constraints/query92.q.out          |  221 ++
 .../perf/tez/constraints/query93.q.out          |  131 ++
 .../perf/tez/constraints/query94.q.out          |  240 ++
 .../perf/tez/constraints/query95.q.out          |  271 +++
 .../perf/tez/constraints/query96.q.out          |  155 ++
 .../perf/tez/constraints/query97.q.out          |  166 ++
 .../perf/tez/constraints/query98.q.out          |  165 ++
 .../perf/tez/constraints/query99.q.out          |  195 ++
 .../clientpositive/perf/tez/query1.q.out        |   70 +-
 .../clientpositive/perf/tez/query10.q.out       |  390 ++--
 .../clientpositive/perf/tez/query11.q.out       |  502 +++--
 .../clientpositive/perf/tez/query12.q.out       |   46 +-
 .../clientpositive/perf/tez/query13.q.out       |  182 +-
 .../clientpositive/perf/tez/query14.q.out       | 2062 +++++++++---------
 .../clientpositive/perf/tez/query15.q.out       |   54 +-
 .../clientpositive/perf/tez/query16.q.out       |  175 +-
 .../clientpositive/perf/tez/query17.q.out       |  263 ++-
 .../clientpositive/perf/tez/query18.q.out       |  208 +-
 .../clientpositive/perf/tez/query19.q.out       |  182 +-
 .../clientpositive/perf/tez/query2.q.out        |  201 +-
 .../clientpositive/perf/tez/query20.q.out       |   46 +-
 .../clientpositive/perf/tez/query21.q.out       |   44 +-
 .../clientpositive/perf/tez/query22.q.out       |   42 +-
 .../clientpositive/perf/tez/query23.q.out       |  735 +++----
 .../clientpositive/perf/tez/query24.q.out       |  332 ++-
 .../clientpositive/perf/tez/query25.q.out       |  251 ++-
 .../clientpositive/perf/tez/query26.q.out       |  112 +-
 .../clientpositive/perf/tez/query27.q.out       |   96 +-
 .../clientpositive/perf/tez/query28.q.out       |  296 +--
 .../clientpositive/perf/tez/query29.q.out       |  276 +--
 .../clientpositive/perf/tez/query3.q.out        |   40 +-
 .../clientpositive/perf/tez/query30.q.out       |   84 +-
 .../clientpositive/perf/tez/query31.q.out       |  702 +++---
 .../clientpositive/perf/tez/query32.q.out       |  159 +-
 .../clientpositive/perf/tez/query33.q.out       |  400 ++--
 .../clientpositive/perf/tez/query34.q.out       |  178 +-
 .../clientpositive/perf/tez/query35.q.out       |  376 ++--
 .../clientpositive/perf/tez/query36.q.out       |   90 +-
 .../clientpositive/perf/tez/query37.q.out       |  156 +-
 .../clientpositive/perf/tez/query38.q.out       |  190 +-
 .../clientpositive/perf/tez/query39.q.out       |   70 +-
 .../clientpositive/perf/tez/query4.q.out        |  762 ++++---
 .../clientpositive/perf/tez/query40.q.out       |   94 +-
 .../clientpositive/perf/tez/query42.q.out       |   42 +-
 .../clientpositive/perf/tez/query43.q.out       |   44 +-
 .../clientpositive/perf/tez/query44.q.out       |   68 +-
 .../clientpositive/perf/tez/query45.q.out       |  174 +-
 .../clientpositive/perf/tez/query46.q.out       |  212 +-
 .../clientpositive/perf/tez/query47.q.out       |  276 ++-
 .../clientpositive/perf/tez/query48.q.out       |  148 +-
 .../clientpositive/perf/tez/query49.q.out       |  158 +-
 .../clientpositive/perf/tez/query5.q.out        |  302 +--
 .../clientpositive/perf/tez/query50.q.out       |  126 +-
 .../clientpositive/perf/tez/query51.q.out       |   62 +-
 .../clientpositive/perf/tez/query52.q.out       |   42 +-
 .../clientpositive/perf/tez/query53.q.out       |   86 +-
 .../clientpositive/perf/tez/query54.q.out       |  356 ++-
 .../clientpositive/perf/tez/query55.q.out       |   42 +-
 .../clientpositive/perf/tez/query56.q.out       |  140 +-
 .../clientpositive/perf/tez/query57.q.out       |  276 ++-
 .../clientpositive/perf/tez/query58.q.out       |  430 ++--
 .../clientpositive/perf/tez/query59.q.out       |  209 +-
 .../clientpositive/perf/tez/query6.q.out        |  288 ++-
 .../clientpositive/perf/tez/query60.q.out       |  146 +-
 .../clientpositive/perf/tez/query61.q.out       |  180 +-
 .../clientpositive/perf/tez/query63.q.out       |   86 +-
 .../clientpositive/perf/tez/query64.q.out       |  961 ++++----
 .../clientpositive/perf/tez/query65.q.out       |  291 ++-
 .../clientpositive/perf/tez/query66.q.out       |  182 +-
 .../clientpositive/perf/tez/query67.q.out       |  110 +-
 .../clientpositive/perf/tez/query68.q.out       |  212 +-
 .../clientpositive/perf/tez/query69.q.out       |  396 ++--
 .../clientpositive/perf/tez/query7.q.out        |  112 +-
 .../clientpositive/perf/tez/query70.q.out       |  210 +-
 .../clientpositive/perf/tez/query71.q.out       |   98 +-
 .../clientpositive/perf/tez/query72.q.out       |  290 ++-
 .../clientpositive/perf/tez/query73.q.out       |  178 +-
 .../clientpositive/perf/tez/query74.q.out       |  488 ++---
 .../clientpositive/perf/tez/query75.q.out       |  212 +-
 .../clientpositive/perf/tez/query76.q.out       |  237 +-
 .../clientpositive/perf/tez/query77.q.out       |  286 ++-
 .../clientpositive/perf/tez/query78.q.out       |  112 +-
 .../clientpositive/perf/tez/query79.q.out       |  164 +-
 .../clientpositive/perf/tez/query8.q.out        |   96 +-
 .../clientpositive/perf/tez/query80.q.out       |  328 ++-
 .../clientpositive/perf/tez/query81.q.out       |   86 +-
 .../clientpositive/perf/tez/query82.q.out       |  156 +-
 .../clientpositive/perf/tez/query83.q.out       |  286 +--
 .../clientpositive/perf/tez/query84.q.out       |  140 +-
 .../clientpositive/perf/tez/query85.q.out       |  158 +-
 .../clientpositive/perf/tez/query86.q.out       |   78 +-
 .../clientpositive/perf/tez/query87.q.out       |  216 +-
 .../clientpositive/perf/tez/query88.q.out       | 1384 ++++++------
 .../clientpositive/perf/tez/query89.q.out       |   90 +-
 .../clientpositive/perf/tez/query9.q.out        |  132 +-
 .../clientpositive/perf/tez/query90.q.out       |   76 +-
 .../clientpositive/perf/tez/query91.q.out       |   76 +-
 .../clientpositive/perf/tez/query92.q.out       |  165 +-
 .../clientpositive/perf/tez/query93.q.out       |   50 +-
 .../clientpositive/perf/tez/query94.q.out       |  175 +-
 .../clientpositive/perf/tez/query95.q.out       |  412 ++--
 .../clientpositive/perf/tez/query96.q.out       |   50 +-
 .../clientpositive/perf/tez/query97.q.out       |   44 +-
 .../clientpositive/perf/tez/query98.q.out       |   44 +-
 .../clientpositive/perf/tez/query99.q.out       |  126 +-
 507 files changed, 75315 insertions(+), 12182 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/b8299551/data/conf/perf-reg/spark/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/perf-reg/spark/hive-site.xml b/data/conf/perf-reg/spark/hive-site.xml
index e52a2f9..9a17197 100644
--- a/data/conf/perf-reg/spark/hive-site.xml
+++ b/data/conf/perf-reg/spark/hive-site.xml
@@ -144,11 +144,16 @@
 
 <property>
   <name>hive.support.concurrency</name>
-  <value>false</value>
+  <value>true</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>hive.txn.manager</name>
+  <value>org.apache.hadoop.hive.ql.lockmgr.DbTxnManager</value>
+</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>

http://git-wip-us.apache.org/repos/asf/hive/blob/b8299551/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
index 78a5481..7d38be0 100644
--- a/data/conf/perf-reg/tez/hive-site.xml
+++ b/data/conf/perf-reg/tez/hive-site.xml
@@ -168,11 +168,16 @@
 
 <property>
   <name>hive.support.concurrency</name>
-  <value>false</value>
+  <value>true</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>hive.txn.manager</name>
+  <value>org.apache.hadoop.hive.ql.lockmgr.DbTxnManager</value>
+</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>
@@ -292,4 +297,14 @@
   <value>99</value>
 </property>
 
+<property>
+  <name>hive.merge.nway.joins</name>
+  <value>false</value>
+</property>
+
+<property>
+  <name>hive.stats.fetch.column.stats</name>
+  <value>true</value>
+</property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/b8299551/data/scripts/q_perf_test_init.sql
----------------------------------------------------------------------
diff --git a/data/scripts/q_perf_test_init.sql b/data/scripts/q_perf_test_init.sql
index d27215b..020e2d0 100644
--- a/data/scripts/q_perf_test_init.sql
+++ b/data/scripts/q_perf_test_init.sql
@@ -1,5 +1,5 @@
 drop table if exists call_center;
-create external table call_center
+create table call_center
 (
     cc_call_center_sk        int,
     cc_call_center_id        string,
@@ -34,10 +34,10 @@ create external table call_center
     cc_tax_percentage        decimal(5,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 drop table if exists catalog_page;
-create external table catalog_page
+create table catalog_page
 (
     cp_catalog_page_sk       int,
     cp_catalog_page_id       string,
@@ -50,11 +50,11 @@ create external table catalog_page
     cp_type                  string
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists catalog_returns;
-create external table catalog_returns
+create table catalog_returns
 (
     cr_returned_date_sk        int,
     cr_returned_time_sk        int,
@@ -85,11 +85,11 @@ create external table catalog_returns
     cr_net_loss                decimal(7,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists catalog_sales;
-create external table catalog_sales
+create table catalog_sales
 (
     cs_sold_date_sk            int,
     cs_sold_time_sk            int,
@@ -127,11 +127,11 @@ create external table catalog_sales
     cs_net_profit              decimal(7,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists customer;
-create external table customer
+create table customer
 (
     c_customer_sk             int,
     c_customer_id             string,
@@ -153,11 +153,11 @@ create external table customer
     c_last_review_date        string
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists customer_address;
-create external table customer_address
+create table customer_address
 (
     ca_address_sk             int,
     ca_address_id             string,
@@ -174,11 +174,11 @@ create external table customer_address
     ca_location_type          string
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists customer_demographics;
-create external table customer_demographics
+create table customer_demographics
 (
     cd_demo_sk                int,
     cd_gender                 string,
@@ -191,11 +191,11 @@ create external table customer_demographics
     cd_dep_college_count      int 
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists date_dim;
-create external table date_dim
+create table date_dim
 (
     d_date_sk                 int,
     d_date_id                 string,
@@ -227,11 +227,11 @@ create external table date_dim
     d_current_year            string 
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists household_demographics;
-create external table household_demographics
+create table household_demographics
 (
     hd_demo_sk                int,
     hd_income_band_sk         int,
@@ -240,22 +240,22 @@ create external table household_demographics
     hd_vehicle_count          int
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists income_band;
-create external table income_band
+create table income_band
 (
     ib_income_band_sk        int,
     ib_lower_bound           int,
     ib_upper_bound           int
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists inventory;
-create external table inventory
+create table inventory
 (
     inv_date_sk                int,
     inv_item_sk                int,
@@ -263,11 +263,11 @@ create external table inventory
     inv_quantity_on_hand       int
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists item;
-create external table item
+create table item
 (
     i_item_sk                 int,
     i_item_id                 string,
@@ -293,11 +293,11 @@ create external table item
     i_product_name            string
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists promotion;
-create external table promotion
+create table promotion
 (
     p_promo_sk                int,
     p_promo_id                string,
@@ -320,22 +320,22 @@ create external table promotion
     p_discount_active         string 
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists reason;
-create external table reason
+create table reason
 (
     r_reason_sk         int,
     r_reason_id         string,
     r_reason_desc       string
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists ship_mode;
-create external table ship_mode
+create table ship_mode
 (
     sm_ship_mode_sk           int,
     sm_ship_mode_id           string,
@@ -345,11 +345,11 @@ create external table ship_mode
     sm_contract               string
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists store;
-create external table store
+create table store
 (
     s_store_sk                int,
     s_store_id                string,
@@ -382,11 +382,11 @@ create external table store
     s_tax_precentage          decimal(5,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists store_returns;
-create external table store_returns
+create table store_returns
 (
     sr_returned_date_sk      int,
     sr_return_time_sk        int,
@@ -410,11 +410,11 @@ create external table store_returns
     sr_net_loss              decimal(7,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists store_sales;
-create external table store_sales
+create table store_sales
 (
     ss_sold_date_sk           int,
     ss_sold_time_sk           int,
@@ -441,11 +441,11 @@ create external table store_sales
     ss_net_profit             decimal(7,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists time_dim;
-create external table time_dim
+create table time_dim
 (
     t_time_sk                 int,
     t_time_id                 string,
@@ -459,11 +459,11 @@ create external table time_dim
     t_meal_time               string
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists warehouse;
-create external table warehouse
+create table warehouse
 (
     w_warehouse_sk            int,
     w_warehouse_id            string,
@@ -481,11 +481,11 @@ create external table warehouse
     w_gmt_offset              decimal(5,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists web_page;
-create external table web_page
+create table web_page
 (
     wp_web_page_sk           int,
     wp_web_page_id           string,
@@ -503,11 +503,11 @@ create external table web_page
     wp_max_ad_count          int
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists web_returns;
-create external table web_returns
+create table web_returns
 (
     wr_returned_date_sk        int,
     wr_returned_time_sk        int,
@@ -535,11 +535,11 @@ create external table web_returns
     wr_net_loss                decimal(7,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists web_sales;
-create external table web_sales
+create table web_sales
 (
     ws_sold_date_sk           int,
     ws_sold_time_sk           int,
@@ -577,11 +577,11 @@ create external table web_sales
     ws_net_profit             decimal(7,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 
 drop table if exists web_site;
-create external table web_site
+create table web_site
 (
     web_site_sk             int,
     web_site_id             string,
@@ -611,6 +611,6 @@ create external table web_site
     web_tax_percentage      decimal(5,2)
 )
 row format delimited fields terminated by '\t'
-STORED AS ORC tblproperties ("orc.compress"="ZLIB");
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b8299551/data/scripts/q_perf_test_init_constraints.sql
----------------------------------------------------------------------
diff --git a/data/scripts/q_perf_test_init_constraints.sql b/data/scripts/q_perf_test_init_constraints.sql
new file mode 100644
index 0000000..3b3f503
--- /dev/null
+++ b/data/scripts/q_perf_test_init_constraints.sql
@@ -0,0 +1,771 @@
+drop table if exists call_center;
+create table call_center
+(
+    cc_call_center_sk        int,
+    cc_call_center_id        string,
+    cc_rec_start_date        string,
+    cc_rec_end_date          string,
+    cc_closed_date_sk        int,
+    cc_open_date_sk          int,
+    cc_name                  string,
+    cc_class                 string,
+    cc_employees             int,
+    cc_sq_ft                 int,
+    cc_hours                 string,
+    cc_manager               string,
+    cc_mkt_id                int,
+    cc_mkt_class             string,
+    cc_mkt_desc              string,
+    cc_market_manager        string,
+    cc_division              int,
+    cc_division_name         string,
+    cc_company               int,
+    cc_company_name          string,
+    cc_street_number         string,
+    cc_street_name           string,
+    cc_street_type           string,
+    cc_suite_number          string,
+    cc_city                  string,
+    cc_county                string,
+    cc_state                 string,
+    cc_zip                   string,
+    cc_country               string,
+    cc_gmt_offset            decimal(5,2),
+    cc_tax_percentage        decimal(5,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+drop table if exists catalog_page;
+create table catalog_page
+(
+    cp_catalog_page_sk       int,
+    cp_catalog_page_id       string,
+    cp_start_date_sk         int,
+    cp_end_date_sk           int,
+    cp_department            string,
+    cp_catalog_number        int,
+    cp_catalog_page_number   int,
+    cp_description           string,
+    cp_type                  string
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists catalog_returns;
+create table catalog_returns
+(
+    cr_returned_date_sk        int,
+    cr_returned_time_sk        int,
+    cr_item_sk                 int,
+    cr_refunded_customer_sk    int,
+    cr_refunded_cdemo_sk       int,
+    cr_refunded_hdemo_sk       int,
+    cr_refunded_addr_sk        int,
+    cr_returning_customer_sk   int,
+    cr_returning_cdemo_sk      int,
+    cr_returning_hdemo_sk      int,
+    cr_returning_addr_sk       int,
+    cr_call_center_sk          int,
+    cr_catalog_page_sk         int,
+    cr_ship_mode_sk            int,
+    cr_warehouse_sk            int,
+    cr_reason_sk               int,
+    cr_order_number            int,
+    cr_return_quantity         int,
+    cr_return_amount           decimal(7,2),
+    cr_return_tax              decimal(7,2),
+    cr_return_amt_inc_tax      decimal(7,2),
+    cr_fee                     decimal(7,2),
+    cr_return_ship_cost        decimal(7,2),
+    cr_refunded_cash           decimal(7,2),
+    cr_reversed_charge         decimal(7,2),
+    cr_store_credit            decimal(7,2),
+    cr_net_loss                decimal(7,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists catalog_sales;
+create table catalog_sales
+(
+    cs_sold_date_sk            int,
+    cs_sold_time_sk            int,
+    cs_ship_date_sk            int,
+    cs_bill_customer_sk        int,
+    cs_bill_cdemo_sk           int,
+    cs_bill_hdemo_sk           int,
+    cs_bill_addr_sk            int,
+    cs_ship_customer_sk        int,
+    cs_ship_cdemo_sk           int,
+    cs_ship_hdemo_sk           int,
+    cs_ship_addr_sk            int,
+    cs_call_center_sk          int,
+    cs_catalog_page_sk         int,
+    cs_ship_mode_sk            int,
+    cs_warehouse_sk            int,
+    cs_item_sk                 int,
+    cs_promo_sk                int,
+    cs_order_number            int,
+    cs_quantity                int,
+    cs_wholesale_cost          decimal(7,2),
+    cs_list_price              decimal(7,2),
+    cs_sales_price             decimal(7,2),
+    cs_ext_discount_amt        decimal(7,2),
+    cs_ext_sales_price         decimal(7,2),
+    cs_ext_wholesale_cost      decimal(7,2),
+    cs_ext_list_price          decimal(7,2),
+    cs_ext_tax                 decimal(7,2),
+    cs_coupon_amt              decimal(7,2),
+    cs_ext_ship_cost           decimal(7,2),
+    cs_net_paid                decimal(7,2),
+    cs_net_paid_inc_tax        decimal(7,2),
+    cs_net_paid_inc_ship       decimal(7,2),
+    cs_net_paid_inc_ship_tax   decimal(7,2),
+    cs_net_profit              decimal(7,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists customer;
+create table customer
+(
+    c_customer_sk             int,
+    c_customer_id             string,
+    c_current_cdemo_sk        int,
+    c_current_hdemo_sk        int,
+    c_current_addr_sk         int,
+    c_first_shipto_date_sk    int,
+    c_first_sales_date_sk     int,
+    c_salutation              string,
+    c_first_name              string,
+    c_last_name               string,
+    c_preferred_cust_flag     string,
+    c_birth_day               int,
+    c_birth_month             int,
+    c_birth_year              int,
+    c_birth_country           string,
+    c_login                   string,
+    c_email_address           string,
+    c_last_review_date        string
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists customer_address;
+create table customer_address
+(
+    ca_address_sk             int,
+    ca_address_id             string,
+    ca_street_number          string,
+    ca_street_name            string,
+    ca_street_type            string,
+    ca_suite_number           string,
+    ca_city                   string,
+    ca_county                 string,
+    ca_state                  string,
+    ca_zip                    string,
+    ca_country                string,
+    ca_gmt_offset             decimal(5,2),
+    ca_location_type          string
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists customer_demographics;
+create table customer_demographics
+(
+    cd_demo_sk                int,
+    cd_gender                 string,
+    cd_marital_status         string,
+    cd_education_status       string,
+    cd_purchase_estimate      int,
+    cd_credit_rating          string,
+    cd_dep_count              int,
+    cd_dep_employed_count     int,
+    cd_dep_college_count      int 
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists date_dim;
+create table date_dim
+(
+    d_date_sk                 int,
+    d_date_id                 string,
+    d_date                    string,
+    d_month_seq               int,
+    d_week_seq                int,
+    d_quarter_seq             int,
+    d_year                    int,
+    d_dow                     int,
+    d_moy                     int,
+    d_dom                     int,
+    d_qoy                     int,
+    d_fy_year                 int,
+    d_fy_quarter_seq          int,
+    d_fy_week_seq             int,
+    d_day_name                string,
+    d_quarter_name            string,
+    d_holiday                 string,
+    d_weekend                 string,
+    d_following_holiday       string,
+    d_first_dom               int,
+    d_last_dom                int,
+    d_same_day_ly             int,
+    d_same_day_lq             int,
+    d_current_day             string,
+    d_current_week            string,
+    d_current_month           string,
+    d_current_quarter         string,
+    d_current_year            string 
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists household_demographics;
+create table household_demographics
+(
+    hd_demo_sk                int,
+    hd_income_band_sk         int,
+    hd_buy_potential          string,
+    hd_dep_count              int,
+    hd_vehicle_count          int
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists income_band;
+create table income_band
+(
+    ib_income_band_sk        int,
+    ib_lower_bound           int,
+    ib_upper_bound           int
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists inventory;
+create table inventory
+(
+    inv_date_sk                int,
+    inv_item_sk                int,
+    inv_warehouse_sk           int,
+    inv_quantity_on_hand       int
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists item;
+create table item
+(
+    i_item_sk                 int,
+    i_item_id                 string,
+    i_rec_start_date          string,
+    i_rec_end_date            string,
+    i_item_desc               string,
+    i_current_price           decimal(7,2),
+    i_wholesale_cost          decimal(7,2),
+    i_brand_id                int,
+    i_brand                   string,
+    i_class_id                int,
+    i_class                   string,
+    i_category_id             int,
+    i_category                string,
+    i_manufact_id             int,
+    i_manufact                string,
+    i_size                    string,
+    i_formulation             string,
+    i_color                   string,
+    i_units                   string,
+    i_container               string,
+    i_manager_id              int,
+    i_product_name            string
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists promotion;
+create table promotion
+(
+    p_promo_sk                int,
+    p_promo_id                string,
+    p_start_date_sk           int,
+    p_end_date_sk             int,
+    p_item_sk                 int,
+    p_cost                    decimal(15,2),
+    p_response_target         int,
+    p_promo_name              string,
+    p_channel_dmail           string,
+    p_channel_email           string,
+    p_channel_catalog         string,
+    p_channel_tv              string,
+    p_channel_radio           string,
+    p_channel_press           string,
+    p_channel_event           string,
+    p_channel_demo            string,
+    p_channel_details         string,
+    p_purpose                 string,
+    p_discount_active         string 
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists reason;
+create table reason
+(
+    r_reason_sk         int,
+    r_reason_id         string,
+    r_reason_desc       string
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists ship_mode;
+create table ship_mode
+(
+    sm_ship_mode_sk           int,
+    sm_ship_mode_id           string,
+    sm_type                   string,
+    sm_code                   string,
+    sm_carrier                string,
+    sm_contract               string
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists store;
+create table store
+(
+    s_store_sk                int,
+    s_store_id                string,
+    s_rec_start_date          string,
+    s_rec_end_date            string,
+    s_closed_date_sk          int,
+    s_store_name              string,
+    s_number_employees        int,
+    s_floor_space             int,
+    s_hours                   string,
+    s_manager                 string,
+    s_market_id               int,
+    s_geography_class         string,
+    s_market_desc             string,
+    s_market_manager          string,
+    s_division_id             int,
+    s_division_name           string,
+    s_company_id              int,
+    s_company_name            string,
+    s_street_number           string,
+    s_street_name             string,
+    s_street_type             string,
+    s_suite_number            string,
+    s_city                    string,
+    s_county                  string,
+    s_state                   string,
+    s_zip                     string,
+    s_country                 string,
+    s_gmt_offset              decimal(5,2),
+    s_tax_precentage          decimal(5,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists store_returns;
+create table store_returns
+(
+    sr_returned_date_sk      int,
+    sr_return_time_sk        int,
+    sr_item_sk               int,
+    sr_customer_sk           int,
+    sr_cdemo_sk              int,
+    sr_hdemo_sk              int,
+    sr_addr_sk               int,
+    sr_store_sk              int,
+    sr_reason_sk             int,
+    sr_ticket_number         int,
+    sr_return_quantity       int,
+    sr_return_amt            decimal(7,2),
+    sr_return_tax            decimal(7,2),
+    sr_return_amt_inc_tax    decimal(7,2),
+    sr_fee                   decimal(7,2),
+    sr_return_ship_cost      decimal(7,2),
+    sr_refunded_cash         decimal(7,2),
+    sr_reversed_charge       decimal(7,2),
+    sr_store_credit          decimal(7,2),
+    sr_net_loss              decimal(7,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists store_sales;
+create table store_sales
+(
+    ss_sold_date_sk           int,
+    ss_sold_time_sk           int,
+    ss_item_sk                int,
+    ss_customer_sk            int,
+    ss_cdemo_sk               int,
+    ss_hdemo_sk               int,
+    ss_addr_sk                int,
+    ss_store_sk               int,
+    ss_promo_sk               int,
+    ss_ticket_number          int,
+    ss_quantity               int,
+    ss_wholesale_cost         decimal(7,2),
+    ss_list_price             decimal(7,2),
+    ss_sales_price            decimal(7,2),
+    ss_ext_discount_amt       decimal(7,2),
+    ss_ext_sales_price        decimal(7,2),
+    ss_ext_wholesale_cost     decimal(7,2),
+    ss_ext_list_price         decimal(7,2),
+    ss_ext_tax                decimal(7,2),
+    ss_coupon_amt             decimal(7,2),
+    ss_net_paid               decimal(7,2),
+    ss_net_paid_inc_tax       decimal(7,2),
+    ss_net_profit             decimal(7,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists time_dim;
+create table time_dim
+(
+    t_time_sk                 int,
+    t_time_id                 string,
+    t_time                    int,
+    t_hour                    int,
+    t_minute                  int,
+    t_second                  int,
+    t_am_pm                   string,
+    t_shift                   string,
+    t_sub_shift               string,
+    t_meal_time               string
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists warehouse;
+create table warehouse
+(
+    w_warehouse_sk            int,
+    w_warehouse_id            string,
+    w_warehouse_name          string,
+    w_warehouse_sq_ft         int,
+    w_street_number           string,
+    w_street_name             string,
+    w_street_type             string,
+    w_suite_number            string,
+    w_city                    string,
+    w_county                  string,
+    w_state                   string,
+    w_zip                     string,
+    w_country                 string,
+    w_gmt_offset              decimal(5,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists web_page;
+create table web_page
+(
+    wp_web_page_sk           int,
+    wp_web_page_id           string,
+    wp_rec_start_date        string,
+    wp_rec_end_date          string,
+    wp_creation_date_sk      int,
+    wp_access_date_sk        int,
+    wp_autogen_flag          string,
+    wp_customer_sk           int,
+    wp_url                   string,
+    wp_type                  string,
+    wp_char_count            int,
+    wp_link_count            int,
+    wp_image_count           int,
+    wp_max_ad_count          int
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists web_returns;
+create table web_returns
+(
+    wr_returned_date_sk        int,
+    wr_returned_time_sk        int,
+    wr_item_sk                 int,
+    wr_refunded_customer_sk    int,
+    wr_refunded_cdemo_sk       int,
+    wr_refunded_hdemo_sk       int,
+    wr_refunded_addr_sk        int,
+    wr_returning_customer_sk   int,
+    wr_returning_cdemo_sk      int,
+    wr_returning_hdemo_sk      int,
+    wr_returning_addr_sk       int,
+    wr_web_page_sk             int,
+    wr_reason_sk               int,
+    wr_order_number            int,
+    wr_return_quantity         int,
+    wr_return_amt              decimal(7,2),
+    wr_return_tax              decimal(7,2),
+    wr_return_amt_inc_tax      decimal(7,2),
+    wr_fee                     decimal(7,2),
+    wr_return_ship_cost        decimal(7,2),
+    wr_refunded_cash           decimal(7,2),
+    wr_reversed_charge         decimal(7,2),
+    wr_account_credit          decimal(7,2),
+    wr_net_loss                decimal(7,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists web_sales;
+create table web_sales
+(
+    ws_sold_date_sk           int,
+    ws_sold_time_sk           int,
+    ws_ship_date_sk           int,
+    ws_item_sk                int,
+    ws_bill_customer_sk       int,
+    ws_bill_cdemo_sk          int,
+    ws_bill_hdemo_sk          int,
+    ws_bill_addr_sk           int,
+    ws_ship_customer_sk       int,
+    ws_ship_cdemo_sk          int,
+    ws_ship_hdemo_sk          int,
+    ws_ship_addr_sk           int,
+    ws_web_page_sk            int,
+    ws_web_site_sk            int,
+    ws_ship_mode_sk           int,
+    ws_warehouse_sk           int,
+    ws_promo_sk               int,
+    ws_order_number           int,
+    ws_quantity               int,
+    ws_wholesale_cost         decimal(7,2),
+    ws_list_price             decimal(7,2),
+    ws_sales_price            decimal(7,2),
+    ws_ext_discount_amt       decimal(7,2),
+    ws_ext_sales_price        decimal(7,2),
+    ws_ext_wholesale_cost     decimal(7,2),
+    ws_ext_list_price         decimal(7,2),
+    ws_ext_tax                decimal(7,2),
+    ws_coupon_amt             decimal(7,2),
+    ws_ext_ship_cost          decimal(7,2),
+    ws_net_paid               decimal(7,2),
+    ws_net_paid_inc_tax       decimal(7,2),
+    ws_net_paid_inc_ship      decimal(7,2),
+    ws_net_paid_inc_ship_tax  decimal(7,2),
+    ws_net_profit             decimal(7,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+drop table if exists web_site;
+create table web_site
+(
+    web_site_sk             int,
+    web_site_id             string,
+    web_rec_start_date      string,
+    web_rec_end_date        string,
+    web_name                string,
+    web_open_date_sk        int,
+    web_close_date_sk       int,
+    web_class               string,
+    web_manager             string,
+    web_mkt_id              int,
+    web_mkt_class           string,
+    web_mkt_desc            string,
+    web_market_manager      string,
+    web_company_id          int,
+    web_company_name        string,
+    web_street_number       string,
+    web_street_name         string,
+    web_street_type         string,
+    web_suite_number        string,
+    web_city                string,
+    web_county              string,
+    web_state               string,
+    web_zip                 string,
+    web_country             string,
+    web_gmt_offset          decimal(5,2),
+    web_tax_percentage      decimal(5,2)
+)
+row format delimited fields terminated by '\t'
+STORED AS ORC tblproperties ("transactional"="true", "orc.compress"="ZLIB");
+
+
+-- CONSTRAINTS
+alter table customer_address add constraint pk_ca primary key (ca_address_sk) disable novalidate rely;
+alter table customer_demographics add constraint pk_cd primary key (cd_demo_sk) disable novalidate rely;
+alter table date_dim add constraint pk_dd primary key (d_date_sk) disable novalidate rely;
+alter table warehouse add constraint pk_w primary key (w_warehouse_sk) disable novalidate rely;
+alter table ship_mode add constraint pk_sm primary key (sm_ship_mode_sk) disable novalidate rely;
+alter table time_dim add constraint pk_td primary key (t_time_sk) disable novalidate rely;
+alter table reason add constraint pk_r primary key (r_reason_sk) disable novalidate rely;
+alter table income_band add constraint pk_ib primary key (ib_income_band_sk) disable novalidate rely;
+alter table item add constraint pk_i primary key (i_item_sk) disable novalidate rely;
+alter table store add constraint pk_s primary key (s_store_sk) disable novalidate rely;
+alter table call_center add constraint pk_cc primary key (cc_call_center_sk) disable novalidate rely;
+alter table customer add constraint pk_c primary key (c_customer_sk) disable novalidate rely;
+alter table web_site add constraint pk_ws primary key (web_site_sk) disable novalidate rely;
+alter table store_returns add constraint pk_sr primary key (sr_item_sk, sr_ticket_number) disable novalidate rely;
+alter table household_demographics add constraint pk_hd primary key (hd_demo_sk) disable novalidate rely;
+alter table web_page add constraint pk_wp primary key (wp_web_page_sk) disable novalidate rely;
+alter table promotion add constraint pk_p primary key (p_promo_sk) disable novalidate rely;
+alter table catalog_page add constraint pk_cp primary key (cp_catalog_page_sk) disable novalidate rely;
+-- partition_col case
+alter table inventory add constraint pk_in primary key (inv_date_sk, inv_item_sk, inv_warehouse_sk) disable novalidate rely;
+alter table catalog_returns add constraint pk_cr primary key (cr_item_sk, cr_order_number) disable novalidate rely;
+alter table web_returns add constraint pk_wr primary key (wr_item_sk, wr_order_number) disable novalidate rely;
+alter table web_sales add constraint pk_ws2 primary key (ws_item_sk, ws_order_number) disable novalidate rely;
+alter table catalog_sales add constraint pk_cs primary key (cs_item_sk, cs_order_number) disable novalidate rely;
+alter table store_sales add constraint pk_ss primary key (ss_item_sk, ss_ticket_number) disable novalidate rely;
+
+alter table call_center add constraint cc_d1 foreign key  (cc_closed_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table call_center add constraint cc_d2 foreign key  (cc_open_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table catalog_page add constraint cp_d1 foreign key  (cp_end_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table catalog_page add constraint cp_d2 foreign key  (cp_start_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_cc foreign key  (cr_call_center_sk) references call_center (cc_call_center_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_cp foreign key  (cr_catalog_page_sk) references catalog_page (cp_catalog_page_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_cs foreign key  (cr_item_sk, cr_order_number) references catalog_sales (cs_item_sk, cs_order_number) disable novalidate rely;
+alter table catalog_returns add constraint cr_i foreign key  (cr_item_sk) references item (i_item_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_r foreign key  (cr_reason_sk) references reason (r_reason_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_a1 foreign key  (cr_refunded_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_cd1 foreign key  (cr_refunded_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_c1 foreign key  (cr_refunded_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_hd1 foreign key  (cr_refunded_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+-- partition_col case
+alter table catalog_returns add constraint cr_d1 foreign key  (cr_returned_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_t foreign key  (cr_returned_time_sk) references time_dim (t_time_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_a2 foreign key  (cr_returning_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_cd2 foreign key  (cr_returning_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_c2 foreign key  (cr_returning_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_hd2 foreign key  (cr_returning_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+-- alter table catalog_returns add constraint cr_d2 foreign key  (cr_ship_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_sm foreign key  (cr_ship_mode_sk) references ship_mode (sm_ship_mode_sk) disable novalidate rely;
+alter table catalog_returns add constraint cr_w2 foreign key  (cr_warehouse_sk) references warehouse (w_warehouse_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_b_a foreign key  (cs_bill_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_b_cd foreign key  (cs_bill_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_b_c foreign key  (cs_bill_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_b_hd foreign key  (cs_bill_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_cc foreign key  (cs_call_center_sk) references call_center (cc_call_center_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_cp foreign key  (cs_catalog_page_sk) references catalog_page (cp_catalog_page_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_i foreign key  (cs_item_sk) references item (i_item_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_p foreign key  (cs_promo_sk) references promotion (p_promo_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_s_a foreign key  (cs_ship_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_s_cd foreign key  (cs_ship_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_s_c foreign key  (cs_ship_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_d1 foreign key  (cs_ship_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_s_hd foreign key  (cs_ship_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_sm foreign key  (cs_ship_mode_sk) references ship_mode (sm_ship_mode_sk) disable novalidate rely;
+-- partition_col case
+alter table catalog_sales add constraint cs_d2 foreign key  (cs_sold_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_t foreign key  (cs_sold_time_sk) references time_dim (t_time_sk) disable novalidate rely;
+alter table catalog_sales add constraint cs_w foreign key  (cs_warehouse_sk) references warehouse (w_warehouse_sk) disable novalidate rely;
+alter table customer add constraint c_a foreign key  (c_current_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table customer add constraint c_cd foreign key  (c_current_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table customer add constraint c_hd foreign key  (c_current_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+alter table customer add constraint c_fsd foreign key  (c_first_sales_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table customer add constraint c_fsd2 foreign key  (c_first_shipto_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table household_demographics add constraint hd_ib foreign key  (hd_income_band_sk) references income_band (ib_income_band_sk) disable novalidate rely;
+-- partition_col case
+alter table inventory add constraint inv_d foreign key  (inv_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table inventory add constraint inv_i foreign key  (inv_item_sk) references item (i_item_sk) disable novalidate rely;
+alter table inventory add constraint inv_w foreign key  (inv_warehouse_sk) references warehouse (w_warehouse_sk) disable novalidate rely;
+alter table promotion add constraint p_end_date foreign key  (p_end_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table promotion add constraint p_i foreign key  (p_item_sk) references item (i_item_sk) disable novalidate rely;
+alter table promotion add constraint p_start_date foreign key  (p_start_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table store add constraint s_close_date foreign key  (s_closed_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table store_returns add constraint sr_a foreign key  (sr_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table store_returns add constraint sr_cd foreign key  (sr_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table store_returns add constraint sr_c foreign key  (sr_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table store_returns add constraint sr_hd foreign key  (sr_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+alter table store_returns add constraint sr_i foreign key  (sr_item_sk) references item (i_item_sk) disable novalidate rely;
+alter table store_returns add constraint sr_r foreign key  (sr_reason_sk) references reason (r_reason_sk) disable novalidate rely;
+-- partition_col case
+alter table store_returns add constraint sr_ret_d foreign key  (sr_returned_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table store_returns add constraint sr_t foreign key  (sr_return_time_sk) references time_dim (t_time_sk) disable novalidate rely;
+alter table store_returns add constraint sr_s foreign key  (sr_store_sk) references store (s_store_sk) disable novalidate rely;
+alter table store_returns add constraint sr_ss foreign key  (sr_item_sk, sr_ticket_number) references store_sales (ss_item_sk, ss_ticket_number) disable novalidate rely;
+alter table store_sales add constraint ss_a foreign key  (ss_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table store_sales add constraint ss_cd foreign key  (ss_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table store_sales add constraint ss_c foreign key  (ss_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table store_sales add constraint ss_hd foreign key  (ss_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+alter table store_sales add constraint ss_i foreign key  (ss_item_sk) references item (i_item_sk) disable novalidate rely;
+alter table store_sales add constraint ss_p foreign key  (ss_promo_sk) references promotion (p_promo_sk) disable novalidate rely;
+-- partition_col case
+alter table store_sales add constraint ss_d foreign key  (ss_sold_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table store_sales add constraint ss_t foreign key  (ss_sold_time_sk) references time_dim (t_time_sk) disable novalidate rely;
+alter table store_sales add constraint ss_s foreign key  (ss_store_sk) references store (s_store_sk) disable novalidate rely;
+alter table web_page add constraint wp_ad foreign key  (wp_access_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table web_page add constraint wp_cd foreign key  (wp_creation_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table web_returns add constraint wr_i foreign key  (wr_item_sk) references item (i_item_sk) disable novalidate rely;
+alter table web_returns add constraint wr_r foreign key  (wr_reason_sk) references reason (r_reason_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ref_a foreign key  (wr_refunded_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ref_cd foreign key  (wr_refunded_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ref_c foreign key  (wr_refunded_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ref_hd foreign key  (wr_refunded_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+-- partition_col case
+alter table web_returns add constraint wr_ret_d foreign key  (wr_returned_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ret_t foreign key  (wr_returned_time_sk) references time_dim (t_time_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ret_a foreign key  (wr_returning_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ret_cd foreign key  (wr_returning_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ret_c foreign key  (wr_returning_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ret_hd foreign key  (wr_returning_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+alter table web_returns add constraint wr_ws foreign key  (wr_item_sk, wr_order_number) references web_sales (ws_item_sk, ws_order_number) disable novalidate rely;
+alter table web_returns add constraint wr_wp foreign key  (wr_web_page_sk) references web_page (wp_web_page_sk) disable novalidate rely;
+alter table web_sales add constraint ws_b_a foreign key  (ws_bill_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table web_sales add constraint ws_b_cd foreign key  (ws_bill_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table web_sales add constraint ws_b_c foreign key  (ws_bill_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table web_sales add constraint ws_b_hd foreign key  (ws_bill_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+alter table web_sales add constraint ws_i foreign key  (ws_item_sk) references item (i_item_sk) disable novalidate rely;
+alter table web_sales add constraint ws_p foreign key  (ws_promo_sk) references promotion (p_promo_sk) disable novalidate rely;
+alter table web_sales add constraint ws_s_a foreign key  (ws_ship_addr_sk) references customer_address (ca_address_sk) disable novalidate rely;
+alter table web_sales add constraint ws_s_cd foreign key  (ws_ship_cdemo_sk) references customer_demographics (cd_demo_sk) disable novalidate rely;
+alter table web_sales add constraint ws_s_c foreign key  (ws_ship_customer_sk) references customer (c_customer_sk) disable novalidate rely;
+alter table web_sales add constraint ws_s_d foreign key  (ws_ship_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table web_sales add constraint ws_s_hd foreign key  (ws_ship_hdemo_sk) references household_demographics (hd_demo_sk) disable novalidate rely;
+alter table web_sales add constraint ws_sm foreign key  (ws_ship_mode_sk) references ship_mode (sm_ship_mode_sk) disable novalidate rely;
+-- partition_col case
+alter table web_sales add constraint ws_d2 foreign key  (ws_sold_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table web_sales add constraint ws_t foreign key  (ws_sold_time_sk) references time_dim (t_time_sk) disable novalidate rely;
+alter table web_sales add constraint ws_w2 foreign key  (ws_warehouse_sk) references warehouse (w_warehouse_sk) disable novalidate rely;
+alter table web_sales add constraint ws_wp foreign key  (ws_web_page_sk) references web_page (wp_web_page_sk) disable novalidate rely;
+alter table web_sales add constraint ws_ws foreign key  (ws_web_site_sk) references web_site (web_site_sk) disable novalidate rely;
+alter table web_site add constraint web_d1 foreign key  (web_close_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+alter table web_site add constraint web_d2 foreign key (web_open_date_sk) references date_dim (d_date_sk) disable novalidate rely;
+
+alter table store change column s_store_id s_store_id string constraint strid_nn not null disable novalidate rely;
+alter table call_center change column cc_call_center_id cc_call_center_id string constraint ccid_nn not null disable novalidate rely;
+alter table catalog_page change column cp_catalog_page_id cp_catalog_page_id string constraint cpid_nn not null disable novalidate rely;
+alter table web_site change column web_site_id web_site_id string constraint wsid_nn not null disable novalidate rely;
+alter table web_page change column wp_web_page_id wp_web_page_id string constraint wpid_nn not null disable novalidate rely;
+alter table warehouse change column w_warehouse_id w_warehouse_id string constraint wid_nn not null disable novalidate rely;
+alter table customer change column c_customer_id c_customer_id string constraint cid_nn not null disable novalidate rely;
+alter table customer_address change column ca_address_id ca_address_id string constraint caid_nn not null disable novalidate rely;
+alter table date_dim change column d_date_id d_date_id string constraint did_nn not null disable novalidate rely;
+alter table item change column i_item_id i_item_id string constraint itid_nn not null disable novalidate rely;
+alter table promotion change column p_promo_id p_promo_id string constraint pid_nn not null disable novalidate rely;
+alter table reason change column r_reason_id r_reason_id string constraint rid_nn not null disable novalidate rely;
+alter table ship_mode change column sm_ship_mode_id sm_ship_mode_id string constraint smid_nn not null disable novalidate rely;
+alter table time_dim change column t_time_id t_time_id string constraint tid_nn not null disable novalidate rely;

http://git-wip-us.apache.org/repos/asf/hive/blob/b8299551/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfCliDriver.java
----------------------------------------------------------------------
diff --git a/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfCliDriver.java b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfCliDriver.java
index 98ceb21..18a470f 100644
--- a/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfCliDriver.java
+++ b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfCliDriver.java
@@ -34,7 +34,7 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(Parameterized.class)
 public class TestTezPerfCliDriver {
 
-  static CliAdapter adapter = new CliConfigs.TezPerfCliConfig().getCliAdapter();
+  static CliAdapter adapter = new CliConfigs.TezPerfCliConfig(false).getCliAdapter();
 
   @Parameters(name = "{0}")
   public static List<Object[]> getParameters() throws Exception {

http://git-wip-us.apache.org/repos/asf/hive/blob/b8299551/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfConstraintsCliDriver.java
----------------------------------------------------------------------
diff --git a/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfConstraintsCliDriver.java b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfConstraintsCliDriver.java
new file mode 100644
index 0000000..5881353
--- /dev/null
+++ b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestTezPerfConstraintsCliDriver.java
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+package org.apache.hadoop.hive.cli;
+
+import java.io.File;
+import java.util.Comparator;
+import java.util.List;
+import org.apache.hadoop.hive.cli.control.CliAdapter;
+import org.apache.hadoop.hive.cli.control.CliConfigs;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class TestTezPerfConstraintsCliDriver {
+
+  static CliAdapter adapter = new CliConfigs.TezPerfCliConfig(true).getCliAdapter();
+
+  @Parameters(name = "{0}")
+  public static List<Object[]> getParameters() throws Exception {
+    List<Object[]> parameters = adapter.getParameters();
+    parameters.sort(new C1());
+    return parameters;
+  }
+
+  static class C1 implements Comparator<Object[]> {
+
+    @Override
+    public int compare(Object[] o1, Object[] o2) {
+      return o1[0].toString().compareTo(o2[0].toString());
+    }
+
+  }
+
+  @ClassRule
+  public static TestRule cliClassRule = adapter.buildClassRule();
+
+  @Rule
+  public TestRule cliTestRule = adapter.buildTestRule();
+
+  private String name;
+  private File qfile;
+
+  public TestTezPerfConstraintsCliDriver(String name, File qfile) {
+    this.name = name;
+    this.qfile = qfile;
+  }
+
+  @Test
+  public void testCliDriver() throws Exception {
+    adapter.runTest(name, qfile);
+  }
+
+}