hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gunt...@apache.org
Subject svn commit: r1568236 [1/25] - in /hive/branches/tez: ./ bin/ cli/src/java/org/apache/hadoop/hive/cli/ cli/src/test/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/java/org/apache/hadoop/hive/conf/ conf/ data/c...
Date Fri, 14 Feb 2014 10:53:39 GMT
Author: gunther
Date: Fri Feb 14 10:53:31 2014
New Revision: 1568236

URL: http://svn.apache.org/r1568236
Log:
Merge latest trunk into branch. (Gunther Hagleitner)

Added:
    hive/branches/tez/data/files/parquet_create.txt
      - copied unchanged from r1568232, hive/trunk/data/files/parquet_create.txt
    hive/branches/tez/data/files/parquet_partitioned.txt
      - copied unchanged from r1568232, hive/trunk/data/files/parquet_partitioned.txt
    hive/branches/tez/hcatalog/bin/common.sh
      - copied unchanged from r1568232, hive/trunk/hcatalog/bin/common.sh
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatFileUtil.java
      - copied unchanged from r1568232, hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatFileUtil.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/AbstractHiveService.java
      - copied unchanged from r1568232, hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/AbstractHiveService.java
    hive/branches/tez/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java
      - copied unchanged from r1568232, hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java
    hive/branches/tez/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
      - copied unchanged from r1568232, hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
    hive/branches/tez/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
      - copied unchanged from r1568232, hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
    hive/branches/tez/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
      - copied unchanged from r1568232, hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java
      - copied unchanged from r1568232, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionUtils.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/IOConstants.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/IOConstants.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/NullRowsInputFormat.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/NullRowsInputFormat.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcNewInputFormat.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcNewInputFormat.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcNewOutputFormat.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcNewOutputFormat.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcNewSplit.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcNewSplit.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/
      - copied from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/SessionStateConfigUserAuthenticator.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/SessionStateConfigUserAuthenticator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/SessionStateUserAuthenticator.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/SessionStateUserAuthenticator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAccessControlException.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAccessControlException.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthzPluginException.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthzPluginException.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveRole.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveRole.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/package-info.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/package-info.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/GrantPrivAuthUtils.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/GrantPrivAuthUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/RequiredPrivileges.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/RequiredPrivileges.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/RevokePrivAuthUtils.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/RevokePrivAuthUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLAuthorizationUtils.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLAuthorizationUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLPrivTypeGrant.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLPrivTypeGrant.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLPrivilegeType.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLPrivilegeType.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/UDFCurrentDB.java
      - copied unchanged from r1568232, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/UDFCurrentDB.java
    hive/branches/tez/ql/src/java/parquet/
      - copied from r1568232, hive/trunk/ql/src/java/parquet/
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestNewInputOutputFormat.java
      - copied unchanged from r1568232, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestNewInputOutputFormat.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/
      - copied from r1568232, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/plugin/
      - copied from r1568232, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/plugin/
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_create_role_no_admin.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/authorization_create_role_no_admin.q
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_grant_table_allpriv.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/authorization_grant_table_allpriv.q
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_grant_table_fail1.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/authorization_grant_table_fail1.q
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_grant_table_fail_nogrant.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/authorization_grant_table_fail_nogrant.q
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_revoke_table_fail1.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/authorization_revoke_table_fail1.q
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_revoke_table_fail2.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/authorization_revoke_table_fail2.q
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_show_roles_no_admin.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/authorization_show_roles_no_admin.q
    hive/branches/tez/ql/src/test/queries/clientnegative/cte_recursion.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/cte_recursion.q
    hive/branches/tez/ql/src/test/queries/clientnegative/cte_with_in_subquery.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/cte_with_in_subquery.q
    hive/branches/tez/ql/src/test/queries/clientnegative/udf_invalid.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/udf_invalid.q
    hive/branches/tez/ql/src/test/queries/clientnegative/udf_qualified_name.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientnegative/udf_qualified_name.q
    hive/branches/tez/ql/src/test/queries/clientpositive/authorization_create_table_owner_privs.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/authorization_create_table_owner_privs.q
    hive/branches/tez/ql/src/test/queries/clientpositive/authorization_grant_table_priv.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/authorization_grant_table_priv.q
    hive/branches/tez/ql/src/test/queries/clientpositive/authorization_revoke_table_priv.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/authorization_revoke_table_priv.q
    hive/branches/tez/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q
    hive/branches/tez/ql/src/test/queries/clientpositive/cte_1.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/cte_1.q
    hive/branches/tez/ql/src/test/queries/clientpositive/cte_2.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/cte_2.q
    hive/branches/tez/ql/src/test/queries/clientpositive/parquet_create.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/parquet_create.q
    hive/branches/tez/ql/src/test/queries/clientpositive/parquet_partitioned.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/parquet_partitioned.q
    hive/branches/tez/ql/src/test/queries/clientpositive/select_dummy_source.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/select_dummy_source.q
    hive/branches/tez/ql/src/test/queries/clientpositive/udf_current_database.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/udf_current_database.q
    hive/branches/tez/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
    hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_decimal_date.q
      - copied unchanged from r1568232, hive/trunk/ql/src/test/queries/clientpositive/vectorization_decimal_date.q
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_create_role_no_admin.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/authorization_create_role_no_admin.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_grant_table_allpriv.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/authorization_grant_table_allpriv.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_grant_table_fail1.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/authorization_grant_table_fail1.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_grant_table_fail_nogrant.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/authorization_grant_table_fail_nogrant.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_revoke_table_fail1.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/authorization_revoke_table_fail1.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_revoke_table_fail2.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/authorization_revoke_table_fail2.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_show_roles_no_admin.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/authorization_show_roles_no_admin.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/cte_recursion.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/cte_recursion.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/cte_with_in_subquery.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/cte_with_in_subquery.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/udf_invalid.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/udf_invalid.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/udf_qualified_name.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientnegative/udf_qualified_name.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/cte_1.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/cte_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/cte_2.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/cte_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/parquet_create.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/parquet_create.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/parquet_partitioned.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/parquet_partitioned.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/select_dummy_source.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/select_dummy_source.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/stats_counter.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/tez/stats_counter.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/stats_counter_partitioned.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/tez/stats_counter_partitioned.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/stats_noscan_1.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/tez/stats_noscan_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf_current_database.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/udf_current_database.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out
      - copied unchanged from r1568232, hive/trunk/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out
