HIVE-11979 : LLAP: merge master into branch (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/bf8acfb3 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/bf8acfb3 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/bf8acfb3 Branch: refs/heads/master Commit: bf8acfb3bbe997a9b8c474990889c5cbcb2fbb0f Parents: 434b7d4 1cf7e25 Author: Sergey Shelukhin <[email protected]> Authored: Mon Sep 28 12:11:04 2015 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Mon Sep 28 12:11:04 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hive/beeline/BeeLine.java | 300 +++++++++--- .../org/apache/hive/beeline/BeeLineOpts.java | 43 +- .../hive/beeline/ClientCommandHookFactory.java | 85 ++++ .../org/apache/hive/beeline/ClientHook.java | 33 ++ .../java/org/apache/hive/beeline/Commands.java | 486 ++++++++++++++----- .../org/apache/hive/beeline/HiveSchemaTool.java | 22 +- .../hive/beeline/cli/CliOptionsProcessor.java | 104 ++++ .../org/apache/hive/beeline/cli/HiveCli.java | 37 ++ .../beeline/TestClientCommandHookFactory.java | 32 ++ .../apache/hive/beeline/cli/TestHiveCli.java | 289 +++++++++++ beeline/src/test/resources/hive-site.xml | 37 ++ bin/beeline | 5 + bin/ext/cli.cmd | 39 +- bin/ext/cli.sh | 35 +- bin/ext/util/execHiveCmd.sh | 6 +- .../org/apache/hadoop/hive/cli/CliDriver.java | 24 +- .../hadoop/hive/conf/HiveVariableSource.java | 24 + .../hadoop/hive/conf/VariableSubstitution.java | 70 +++ .../hive/conf/TestVariableSubstitution.java | 63 +++ .../listener/TestNotificationListener.java | 4 +- .../hcatalog/templeton/tool/LaunchMapper.java | 7 +- .../org/apache/hive/jdbc/HiveConnection.java | 63 ++- .../java/org/apache/hadoop/hive/ql/Driver.java | 10 +- .../apache/hadoop/hive/ql/metadata/Hive.java | 25 +- .../formatting/MetaDataPrettyFormatUtils.java | 24 +- .../correlation/ReduceSinkDeDuplication.java | 15 +- .../ql/parse/ColumnStatsSemanticAnalyzer.java | 14 +- .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 2 +- .../hive/ql/parse/VariableSubstitution.java | 60 --- .../ql/processors/AddResourceProcessor.java | 11 +- .../hive/ql/processors/CompileProcessor.java | 11 +- .../ql/processors/DeleteResourceProcessor.java | 11 +- .../hadoop/hive/ql/processors/DfsProcessor.java | 11 +- .../hadoop/hive/ql/processors/SetProcessor.java | 32 +- .../hadoop/hive/ql/session/SessionState.java | 21 + .../clientpositive/insertvalues_espchars.q | 5 + .../queries/clientpositive/join_grp_diff_keys.q | 21 + .../clientpositive/describe_pretty.q.out | 366 +++++++------- .../clientpositive/insertvalues_espchars.q.out | 30 ++ .../clientpositive/join_grp_diff_keys.q.out | 190 ++++++++ .../hive/serde2/avro/AvroDeserializer.java | 2 +- .../hadoop/hive/serde2/avro/AvroSerDe.java | 13 +- .../hadoop/hive/serde2/avro/AvroSerdeUtils.java | 7 +- .../hadoop/hive/serde2/avro/AvroSerializer.java | 2 - .../cli/operation/HiveCommandOperation.java | 18 +- .../service/cli/operation/SQLOperation.java | 14 +- 46 files changed, 2178 insertions(+), 545 deletions(-) ----------------------------------------------------------------------
