hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sp...@apache.org
Subject [48/50] [abbrv] hive git commit: Merge branch 'master' into llap
Date Fri, 06 May 2016 20:43:19 GMT
Merge branch 'master' into llap


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

Branch: refs/heads/java8
Commit: f089f2e64241592ecf8144d044bec8a0659ff422
Parents: 89ec219 3f07bfc
Author: Jason Dere <jdere@hortonworks.com>
Authored: Fri May 6 10:14:21 2016 -0700
Committer: Jason Dere <jdere@hortonworks.com>
Committed: Fri May 6 10:14:21 2016 -0700

----------------------------------------------------------------------
 beeline/src/main/resources/BeeLine.properties   |   9 +-
 cli/pom.xml                                     |   6 +
 common/pom.xml                                  |   6 +
 .../org/apache/hadoop/hive/common/LogUtils.java |  35 +-
 .../org/apache/hadoop/hive/conf/HiveConf.java   |   8 +
 .../src/main/resources/hive-log4j2.properties   |   2 +-
 .../hadoop/hive/conf/TestHiveAsyncLogging.java  |  49 ++
 data/conf/hive-log4j2.properties                |   2 +-
 hcatalog/core/pom.xml                           |   6 +
 .../hive/metastore/TestHiveMetaStoreTxns.java   |   2 +-
 llap-server/bin/llapDaemon.sh                   |   2 +-
 .../hadoop/hive/llap/cli/LlapServiceDriver.java |  21 +-
 .../hive/llap/daemon/impl/LlapDaemon.java       |  10 +-
 ...doop-metrics2-llapdaemon.properties.template |  50 ++
 ...trics2-llaptaskscheduler.properties.template |  50 ++
 .../hadoop-metrics2.properties.template         |  50 --
 .../main/resources/llap-cli-log4j2.properties   |   2 +-
 .../resources/llap-daemon-log4j2.properties     |   4 +-
 llap-server/src/main/resources/package.py       |   6 +-
 .../resources/llap-daemon-log4j2.properties     |   4 +-
 .../tezplugins/LlapTaskSchedulerService.java    |   2 +-
 .../metrics/LlapTaskSchedulerMetrics.java       |   6 +-
 metastore/pom.xml                               |   6 +
 .../upgrade/derby/035-HIVE-13395.derby.sql      |  11 +
 .../upgrade/derby/hive-schema-2.1.0.derby.sql   |   2 +-
 .../derby/hive-txn-schema-1.3.0.derby.sql       |  11 +-
 .../derby/hive-txn-schema-2.1.0.derby.sql       | 130 ++++
 .../derby/upgrade-1.2.0-to-1.3.0.derby.sql      |   1 +
 .../derby/upgrade-2.0.0-to-2.1.0.derby.sql      |   1 +
 .../upgrade/mssql/020-HIVE-13395.mssql.sql      |   9 +
 .../upgrade/mssql/hive-schema-1.3.0.mssql.sql   |  12 +-
 .../upgrade/mssql/hive-schema-2.1.0.mssql.sql   |  12 +-
 .../mssql/upgrade-1.2.0-to-1.3.0.mssql.sql      |   1 +
 .../mssql/upgrade-2.0.0-to-2.1.0.mssql.sql      |   1 +
 .../upgrade/mysql/035-HIVE-13395.mysql.sql      |  10 +
 .../upgrade/mysql/hive-schema-2.1.0.mysql.sql   |   2 +-
 .../mysql/hive-txn-schema-1.3.0.mysql.sql       |  10 +
 .../mysql/hive-txn-schema-2.1.0.mysql.sql       | 131 ++++
 .../mysql/upgrade-1.2.0-to-1.3.0.mysql.sql      |   1 +
 .../mysql/upgrade-2.0.0-to-2.1.0.mysql.sql      |   1 +
 .../upgrade/oracle/035-HIVE-13395.oracle.sql    |  10 +
 .../upgrade/oracle/hive-schema-2.1.0.oracle.sql |   2 +-
 .../oracle/hive-txn-schema-1.3.0.oracle.sql     |  12 +-
 .../oracle/hive-txn-schema-2.1.0.oracle.sql     | 129 ++++
 .../oracle/upgrade-1.2.0-to-1.3.0.oracle.sql    |   1 +
 .../oracle/upgrade-2.0.0-to-2.1.0.oracle.sql    |   1 +
 .../postgres/034-HIVE-13395.postgres.sql        |  10 +
 .../postgres/hive-schema-2.1.0.postgres.sql     |   2 +-
 .../postgres/hive-txn-schema-1.3.0.postgres.sql |  11 +-
 .../postgres/hive-txn-schema-2.1.0.postgres.sql | 129 ++++
 .../upgrade-1.2.0-to-1.3.0.postgres.sql         |   1 +
 .../upgrade-2.0.0-to-2.1.0.postgres.sql         |   1 +
 .../hadoop/hive/metastore/HiveMetaStore.java    |   1 +
 .../hadoop/hive/metastore/txn/TxnDbUtil.java    | 130 ++--
 .../hadoop/hive/metastore/txn/TxnHandler.java   | 466 +++++++++++---
 .../hadoop/hive/metastore/txn/TxnStore.java     |   8 +-
 .../hadoop/hive/metastore/txn/TxnUtils.java     |   2 +
 .../metastore/txn/TestCompactionTxnHandler.java |   6 +-
 .../hive/metastore/txn/TestTxnHandler.java      |  29 +-
 pom.xml                                         |   2 +
 ql/pom.xml                                      |   6 +
 .../java/org/apache/hadoop/hive/ql/Driver.java  |  11 +-
 .../org/apache/hadoop/hive/ql/ErrorMsg.java     |   2 +-
 .../hadoop/hive/ql/exec/OperatorUtils.java      |   2 +-
 .../org/apache/hadoop/hive/ql/exec/Task.java    |  21 +-
 .../apache/hadoop/hive/ql/exec/TaskResult.java  |   7 +-
 .../apache/hadoop/hive/ql/exec/TaskRunner.java  |   5 +-
 .../hive/ql/exec/mr/HadoopJobExecHelper.java    |   1 +
 .../hadoop/hive/ql/exec/mr/JobDebugger.java     |  18 +-
 .../hadoop/hive/ql/lockmgr/DbLockManager.java   |   5 +-
 .../hadoop/hive/ql/lockmgr/DbTxnManager.java    |  27 +-
 .../calcite/translator/JoinTypeCheckCtx.java    |   2 +-
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |  17 +-
 .../hadoop/hive/ql/parse/TypeCheckCtx.java      |  19 +-
 .../hive/ql/parse/TypeCheckProcFactory.java     |  26 +
 .../hadoop/hive/ql/txn/AcidWriteSetService.java |  61 ++
 .../txn/compactor/HouseKeeperServiceBase.java   |   2 +-
 .../hadoop/hive/ql/txn/compactor/Initiator.java |   2 +-
 .../hadoop/hive/ql/txn/compactor/Worker.java    |   2 +-
 .../main/resources/hive-exec-log4j2.properties  |   2 +-
 .../resources/tez-container-log4j2.properties   |   2 +-
 .../apache/hadoop/hive/ql/TestTxnCommands2.java |   2 +-
 .../apache/hadoop/hive/ql/io/TestAcidUtils.java |  20 +
 .../hive/ql/lockmgr/TestDbTxnManager.java       |   7 +
 .../hive/ql/lockmgr/TestDbTxnManager2.java      | 610 ++++++++++++++++++-
 .../hive/ql/txn/compactor/TestCleaner.java      |   4 +
 .../queries/clientpositive/constantPropWhen.q   |   2 +
 .../hive/ptest/execution/ExecutionPhase.java    |   2 +
 .../hive/ptest/execution/HostExecutor.java      |  48 +-
 .../hive/ptest/execution/LocalCommand.java      |  31 +-
 .../apache/hive/ptest/execution/PrepPhase.java  |   1 +
 .../apache/hive/ptest/execution/conf/Host.java  |   3 +
 92 files changed, 2294 insertions(+), 313 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/f089f2e6/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/f089f2e6/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/f089f2e6/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/f089f2e6/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/f089f2e6/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
----------------------------------------------------------------------


Mime
View raw message