Removed:
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreTxn.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/AbstarctHiveService.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/RetryingRawStore.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionSpec.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizationPluginException.java
    hive/branches/tez/ql/src/test/queries/clientnegative/drop_partition_filter_failure2.q
Modified:
    hive/branches/tez/   (props changed)
    hive/branches/tez/bin/hive
    hive/branches/tez/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
    hive/branches/tez/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
    hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
    hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/tez/conf/hive-default.xml.template
    hive/branches/tez/data/conf/hive-site.xml
    hive/branches/tez/hbase-handler/src/test/results/positive/external_table_ppd.q.out
    hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out
    hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out
    hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
    hive/branches/tez/hcatalog/bin/hcat
    hive/branches/tez/hcatalog/bin/hcat-config.sh
    hive/branches/tez/hcatalog/bin/hcat.py
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatConstants.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/DataType.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecord.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/ReaderWriter.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/schema/HCatFieldSchema.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/schema/HCatSchemaUtils.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FosterStorageHandler.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatOutputFormat.java
    hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/OutputJobInfo.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/HcatTestUtils.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/HCatDataCheckUtil.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/schema/TestHCatSchema.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/pom.xml
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatBaseStorer.java
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatLoader.java
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatStorer.java
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/PigHCatUtil.java
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoader.java
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderStorer.java
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatStorer.java
    hive/branches/tez/hcatalog/src/test/e2e/templeton/README.txt
    hive/branches/tez/hcatalog/src/test/e2e/templeton/build.xml
    hive/branches/tez/hcatalog/src/test/e2e/templeton/tests/jobstatus.conf
    hive/branches/tez/hcatalog/webhcat/java-client/src/main/java/org/apache/hcatalog/api/HCatCreateTableDesc.java
    hive/branches/tez/hcatalog/webhcat/java-client/src/test/java/org/apache/hcatalog/api/TestHCatClient.java
    hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
    hive/branches/tez/itests/hcatalog-unit/pom.xml
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIService.java
    hive/branches/tez/itests/qtest/pom.xml
    hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
    hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/DummyAuthenticator.java
    hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/InjectableDummyAuthenticator.java
    hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
    hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/HiveDatabaseMetaData.java
    hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/HiveQueryResultSet.java
    hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/Utils.java
    hive/branches/tez/metastore/if/hive_metastore.thrift
    hive/branches/tez/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
    hive/branches/tez/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
    hive/branches/tez/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
    hive/branches/tez/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
    hive/branches/tez/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
    hive/branches/tez/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
    hive/branches/tez/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
    hive/branches/tez/metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php
    hive/branches/tez/metastore/src/gen/thrift/gen-php/metastore/Types.php
    hive/branches/tez/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
    hive/branches/tez/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
    hive/branches/tez/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
    hive/branches/tez/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
    hive/branches/tez/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java
    hive/branches/tez/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java
    hive/branches/tez/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java
    hive/branches/tez/packaging/src/main/assembly/bin.xml
    hive/branches/tez/pom.xml
    hive/branches/tez/ql/pom.xml
    hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumnDecimal.txt
    hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalarDecimal.txt
    hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideColumnDecimal.txt
    hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ColumnDivideScalarDecimal.txt
    hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumnDecimal.txt
    hive/branches/tez/ql/src/gen/vectorization/ExpressionTemplates/ScalarDivideColumnDecimal.txt
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Context.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/RowSchema.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorExpressionDescriptor.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToBoolean.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDouble.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToLong.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToString.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToDecimal.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDecimal.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDecimal.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColRegExpStringScalar.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpressionWriter.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpressionWriterFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/hooks/Entity.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/OneNullRowInputFormat.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanMapper.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/metadata/VirtualColumn.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FunctionSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezWork.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/MacroSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/QB.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompilerFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/DropTableDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/processors/HiveCommand.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/HadoopDefaultAuthenticator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/HadoopDefaultMetastoreAuthenticator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/HiveAuthenticationProvider.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationPreEventListener.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/PrivilegeRegistry.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/PrivilegeType.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAccessController.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizationValidator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizerFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizerImpl.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveMetastoreClientFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveMetastoreClientFactoryImpl.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveOperationType.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HivePrincipal.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HivePrivilege.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HivePrivilegeInfo.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HivePrivilegeObject.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizerFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/stats/CounterStatsAggregatorTez.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFDegrees.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFJson.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToByte.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToDouble.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToFloat.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToLong.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToShort.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPDivide.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqual.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqualOrGreaterThan.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqualOrLessThan.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPGreaterThan.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPLessThan.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPMinus.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPMultiply.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNotEqual.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPPlus.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestRecordReaderImpl.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/parse/TestGenTezWork.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestHiveAuthorizationTaskFactory.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestSessionUserName.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/processors/TestCommandProcessorFactory.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFMath.java
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_role_cycles1.q
    hive/branches/tez/ql/src/test/queries/clientnegative/authorization_role_cycles2.q
    hive/branches/tez/ql/src/test/queries/clientpositive/authorization_1_sql_std.q
    hive/branches/tez/ql/src/test/queries/clientpositive/authorization_role_grant1.q
    hive/branches/tez/ql/src/test/queries/clientpositive/index_bitmap3.q
    hive/branches/tez/ql/src/test/queries/clientpositive/index_bitmap_auto.q
    hive/branches/tez/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_3.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_4.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_5.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_7.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_invalid_priv_v1.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_part.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_role_cycles1.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/authorization_role_cycles2.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/drop_partition_failure.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/drop_partition_filter_failure.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/select_udtf_alias.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_6.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_9.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/authorization_view.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_join14.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/combine2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ctas.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_empty.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_file_format.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_multiple.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_partitioned.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_self_join.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_unused.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_auto_update.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap_auto.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap_compression.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_compression.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_serde.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_stale.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input12.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input39.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join14.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/keyword_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/show_functions.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/bucket2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/bucket3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/bucket4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/ctas.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/merge1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/merge2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/ptf.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/tez/tez_dml.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_10.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_11.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_12.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_13.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_14.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_15.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_16.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_17.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_18.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_19.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_20.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_21.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_22.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_23.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_24.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_8.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_remove_9.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_view.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vectorization_pushdown.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vectorization_short_regress.q.out
    hive/branches/tez/ql/src/test/results/compiler/errors/invalid_select.q.out
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java
    hive/branches/tez/service/pom.xml
    hive/branches/tez/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java
    hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
    hive/branches/tez/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
    hive/branches/tez/service/src/java/org/apache/hive/service/server/HiveServer2.java
    hive/branches/tez/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
    hive/branches/tez/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
    hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
    hive/branches/tez/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java

Propchange: hive/branches/tez/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1564923-1568232

Modified: hive/branches/tez/bin/hive
URL: http://svn.apache.org/viewvc/hive/branches/tez/bin/hive?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/bin/hive (original)
+++ hive/branches/tez/bin/hive Fri Feb 14 10:53:31 2014
@@ -230,7 +230,7 @@ if [[ -n $HBASE_BIN ]] ; then
 fi
 
 if [ "${AUX_PARAM}" != "" ]; then
-  HIVE_OPTS="$HIVE_OPTS -hiveconf hive.aux.jars.path=${AUX_PARAM}"
+  HIVE_OPTS="$HIVE_OPTS --hiveconf hive.aux.jars.path=${AUX_PARAM}"
   AUX_JARS_CMD_LINE="-libjars ${AUX_PARAM}"
 fi
 

Modified: hive/branches/tez/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java (original)
+++ hive/branches/tez/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java Fri Feb 14 10:53:31 2014
@@ -216,7 +216,7 @@ public class CliDriver {
       }
     } else { // local mode
       try {
-        CommandProcessor proc = CommandProcessorFactory.get(tokens[0], (HiveConf) conf);
+        CommandProcessor proc = CommandProcessorFactory.get(tokens, (HiveConf) conf);
         ret = processLocalCmd(cmd, proc, ss);
       } catch (SQLException e) {
         console.printError("Failed processing command " + tokens[0] + " " + e.getLocalizedMessage(),
@@ -579,8 +579,9 @@ public class CliDriver {
     // We stack a custom Completor on top of our ArgumentCompletor
     // to reverse this.
     Completor completor = new Completor () {
+      @Override
       public int complete (String buffer, int offset, List completions) {
-        List<String> comp = (List<String>) completions;
+        List<String> comp = completions;
         int ret = ac.complete(buffer, offset, completions);
         // ConsoleReader will do the substitution if and only if there
         // is exactly one valid completion, so we ignore other cases.

Modified: hive/branches/tez/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java (original)
+++ hive/branches/tez/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java Fri Feb 14 10:53:31 2014
@@ -65,6 +65,20 @@ import org.apache.thrift.TException;
 // code for the script-based testing
 public class TestCliDriverMethods extends TestCase {
 
+  SecurityManager securityManager;
+
+  // Some of these tests require intercepting System.exit() using the SecurityManager.
+  // It is safer to  register/unregister our SecurityManager during setup/teardown instead
+  // of doing it within the individual test cases.
+  public void setUp() {
+    securityManager = System.getSecurityManager();
+    System.setSecurityManager(new NoExitSecurityManager(securityManager));
+  }
+
+  public void tearDown() {
+    System.setSecurityManager(securityManager);
+  }
+
   // If the command has an associated schema, make sure it gets printed to use
   public void testThatCliDriverPrintsHeaderForCommandsWithSchema() throws CommandNeedRetryException {
     Schema mockSchema = mock(Schema.class);
@@ -192,7 +206,6 @@ public class TestCliDriverMethods extend
     ss.err = System.err;
     ss.out = System.out;
 
-    NoExitSecurityManager newSecurityManager = new NoExitSecurityManager();
     try {
       CliSessionState.start(ss);
       CliDriver cliDriver = new CliDriver();
@@ -202,7 +215,6 @@ public class TestCliDriverMethods extend
       assertEquals(0, e.getStatus());
 
     } catch (Exception e) {
-      newSecurityManager.resetSecurityManager();
       throw e;
     }
 
@@ -214,8 +226,6 @@ public class TestCliDriverMethods extend
     } catch (ExitException e) {
       assertEquals(0, e.getStatus());
 
-    } finally {
-      newSecurityManager.resetSecurityManager();
     }
 
   }
@@ -287,16 +297,15 @@ public class TestCliDriverMethods extend
     sessinState.err = new PrintStream(data);
     sessinState.database = "database";
     CliDriver driver = new CliDriver();
-    NoExitSecurityManager securityManager = new NoExitSecurityManager();
+
     try {
       driver.processSelectDatabase(sessinState);
       fail("shuld be exit");
     } catch (ExitException e) {
       e.printStackTrace();
       assertEquals(40000, e.getStatus());
-    } finally {
-      securityManager.resetSecurityManager();
     }
+
     assertTrue(data.toString().contains(
         "FAILED: ParseException line 1:4 cannot recognize input near 'database'"));
   }
@@ -319,7 +328,6 @@ public class TestCliDriverMethods extend
     CliSessionState sessionState = new CliSessionState(new HiveConf());
 
     ByteArrayOutputStream data = new ByteArrayOutputStream();
-    NoExitSecurityManager securityManager = new NoExitSecurityManager();
 
     sessionState.err = new PrintStream(data);
     sessionState.out = System.out;
@@ -364,8 +372,6 @@ public class TestCliDriverMethods extend
       assertEquals(40000, e.getStatus());
       assertTrue(data.toString().contains("cannot recognize input near 'bla' 'bla' 'bla'"));
 
-    } finally {
-      securityManager.resetSecurityManager();
     }
   }
 
@@ -451,9 +457,9 @@ public class TestCliDriverMethods extend
 
     public SecurityManager parentSecurityManager;
 
-    public NoExitSecurityManager() {
+    public NoExitSecurityManager(SecurityManager parent) {
       super();
-      parentSecurityManager = System.getSecurityManager();
+      parentSecurityManager = parent;
       System.setSecurityManager(this);
     }
 
@@ -475,10 +481,6 @@ public class TestCliDriverMethods extend
     public void checkExit(int status) {
       throw new ExitException(status);
     }
-
-    public void resetSecurityManager() {
-      System.setSecurityManager(parentSecurityManager);
-    }
   }
 
   private static class ExitException extends RuntimeException {

Modified: hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java Fri Feb 14 10:53:31 2014
@@ -274,4 +274,12 @@ public class HiveDecimal implements Comp
     return bd;
   }
 
+  /**
+   * Sets the {@link BigDecimal} value in this object.
+   * @param bigDecimal
+   */
+  public void setNormalize(BigDecimal bigDecimal) {
+    BigDecimal value = normalize(bigDecimal, true);
+    this.bd = value;
+  }
 }

Modified: hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Fri Feb 14 10:53:31 2014
@@ -94,8 +94,6 @@ public class HiveConf extends Configurat
       HiveConf.ConfVars.METASTOREPWD,
       HiveConf.ConfVars.METASTORECONNECTURLHOOK,
       HiveConf.ConfVars.METASTORECONNECTURLKEY,
-      HiveConf.ConfVars.METASTOREATTEMPTS,
-      HiveConf.ConfVars.METASTOREINTERVAL,
       HiveConf.ConfVars.METASTOREFORCERELOADCONF,
       HiveConf.ConfVars.METASTORESERVERMINTHREADS,
       HiveConf.ConfVars.METASTORESERVERMAXTHREADS,
@@ -135,7 +133,8 @@ public class HiveConf extends Configurat
       HiveConf.ConfVars.HMSHANDLERFORCERELOADCONF,
       HiveConf.ConfVars.METASTORE_PARTITION_NAME_WHITELIST_PATTERN,
       HiveConf.ConfVars.METASTORE_DISALLOW_INCOMPATIBLE_COL_TYPE_CHANGES,
-      HiveConf.ConfVars.USERS_IN_ADMIN_ROLE
+      HiveConf.ConfVars.USERS_IN_ADMIN_ROLE,
+      HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER
       };
 
   /**
@@ -208,6 +207,8 @@ public class HiveConf extends Configurat
     TASKLOG_DEBUG_TIMEOUT("hive.exec.tasklog.debug.timeout", 20000),
     OUTPUT_FILE_EXTENSION("hive.output.file.extension", null),
 
+    HIVE_IN_TEST("hive.in.test", false), // internal usage only, true in test mode
+
     // should hive determine whether to run in local mode automatically ?
     LOCALMODEAUTO("hive.exec.mode.local.auto", false),
     // if yes:
@@ -270,10 +271,6 @@ public class HiveConf extends Configurat
     // Name of the connection url in the configuration
     METASTORECONNECTURLKEY("javax.jdo.option.ConnectionURL",
         "jdbc:derby:;databaseName=metastore_db;create=true"),
-    // Number of attempts to retry connecting after there is a JDO datastore err
-    METASTOREATTEMPTS("hive.metastore.ds.retry.attempts", 1),
-    // Number of miliseconds to wait between attepting
-    METASTOREINTERVAL("hive.metastore.ds.retry.interval", 1000),
     // Whether to force reloading of the metastore configuration (including
     // the connection URL, before the next metastore query that accesses the
     // datastore. Once reloaded, this value is reset to false. Used for
@@ -413,6 +410,8 @@ public class HiveConf extends Configurat
     HIVEADDEDJARS("hive.added.jars.path", ""),
     HIVEADDEDARCHIVES("hive.added.archives.path", ""),
 
+    HIVE_CURRENT_DATABASE("hive.current.database", ""), // internal usage only
+
     // for hive script operator
     HIVES_AUTO_PROGRESS_TIMEOUT("hive.auto.progress.timeout", 0),
     HIVETABLENAME("hive.table.name", ""),
@@ -518,8 +517,18 @@ public class HiveConf extends Configurat
     // Define the default ORC stripe size
     HIVE_ORC_DEFAULT_STRIPE_SIZE("hive.exec.orc.default.stripe.size",
         256L * 1024 * 1024),
-
-    HIVE_ORC_DICTIONARY_KEY_SIZE_THRESHOLD("hive.exec.orc.dictionary.key.size.threshold", 0.8f),
+    HIVE_ORC_DICTIONARY_KEY_SIZE_THRESHOLD(
+        "hive.exec.orc.dictionary.key.size.threshold", 0.8f),
+    // Define the default ORC index stride
+    HIVE_ORC_DEFAULT_ROW_INDEX_STRIDE("hive.exec.orc.default.row.index.stride"
+        , 10000),
+    // Define the default ORC buffer size
+    HIVE_ORC_DEFAULT_BUFFER_SIZE("hive.exec.orc.default.buffer.size", 256 * 1024),
+    // Define the default block padding
+    HIVE_ORC_DEFAULT_BLOCK_PADDING("hive.exec.orc.default.block.padding",
+        true),
+    // Define the default compression codec for ORC file
+    HIVE_ORC_DEFAULT_COMPRESS("hive.exec.orc.default.compress", "ZLIB"),
 
     HIVE_ORC_INCLUDE_FILE_FOOTER_IN_SPLITS("hive.orc.splits.include.file.footer", false),
     HIVE_ORC_CACHE_STRIPE_DETAILS_SIZE("hive.orc.cache.stripe.details.size", 10000),
@@ -826,7 +835,7 @@ public class HiveConf extends Configurat
 
     HIVE_SECURITY_COMMAND_WHITELIST("hive.security.command.whitelist", "set,reset,dfs,add,delete,compile"),
 
-    HIVE_CONF_RESTRICTED_LIST("hive.conf.restricted.list", ""),
+    HIVE_CONF_RESTRICTED_LIST("hive.conf.restricted.list", "hive.security.authenticator.manager,hive.security.authorization.manager"),
 
     // If this is set all move tasks at the end of a multi-insert query will only begin once all
     // outputs are ready
@@ -876,7 +885,7 @@ public class HiveConf extends Configurat
     HIVE_VECTORIZATION_GROUPBY_CHECKINTERVAL("hive.vectorized.groupby.checkinterval", 100000),
     HIVE_VECTORIZATION_GROUPBY_MAXENTRIES("hive.vectorized.groupby.maxentries", 1000000),
     HIVE_VECTORIZATION_GROUPBY_FLUSH_PERCENT("hive.vectorized.groupby.flush.percent", (float) 0.1),
-    
+
 
     HIVE_TYPE_CHECK_ON_INSERT("hive.typecheck.on.insert", true),
 
@@ -894,7 +903,7 @@ public class HiveConf extends Configurat
     HIVEEXPLAINDEPENDENCYAPPENDTASKTYPES("hive.explain.dependency.append.tasktype", false),
 
     HIVECOUNTERGROUP("hive.counters.group.name", "HIVE"),
-    
+
     // none, column
     // none is the default(past) behavior. Implies only alphaNumeric and underscore are valid characters in identifiers.
     // column: implies column names can contain any character.
@@ -1256,8 +1265,14 @@ public class HiveConf extends Configurat
 
     if(this.get("hive.metastore.local", null) != null) {
       l4j.warn("DEPRECATED: Configuration property hive.metastore.local no longer has any " +
-      		"effect. Make sure to provide a valid value for hive.metastore.uris if you are " +
-      		"connecting to a remote metastore.");
+          "effect. Make sure to provide a valid value for hive.metastore.uris if you are " +
+          "connecting to a remote metastore.");
+    }
+
+    if ((this.get("hive.metastore.ds.retry.attempts") != null) ||
+      this.get("hive.metastore.ds.retry.interval") != null) {
+        l4j.warn("DEPRECATED: hive.metastore.ds.retry.* no longer has any effect.  " +
+        "Use hive.hmshandler.retry.* instead");
     }
 
     // if the running class was loaded directly (through eclipse) rather than through a
@@ -1509,6 +1524,7 @@ public class HiveConf extends Configurat
         restrictList.add(entry.trim());
       }
     }
-    restrictList.add(ConfVars.HIVE_CONF_RESTRICTED_LIST.toString());
+    restrictList.add(ConfVars.HIVE_IN_TEST.varname);
+    restrictList.add(ConfVars.HIVE_CONF_RESTRICTED_LIST.varname);
   }
 }

Modified: hive/branches/tez/conf/hive-default.xml.template
URL: http://svn.apache.org/viewvc/hive/branches/tez/conf/hive-default.xml.template?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/conf/hive-default.xml.template (original)
+++ hive/branches/tez/conf/hive-default.xml.template Fri Feb 14 10:53:31 2014
@@ -1656,7 +1656,7 @@
 
 <property>
   <name>hive.conf.restricted.list</name>
-  <value></value>
+  <value>hive.security.authenticator.manager,hive.security.authorization.manager</value>
   <description>Comma separated list of configuration options which are immutable at runtime</description>
 </property>
 
@@ -1884,6 +1884,46 @@
 </property>
 
 <property>
+  <name>hive.exec.orc.default.stripe.size</name>
+  <value>268435456</value>
+  <description>
+    Define the default ORC stripe size.
+  </description>
+</property>
+
+<property>
+  <name>hive.exec.orc.default.row.index.stride</name>
+  <value>10000</value>
+  <description>
+    Define the default ORC index stride in number of rows.
+  </description>
+</property>
+
+<property>
+  <name>hive.exec.orc.default.buffer.size</name>
+  <value>262144</value>
+  <description>
+    Define the default ORC buffer size in bytes.
+  </description>
+</property>
+
+<property>
+  <name>hive.exec.orc.default.block.padding</name>
+  <value>true</value>
+  <description>
+    Define the default block padding.
+  </description>
+</property>
+
+<property>
+  <name>hive.exec.orc.default.compress</name>
+  <value>ZLIB</value>
+  <description>
+    Define the default compression codec for ORC file.
+  </description>
+</property>
+
+<property>
   <name>hive.exec.orc.dictionary.key.size.threshold</name>
   <value>0.8</value>
   <description>

Modified: hive/branches/tez/data/conf/hive-site.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/data/conf/hive-site.xml?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/data/conf/hive-site.xml (original)
+++ hive/branches/tez/data/conf/hive-site.xml Fri Feb 14 10:53:31 2014
@@ -19,6 +19,12 @@
 
 <configuration>
 
+<property>
+  <name>hive.in.test</name>
+  <value>true</value>
+  <description>Internal marker for test. Used for masking env-dependent values</description>
+</property>
+
 <!-- Hive Configuration can either be stored in this file or in the hadoop configuration files  -->
 <!-- that are implied by Hadoop setup variables.                                                -->
 <!-- Aside from Hadoop setup variables - this file is provided as a convenience so that Hive    -->
@@ -191,4 +197,10 @@
   <value>0</value>
 </property>
 
+<property>
+  <name>hive.conf.restricted.list</name>
+  <value>dummy.config.value</value>
+  <description>Using dummy config value above because you cannot override config with empty value</description>
+</property>
+
 </configuration>

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/external_table_ppd.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/external_table_ppd.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/external_table_ppd.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/external_table_ppd.q.out Fri Feb 14 10:53:31 2014
@@ -124,7 +124,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t_hbase
-            filterExpr:
+            filterExpr: (int_col > 0) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: (int_col > 0) (type: boolean)

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out Fri Feb 14 10:53:31 2014
@@ -35,7 +35,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: (key > '90') (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: (key > '90') (type: boolean)
@@ -189,7 +189,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: (key >= UDFToString((40 + 50))) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: (key >= UDFToString((40 + 50))) (type: boolean)
@@ -242,7 +242,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: (key > '90') (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: (value like '%9%') (type: boolean)
@@ -296,7 +296,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: (key >= '90') (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: ((value like '%9%') and (key = UDFToInteger(value))) (type: boolean)
@@ -347,7 +347,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: ((key < '80') and (key > '90')) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: (value like '%90%') (type: boolean)
@@ -505,7 +505,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: ((key > '281') and (key < '287')) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: ((key > '281') and (key < '287')) (type: boolean)

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/hbase_pushdown.q.out Fri Feb 14 10:53:31 2014
@@ -35,7 +35,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: (key = 90) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: (key = 90) (type: boolean)
@@ -83,7 +83,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: (key = 90) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: (value like '%90%') (type: boolean)
@@ -133,7 +133,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_pushdown
-            filterExpr:
+            filterExpr: (key = 90) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: ((value like '%90%') and (key = UDFToInteger(value))) (type: boolean)

Modified: hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out (original)
+++ hive/branches/tez/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out Fri Feb 14 10:53:31 2014
@@ -33,7 +33,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_ppd_keyrange
-            filterExpr:
+            filterExpr: ((key > 8) and (key < 21)) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: ((key > 8) and (key < 21)) (type: boolean)
@@ -85,7 +85,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_ppd_keyrange
-            filterExpr:
+            filterExpr: ((key > 8) and (key <= 17)) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: ((key > 8) and (key <= 17)) (type: boolean)
@@ -134,7 +134,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: hbase_ppd_keyrange
-            filterExpr:
+            filterExpr: ((key > 8) and (key <= 17)) (type: boolean)
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
               predicate: (value like '%11%') (type: boolean)

Modified: hive/branches/tez/hcatalog/bin/hcat
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/bin/hcat?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/bin/hcat (original)
+++ hive/branches/tez/hcatalog/bin/hcat Fri Feb 14 10:53:31 2014
@@ -67,7 +67,7 @@ done
 # check for hive in the path
 HIVE_IN_PATH=`which hive 2>/dev/null`
 # looks like [ -f '' ] is true...
-if [ -n ${HIVE_IN_PATH} ]; then
+if [ -n "$HIVE_IN_PATH" ]; then
   #dir of hive scrip
   HIVE_DIR=`dirname "$HIVE_IN_PATH"`
   #one level up for base dir

Modified: hive/branches/tez/hcatalog/bin/hcat-config.sh
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/bin/hcat-config.sh?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/bin/hcat-config.sh (original)
+++ hive/branches/tez/hcatalog/bin/hcat-config.sh Fri Feb 14 10:53:31 2014
@@ -65,6 +65,9 @@ if [ -f "${HCAT_CONF_DIR}/hcat-env.sh" ]
   . "${HCAT_CONF_DIR}/hcat-env.sh"
 fi
 
+source $HCAT_PREFIX/bin/common.sh
+find_hadoop_home
+
 #determine where hadoop is
 #check HADOOP_HOME and then check HADOOP_PREFIX
 if [ -f ${HADOOP_HOME}/bin/hadoop ]; then

Modified: hive/branches/tez/hcatalog/bin/hcat.py
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/bin/hcat.py?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/bin/hcat.py (original)
+++ hive/branches/tez/hcatalog/bin/hcat.py Fri Feb 14 10:53:31 2014
@@ -82,6 +82,11 @@ if 'HADOOP_CLASSPATH' not in os.environ:
 os.environ['HADOOP_CLASSPATH'] += os.pathsep + hcatJars[0]
 # done adding the hcatalog jar to the hadoop classpath
 
+# adding hbase storage-handler jars
+hbaseStorageJars =  glob.glob(os.path.join(hcatPrefix, 'share', 'hcatalog', 'storage-handlers', 'hbase', 'lib', 'hbase-storage-handler-*.jar'))
+if len(hbaseStorageJars) == 1:
+  os.environ['HADOOP_CLASSPATH'] += os.pathsep + hbaseStorageJars[0]
+
 # add all the other jars
 hcatLibJarFiles = os.path.join(hcatPrefix, 'share', 'hcatalog', 'lib', '*')
 os.environ['HADOOP_CLASSPATH'] += os.pathsep + hcatLibJarFiles

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java Fri Feb 14 10:53:31 2014
@@ -39,7 +39,6 @@ import org.apache.hadoop.hive.ql.plan.De
 import org.apache.hadoop.hive.ql.plan.DropDatabaseDesc;
 import org.apache.hadoop.hive.ql.plan.DropTableDesc;
 import org.apache.hadoop.hive.ql.plan.HiveOperation;
-import org.apache.hadoop.hive.ql.plan.PartitionSpec;
 import org.apache.hadoop.hive.ql.plan.ShowDatabasesDesc;
 import org.apache.hadoop.hive.ql.plan.ShowPartitionsDesc;
 import org.apache.hadoop.hive.ql.plan.ShowTableStatusDesc;
@@ -314,12 +313,12 @@ public class HCatSemanticAnalyzer extend
         // table is partitioned.
       } else {
         //this is actually a ALTER TABLE DROP PARITITION statement
-        for (PartitionSpec partSpec : dropTable.getPartSpecs()) {
+        for (DropTableDesc.PartSpec partSpec : dropTable.getPartSpecs()) {
           // partitions are not added as write entries in drop partitions in Hive
           Table table = hive.getTable(SessionState.get().getCurrentDatabase(), dropTable.getTableName());
           List<Partition> partitions = null;
           try {
-            partitions = hive.getPartitionsByFilter(table, partSpec.toString());
+            partitions = hive.getPartitionsByFilter(table, partSpec.getPartSpec().getExprString());
           } catch (Exception e) {
             throw new HiveException(e);
           }

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java Fri Feb 14 10:53:31 2014
@@ -39,7 +39,6 @@ import org.apache.hadoop.hive.ql.plan.De
 import org.apache.hadoop.hive.ql.plan.DropDatabaseDesc;
 import org.apache.hadoop.hive.ql.plan.DropTableDesc;
 import org.apache.hadoop.hive.ql.plan.HiveOperation;
-import org.apache.hadoop.hive.ql.plan.PartitionSpec;
 import org.apache.hadoop.hive.ql.plan.ShowDatabasesDesc;
 import org.apache.hadoop.hive.ql.plan.ShowPartitionsDesc;
 import org.apache.hadoop.hive.ql.plan.ShowTableStatusDesc;
@@ -315,12 +314,12 @@ public class HCatSemanticAnalyzer extend
         // table is partitioned.
       } else {
         //this is actually a ALTER TABLE DROP PARITITION statement
-        for (PartitionSpec partSpec : dropTable.getPartSpecs()) {
+        for (DropTableDesc.PartSpec partSpec : dropTable.getPartSpecs()) {
           // partitions are not added as write entries in drop partitions in Hive
           Table table = hive.getTable(SessionState.get().getCurrentDatabase(), dropTable.getTableName());
           List<Partition> partitions = null;
           try {
-            partitions = hive.getPartitionsByFilter(table, partSpec.toString());
+            partitions = hive.getPartitionsByFilter(table, partSpec.getPartSpec().getExprString());
           } catch (Exception e) {
             throw new HiveException(e);
           }

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatConstants.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatConstants.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatConstants.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatConstants.java Fri Feb 14 10:53:31 2014
@@ -121,6 +121,7 @@ public final class HCatConstants {
 
   public static final String HCAT_DYNAMIC_PTN_JOBID = HCAT_KEY_OUTPUT_BASE + "dynamic.jobid";
   public static final boolean HCAT_IS_DYNAMIC_MAX_PTN_CHECK_ENABLED = false;
+  public static final String HCAT_DYNAMIC_CUSTOM_PATTERN = "hcat.dynamic.partitioning.custom.pattern";
 
   // Message Bus related properties.
   public static final String HCAT_DEFAULT_TOPIC_PREFIX = "hcat";

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java Fri Feb 14 10:53:31 2014
@@ -63,17 +63,12 @@ public enum HCatContext {
       conf = newConf;
       return this;
     }
-
-    if (conf != newConf) {
-      synchronized (conf) {
-        for (Map.Entry<String, String> entry : conf) {
-          if ((entry.getKey().matches("hcat.*")) && (newConf.get(entry.getKey()) == null)) {
-            newConf.set(entry.getKey(), entry.getValue());
-          }
-        }        
+    for (Map.Entry<String, String> entry : conf) {
+      if ((entry.getKey().matches("hcat.*")) && (newConf.get(entry.getKey()) == null)) {
+        newConf.set(entry.getKey(), entry.getValue());
       }
-      conf = newConf;
     }
+    conf = newConf;
     return this;
   }
 

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java Fri Feb 14 10:53:31 2014
@@ -119,7 +119,7 @@ public class HCatUtil {
   }
 
   public static String encodeBytes(byte[] bytes) {
-    StringBuffer strBuf = new StringBuffer();
+    StringBuilder strBuf = new StringBuilder();
 
     for (int i = 0; i < bytes.length; i++) {
       strBuf.append((char) (((bytes[i] >> 4) & 0xF) + ('a')));
@@ -282,11 +282,13 @@ public class HCatUtil {
           .getTypeInfoFromTypeString(tableField.getType());
 
         if (!partitionType.equals(tableType)) {
-          throw new HCatException(
-            ErrorType.ERROR_SCHEMA_TYPE_MISMATCH, "Column <"
+          String msg =
+            "Column <"
             + field.getName() + ">, expected <"
             + tableType.getTypeName() + ">, got <"
-            + partitionType.getTypeName() + ">");
+            + partitionType.getTypeName() + ">";
+          LOG.warn(msg);
+          throw new HCatException(ErrorType.ERROR_SCHEMA_TYPE_MISMATCH, msg);
         }
       }
     }
@@ -657,4 +659,12 @@ public class HCatUtil {
   public static String makePathASafeFileName(String filePath) {
     return new File(filePath).getPath().replaceAll("\\\\", "/");
   }
+  public static void assertNotNull(Object t, String msg, Logger logger) {
+    if(t == null) {
+      if(logger != null) {
+        logger.warn(msg);
+      }
+      throw new IllegalArgumentException(msg);
+    }
+  }
 }

Modified: hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/DataType.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/DataType.java?rev=1568236&r1=1568235&r2=1568236&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/DataType.java (original)
+++ hive/branches/tez/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/DataType.java Fri Feb 14 10:53:31 2014
@@ -19,15 +19,26 @@
 
 package org.apache.hive.hcatalog.data;
 
+import org.apache.hadoop.hive.common.type.HiveChar;
+import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.common.type.HiveVarchar;
+
+import java.sql.Date;
+import java.sql.Timestamp;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
-
+/*
+ * The data written and read withing the same M/R job, thus should never be written by one 
+ * version of Hive and read by another.
+ * @see org.apache.hive.hcatalog.data.ReaderWriter
+ */
 public abstract class DataType {
-
+  //todo: this should be moved to be an inner class of ReaderWrite as that is the only place it 
+  // is used
   public static final byte NULL = 1;
   public static final byte BOOLEAN = 5;
   public static final byte BYTE = 6;
@@ -38,6 +49,11 @@ public abstract class DataType {
   public static final byte DOUBLE = 25;
   public static final byte STRING = 55;
   public static final byte BINARY = 60;
+  public static final byte CHAR = 61;
+  public static final byte VARCHAR = 62;
+  public static final byte DECIMAL = 63;
+  public static final byte DATE = 64;
+  public static final byte TIMESTAMP = 65;
 
   public static final byte MAP = 100;
   public static final byte STRUCT = 110;
@@ -79,6 +95,16 @@ public abstract class DataType {
       return MAP;
     } else if (o instanceof byte[]) {
       return BINARY;
+    } else if(o instanceof HiveChar) {
+      return CHAR;
+    } else if(o instanceof HiveVarchar) {
+      return VARCHAR;
+    } else if(o instanceof HiveDecimal) {
+      return DECIMAL;
+    } else if(o instanceof Date) {
+      return DATE;
+    } else if(o instanceof Timestamp) {
+      return TIMESTAMP;
     } else {
       return ERROR;
     }
@@ -170,8 +196,17 @@ public abstract class DataType {
           return 0;
         }
       }
-
-      default:
+      case CHAR:
+        return ((HiveChar)o1).compareTo((HiveChar)o2);  
+      case VARCHAR:
+        return ((HiveVarchar)o1).compareTo((HiveVarchar)o2);
+      case DECIMAL:
+        return ((HiveDecimal)o1).compareTo((HiveDecimal)o2);
+      case DATE:
+        return ((Date)o1).compareTo((Date)o2);
+      case TIMESTAMP:
+        return ((Timestamp)o1).compareTo((Timestamp)o2);
+     default:
         throw new RuntimeException("Unkown type " + dt1 +
           " in compare");
       }



Mime
View raw message