You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/10/30 17:22:48 UTC

svn commit: r1635536 [1/28] - in /hive/branches/spark: ./ accumulo-handler/ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/columns/ accumulo-handler/src/test/org/apache/hadoo...

Author: brock
Date: Thu Oct 30 16:22:33 2014
New Revision: 1635536

URL: http://svn.apache.org/r1635536
Log:
HIVE-8502 - Merge trunk into spark 10/17/14

Added:
    hive/branches/spark/beeline/src/java/org/apache/hive/beeline/DeprecatedSeparatedValuesOutputFormat.java
      - copied unchanged from r1635377, hive/trunk/beeline/src/java/org/apache/hive/beeline/DeprecatedSeparatedValuesOutputFormat.java
    hive/branches/spark/common/src/test/org/apache/hadoop/hive/common/TestValidTxnImpl.java
      - copied, changed from r1633910, hive/trunk/common/src/test/org/apache/hadoop/hive/common/TestValidTxnImpl.java
    hive/branches/spark/data/files/avro_date.txt
      - copied unchanged from r1630201, hive/trunk/data/files/avro_date.txt
    hive/branches/spark/data/files/customer_address.txt
      - copied unchanged from r1633910, hive/trunk/data/files/customer_address.txt
    hive/branches/spark/data/files/map_null_schema.avro
      - copied unchanged from r1635377, hive/trunk/data/files/map_null_schema.avro
    hive/branches/spark/data/files/map_null_val.avro
      - copied unchanged from r1635377, hive/trunk/data/files/map_null_val.avro
    hive/branches/spark/data/files/store.txt
      - copied unchanged from r1633910, hive/trunk/data/files/store.txt
    hive/branches/spark/data/files/store_sales.txt
      - copied unchanged from r1633421, hive/trunk/data/files/store_sales.txt
    hive/branches/spark/dev-support/jenkins-common.sh
      - copied unchanged from r1634945, hive/trunk/dev-support/jenkins-common.sh
    hive/branches/spark/dev-support/jenkins-execute-build.sh
      - copied unchanged from r1634945, hive/trunk/dev-support/jenkins-execute-build.sh
    hive/branches/spark/dev-support/jenkins-submit-build.sh
      - copied unchanged from r1634945, hive/trunk/dev-support/jenkins-submit-build.sh
    hive/branches/spark/hbase-handler/src/test/queries/positive/hbase_timestamp.q
      - copied unchanged from r1633421, hive/trunk/hbase-handler/src/test/queries/positive/hbase_timestamp.q
    hive/branches/spark/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
      - copied unchanged from r1633421, hive/trunk/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
    hive/branches/spark/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatAuthUtil.java
      - copied unchanged from r1630996, hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatAuthUtil.java
    hive/branches/spark/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/
      - copied from r1630996, hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/
    hive/branches/spark/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/thrift/
      - copied from r1630990, hive/trunk/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/thrift/
    hive/branches/spark/itests/hive-unit-hadoop2/src/test/java/org/apache/hive/
      - copied from r1631926, hive/trunk/itests/hive-unit-hadoop2/src/test/java/org/apache/hive/
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java
      - copied unchanged from r1633421, hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java
    hive/branches/spark/metastore/scripts/upgrade/derby/hive-schema-0.15.0.derby.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.15.0.derby.sql
    hive/branches/spark/metastore/scripts/upgrade/derby/hive-txn-schema-0.14.0.derby.sql
      - copied unchanged from r1634945, hive/trunk/metastore/scripts/upgrade/derby/hive-txn-schema-0.14.0.derby.sql
    hive/branches/spark/metastore/scripts/upgrade/derby/upgrade-0.14.0-to-0.15.0.derby.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/derby/upgrade-0.14.0-to-0.15.0.derby.sql
    hive/branches/spark/metastore/scripts/upgrade/mssql/hive-schema-0.15.0.mssql.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/mssql/hive-schema-0.15.0.mssql.sql
    hive/branches/spark/metastore/scripts/upgrade/mssql/hive-txn-schema-0.14.0.mssql.sql
      - copied, changed from r1634945, hive/trunk/metastore/scripts/upgrade/mssql/hive-txn-schema-0.14.0.mssql.sql
    hive/branches/spark/metastore/scripts/upgrade/mssql/upgrade-0.14.0-to-0.15.0.mssql.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/mssql/upgrade-0.14.0-to-0.15.0.mssql.sql
    hive/branches/spark/metastore/scripts/upgrade/mysql/hive-schema-0.15.0.mysql.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.15.0.mysql.sql
    hive/branches/spark/metastore/scripts/upgrade/mysql/hive-txn-schema-0.14.0.mysql.sql
      - copied unchanged from r1634945, hive/trunk/metastore/scripts/upgrade/mysql/hive-txn-schema-0.14.0.mysql.sql
    hive/branches/spark/metastore/scripts/upgrade/mysql/upgrade-0.14.0-to-0.15.0.mysql.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/mysql/upgrade-0.14.0-to-0.15.0.mysql.sql
    hive/branches/spark/metastore/scripts/upgrade/oracle/hive-schema-0.15.0.oracle.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.15.0.oracle.sql
    hive/branches/spark/metastore/scripts/upgrade/oracle/hive-txn-schema-0.14.0.oracle.sql
      - copied unchanged from r1634945, hive/trunk/metastore/scripts/upgrade/oracle/hive-txn-schema-0.14.0.oracle.sql
    hive/branches/spark/metastore/scripts/upgrade/oracle/upgrade-0.14.0-to-0.15.0.oracle.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/oracle/upgrade-0.14.0-to-0.15.0.oracle.sql
    hive/branches/spark/metastore/scripts/upgrade/postgres/hive-schema-0.15.0.postgres.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.15.0.postgres.sql
    hive/branches/spark/metastore/scripts/upgrade/postgres/hive-txn-schema-0.14.0.postgres.sql
      - copied unchanged from r1634945, hive/trunk/metastore/scripts/upgrade/postgres/hive-txn-schema-0.14.0.postgres.sql
    hive/branches/spark/metastore/scripts/upgrade/postgres/pre-0-upgrade-0.12.0-to-0.13.0.postgres.sql
      - copied unchanged from r1631926, hive/trunk/metastore/scripts/upgrade/postgres/pre-0-upgrade-0.12.0-to-0.13.0.postgres.sql
    hive/branches/spark/metastore/scripts/upgrade/postgres/upgrade-0.14.0-to-0.15.0.postgres.sql
      - copied unchanged from r1633421, hive/trunk/metastore/scripts/upgrade/postgres/upgrade-0.14.0-to-0.15.0.postgres.sql
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/events/AddIndexEvent.java
      - copied unchanged from r1631926, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/events/AddIndexEvent.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/events/AlterIndexEvent.java
      - copied unchanged from r1631926, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/events/AlterIndexEvent.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/events/DropIndexEvent.java
      - copied unchanged from r1631926, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/events/DropIndexEvent.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreAddIndexEvent.java
      - copied unchanged from r1631926, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreAddIndexEvent.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreAlterIndexEvent.java
      - copied unchanged from r1631926, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreAlterIndexEvent.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreDropIndexEvent.java
      - copied unchanged from r1631926, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreDropIndexEvent.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobExecHelper.java
      - copied unchanged from r1630248, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobExecHelper.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/SettableConfigUpdater.java
      - copied unchanged from r1633910, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/SettableConfigUpdater.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/parse/TestColumnAccess.java
      - copied, changed from r1630265, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestColumnAccess.java
    hive/branches/spark/ql/src/test/queries/clientnegative/alter_partition_partial_spec_dyndisabled.q
      - copied unchanged from r1633421, hive/trunk/ql/src/test/queries/clientnegative/alter_partition_partial_spec_dyndisabled.q
    hive/branches/spark/ql/src/test/queries/clientnegative/authorization_set_invalidconf.q
      - copied unchanged from r1633910, hive/trunk/ql/src/test/queries/clientnegative/authorization_set_invalidconf.q
    hive/branches/spark/ql/src/test/queries/clientpositive/acid_vectorization_partition.q
      - copied unchanged from r1633910, hive/trunk/ql/src/test/queries/clientpositive/acid_vectorization_partition.q
    hive/branches/spark/ql/src/test/queries/clientpositive/acid_vectorization_project.q
      - copied unchanged from r1633910, hive/trunk/ql/src/test/queries/clientpositive/acid_vectorization_project.q
    hive/branches/spark/ql/src/test/queries/clientpositive/annotate_stats_join_pkfk.q
      - copied unchanged from r1633910, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_join_pkfk.q
    hive/branches/spark/ql/src/test/queries/clientpositive/avro_date.q
      - copied unchanged from r1630201, hive/trunk/ql/src/test/queries/clientpositive/avro_date.q
    hive/branches/spark/ql/src/test/queries/clientpositive/avro_deserialize_map_null.q
      - copied unchanged from r1635377, hive/trunk/ql/src/test/queries/clientpositive/avro_deserialize_map_null.q
    hive/branches/spark/ql/src/test/queries/clientpositive/cast_qualified_types.q
      - copied unchanged from r1630201, hive/trunk/ql/src/test/queries/clientpositive/cast_qualified_types.q
    hive/branches/spark/ql/src/test/queries/clientpositive/complex_alias.q
      - copied unchanged from r1633421, hive/trunk/ql/src/test/queries/clientpositive/complex_alias.q
    hive/branches/spark/ql/src/test/queries/clientpositive/index_in_db.q
      - copied unchanged from r1633421, hive/trunk/ql/src/test/queries/clientpositive/index_in_db.q
    hive/branches/spark/ql/src/test/queries/clientpositive/insert0.q
      - copied unchanged from r1634945, hive/trunk/ql/src/test/queries/clientpositive/insert0.q
    hive/branches/spark/ql/src/test/queries/clientpositive/partition_boolexpr.q
      - copied unchanged from r1633910, hive/trunk/ql/src/test/queries/clientpositive/partition_boolexpr.q
    hive/branches/spark/ql/src/test/queries/clientpositive/select_same_col.q
      - copied unchanged from r1634261, hive/trunk/ql/src/test/queries/clientpositive/select_same_col.q
    hive/branches/spark/ql/src/test/queries/clientpositive/sum_expr_with_order.q
      - copied unchanged from r1630201, hive/trunk/ql/src/test/queries/clientpositive/sum_expr_with_order.q
    hive/branches/spark/ql/src/test/queries/clientpositive/timestamp_comparison2.q
      - copied unchanged from r1632135, hive/trunk/ql/src/test/queries/clientpositive/timestamp_comparison2.q
    hive/branches/spark/ql/src/test/queries/clientpositive/transform_acid.q
      - copied unchanged from r1633910, hive/trunk/ql/src/test/queries/clientpositive/transform_acid.q
    hive/branches/spark/ql/src/test/queries/clientpositive/union_date_trim.q
      - copied unchanged from r1633421, hive/trunk/ql/src/test/queries/clientpositive/union_date_trim.q
    hive/branches/spark/ql/src/test/queries/clientpositive/vector_bucket.q
      - copied unchanged from r1635377, hive/trunk/ql/src/test/queries/clientpositive/vector_bucket.q
    hive/branches/spark/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
      - copied unchanged from r1633421, hive/trunk/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
    hive/branches/spark/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
      - copied unchanged from r1631926, hive/trunk/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
    hive/branches/spark/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q
      - copied unchanged from r1633421, hive/trunk/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q
    hive/branches/spark/ql/src/test/results/clientnegative/alter_partition_partial_spec_dyndisabled.q.out
      - copied unchanged from r1633421, hive/trunk/ql/src/test/results/clientnegative/alter_partition_partial_spec_dyndisabled.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_set_invalidconf.q.out
      - copied unchanged from r1633910, hive/trunk/ql/src/test/results/clientnegative/authorization_set_invalidconf.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/acid_vectorization_partition.q.out
      - copied unchanged from r1633910, hive/trunk/ql/src/test/results/clientpositive/acid_vectorization_partition.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/acid_vectorization_project.q.out
      - copied unchanged from r1633910, hive/trunk/ql/src/test/results/clientpositive/acid_vectorization_project.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
      - copied, changed from r1633910, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/avro_date.q.out
      - copied unchanged from r1630201, hive/trunk/ql/src/test/results/clientpositive/avro_date.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/avro_deserialize_map_null.q.out
      - copied unchanged from r1635377, hive/trunk/ql/src/test/results/clientpositive/avro_deserialize_map_null.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/cast_qualified_types.q.out
      - copied unchanged from r1630201, hive/trunk/ql/src/test/results/clientpositive/cast_qualified_types.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/complex_alias.q.out
      - copied unchanged from r1633421, hive/trunk/ql/src/test/results/clientpositive/complex_alias.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_in_db.q.out
      - copied unchanged from r1633421, hive/trunk/ql/src/test/results/clientpositive/index_in_db.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/insert0.q.out
      - copied unchanged from r1634945, hive/trunk/ql/src/test/results/clientpositive/insert0.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/partition_boolexpr.q.out
      - copied unchanged from r1633910, hive/trunk/ql/src/test/results/clientpositive/partition_boolexpr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/select_same_col.q.out
      - copied unchanged from r1634261, hive/trunk/ql/src/test/results/clientpositive/select_same_col.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/sum_expr_with_order.q.out
      - copied unchanged from r1630201, hive/trunk/ql/src/test/results/clientpositive/sum_expr_with_order.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/acid_vectorization.q.out
      - copied unchanged from r1631926, hive/trunk/ql/src/test/results/clientpositive/tez/acid_vectorization.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/skewjoin.q.out
      - copied unchanged from r1635377, hive/trunk/ql/src/test/results/clientpositive/tez/skewjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_bucket.q.out
      - copied unchanged from r1635377, hive/trunk/ql/src/test/results/clientpositive/tez/vector_bucket.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_groupby_reduce.q.out
      - copied unchanged from r1633421, hive/trunk/ql/src/test/results/clientpositive/tez/vector_groupby_reduce.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_partitioned_date_time.q.out
      - copied unchanged from r1631926, hive/trunk/ql/src/test/results/clientpositive/tez/vector_partitioned_date_time.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_reduce_groupby_decimal.q.out
      - copied unchanged from r1633421, hive/trunk/ql/src/test/results/clientpositive/tez/vector_reduce_groupby_decimal.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/timestamp_comparison2.q.out
      - copied unchanged from r1632135, hive/trunk/ql/src/test/results/clientpositive/timestamp_comparison2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/transform_acid.q.out
      - copied unchanged from r1633910, hive/trunk/ql/src/test/results/clientpositive/transform_acid.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union_date_trim.q.out
      - copied unchanged from r1633421, hive/trunk/ql/src/test/results/clientpositive/union_date_trim.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_bucket.q.out
      - copied unchanged from r1635377, hive/trunk/ql/src/test/results/clientpositive/vector_bucket.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_groupby_reduce.q.out
      - copied unchanged from r1633421, hive/trunk/ql/src/test/results/clientpositive/vector_groupby_reduce.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_partitioned_date_time.q.out
      - copied unchanged from r1631926, hive/trunk/ql/src/test/results/clientpositive/vector_partitioned_date_time.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_reduce_groupby_decimal.q.out
      - copied unchanged from r1633421, hive/trunk/ql/src/test/results/clientpositive/vector_reduce_groupby_decimal.q.out
    hive/branches/spark/ql/src/test/scripts/transform_acid_grep.sh
      - copied unchanged from r1633910, hive/trunk/ql/src/test/scripts/transform_acid_grep.sh
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/SerDeSpec.java
      - copied unchanged from r1633421, hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeSpec.java
Removed:
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java
    hive/branches/spark/ql/src/test/queries/clientnegative/ambiguous_col0.q
    hive/branches/spark/ql/src/test/queries/clientnegative/ambiguous_col1.q
    hive/branches/spark/ql/src/test/queries/clientnegative/ambiguous_col2.q
    hive/branches/spark/ql/src/test/queries/clientpositive/avro_schema_error_message.q
    hive/branches/spark/ql/src/test/results/beelinepositive/avro_schema_error_message.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/ambiguous_col0.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/ambiguous_col1.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/ambiguous_col2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/avro_schema_error_message.q.out
    hive/branches/spark/service/src/java/org/apache/hive/service/server/ServerOptionsProcessor.java
Modified:
    hive/branches/spark/   (props changed)
    hive/branches/spark/accumulo-handler/pom.xml
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/columns/TestColumnMapper.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java
    hive/branches/spark/ant/pom.xml
    hive/branches/spark/beeline/pom.xml
    hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLine.java
    hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
    hive/branches/spark/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java
    hive/branches/spark/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java
    hive/branches/spark/beeline/src/java/org/apache/hive/beeline/SeparatedValuesOutputFormat.java
    hive/branches/spark/beeline/src/main/resources/BeeLine.properties
    hive/branches/spark/bin/ext/hiveserver2.cmd
    hive/branches/spark/bin/ext/hiveserver2.sh
    hive/branches/spark/bin/hive
    hive/branches/spark/bin/hive.cmd
    hive/branches/spark/cli/pom.xml
    hive/branches/spark/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
    hive/branches/spark/cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java
    hive/branches/spark/common/pom.xml
    hive/branches/spark/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/spark/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
    hive/branches/spark/contrib/pom.xml
    hive/branches/spark/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java
    hive/branches/spark/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java
    hive/branches/spark/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java
    hive/branches/spark/data/conf/hive-log4j.properties
    hive/branches/spark/hbase-handler/pom.xml   (contents, props changed)
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/ColumnMappings.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseKeyFactory.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseInputFormatUtil.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableOutputFormat.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/LazyHBaseRow.java
    hive/branches/spark/hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java
    hive/branches/spark/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestLazyHBaseObject.java
    hive/branches/spark/hbase-handler/src/test/results/positive/hbase_pushdown.q.out
    hive/branches/spark/hbase-handler/src/test/results/positive/hbase_queries.q.out
    hive/branches/spark/hcatalog/core/pom.xml
    hive/branches/spark/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
    hive/branches/spark/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzerBase.java
    hive/branches/spark/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java
    hive/branches/spark/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/schema/TestHCatSchemaUtils.java
    hive/branches/spark/hcatalog/hcatalog-pig-adapter/pom.xml
    hive/branches/spark/hcatalog/pom.xml
    hive/branches/spark/hcatalog/server-extensions/pom.xml
    hive/branches/spark/hcatalog/src/test/e2e/templeton/README.txt
    hive/branches/spark/hcatalog/src/test/e2e/templeton/build.xml
    hive/branches/spark/hcatalog/src/test/e2e/templeton/deployers/clean_file_system.sh
    hive/branches/spark/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
    hive/branches/spark/hcatalog/src/test/e2e/templeton/deployers/deploy_e2e_artifacts.sh
    hive/branches/spark/hcatalog/src/test/e2e/templeton/deployers/env.sh
    hive/branches/spark/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
    hive/branches/spark/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
    hive/branches/spark/hcatalog/streaming/pom.xml
    hive/branches/spark/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java
    hive/branches/spark/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
    hive/branches/spark/hcatalog/webhcat/java-client/pom.xml
    hive/branches/spark/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatClientHMSImpl.java
    hive/branches/spark/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatPartition.java
    hive/branches/spark/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java
    hive/branches/spark/hcatalog/webhcat/svr/pom.xml
    hive/branches/spark/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/LauncherDelegator.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Server.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/SqoopDelegator.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSStorage.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobStateTracker.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobSubmissionConstants.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonStorage.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperCleanup.java
    hive/branches/spark/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/ZooKeeperStorage.java
    hive/branches/spark/hwi/pom.xml
    hive/branches/spark/itests/custom-serde/pom.xml
    hive/branches/spark/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomSerDe1.java
    hive/branches/spark/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomSerDe2.java
    hive/branches/spark/itests/hcatalog-unit/pom.xml
    hive/branches/spark/itests/hive-minikdc/pom.xml
    hive/branches/spark/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
    hive/branches/spark/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdc.java
    hive/branches/spark/itests/hive-unit-hadoop2/pom.xml
    hive/branches/spark/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java
    hive/branches/spark/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java
    hive/branches/spark/itests/hive-unit/pom.xml
    hive/branches/spark/itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/thrift/TestDBTokenStore.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/thrift/TestZooKeeperTokenStore.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestSchemaTool.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestSSL.java
    hive/branches/spark/itests/pom.xml
    hive/branches/spark/itests/qtest/pom.xml
    hive/branches/spark/itests/src/test/resources/testconfiguration.properties
    hive/branches/spark/itests/test-serde/pom.xml
    hive/branches/spark/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java
    hive/branches/spark/itests/util/pom.xml
    hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
    hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessControllerForTest.java
    hive/branches/spark/jdbc/pom.xml
    hive/branches/spark/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
    hive/branches/spark/jdbc/src/java/org/apache/hive/jdbc/HivePreparedStatement.java
    hive/branches/spark/jdbc/src/java/org/apache/hive/jdbc/Utils.java
    hive/branches/spark/jdbc/src/java/org/apache/hive/jdbc/ZooKeeperHiveClientHelper.java
    hive/branches/spark/metastore/pom.xml
    hive/branches/spark/metastore/scripts/upgrade/derby/hive-schema-0.14.0.derby.sql
    hive/branches/spark/metastore/scripts/upgrade/derby/upgrade.order.derby
    hive/branches/spark/metastore/scripts/upgrade/mssql/upgrade.order.mssql
    hive/branches/spark/metastore/scripts/upgrade/mysql/hive-schema-0.14.0.mysql.sql
    hive/branches/spark/metastore/scripts/upgrade/mysql/upgrade.order.mysql
    hive/branches/spark/metastore/scripts/upgrade/oracle/hive-schema-0.14.0.oracle.sql
    hive/branches/spark/metastore/scripts/upgrade/oracle/upgrade.order.oracle
    hive/branches/spark/metastore/scripts/upgrade/postgres/hive-schema-0.14.0.postgres.sql
    hive/branches/spark/metastore/scripts/upgrade/postgres/upgrade.order.postgres
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
    hive/branches/spark/metastore/src/test/org/apache/hadoop/hive/metastore/DummyListener.java
    hive/branches/spark/metastore/src/test/org/apache/hadoop/hive/metastore/DummyPreListener.java
    hive/branches/spark/odbc/pom.xml
    hive/branches/spark/packaging/pom.xml
    hive/branches/spark/pom.xml
    hive/branches/spark/ql/pom.xml
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/FilterOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorUtils.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/OrcFileMergeOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/PTFOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/RowSchema.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/ScriptOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/SelectOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsNoJobTask.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/UnionOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapper.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/CustomPartitionVertex.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/CustomVertexConfiguration.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DynamicPartitionPruner.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordSource.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MergeFileRecordProcessor.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/RecordProcessor.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/ReduceRecordProcessor.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezProcessor.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/tools/KeyValueInputMerger.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorExtractOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFileSinkOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFilterOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupByOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupKeyHelper.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorSMBMapJoinOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorSelectOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedBatchUtil.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/index/IndexPredicateAnalyzer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/AcidInputFormat.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/AcidUtils.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRawRecordMerger.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSerde.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/VectorizedOrcAcidRowReader.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/MapredParquetOutputFormat.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/read/DataWritableReadSupport.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/serde/ParquetHiveSerDe.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/timestamp/NanoTime.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/write/ParquetRecordWriterWrapper.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentImpl.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPruner.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GroupByOptimizer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/MergeJoinProc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ReduceSinkMapJoinProc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SetReducerParallelism.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/index/RewriteParseContextGenerator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/HiveOptiqUtil.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/rules/HivePushFilterPastJoinRule.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/stats/FilterSelectivityEstimator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/stats/HiveRelMdRowCount.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/stats/HiveRelMdSelectivity.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/stats/HiveRelMdUniqueKeys.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/ASTBuilder.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/ASTConverter.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/PlanModifierForASTConv.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/RexNodeConverter.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/SqlFunctionConverter.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/pcr/PcrOpProcFactory.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezWork.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveSemanticAnalyzerHookContext.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveSemanticAnalyzerHookContextImpl.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/QB.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableDesc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/BaseWork.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ColStatistics.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/DropIndexDesc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeDesc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeDescUtils.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceWork.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowFunctionsDesc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAccessController.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizerImpl.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessControllerWrapper.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsUtils.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorThread.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUtils.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/util/ZooKeeperHiveHelper.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestFunctionRegistry.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezSessionPool.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezSessionState.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorSelectOperator.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/io/TestAcidUtils.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcRawRecordMerger.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/TestMapredParquetOutputFormat.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/plan/TestReadEntityDirect.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessControllerCLI.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessControllerHS2.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java
    hive/branches/spark/ql/src/test/queries/clientnegative/authorization_disallow_transform.q
    hive/branches/spark/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q
    hive/branches/spark/ql/src/test/queries/clientpositive/acid_vectorization.q
    hive/branches/spark/ql/src/test/queries/clientpositive/alter_partition_change_col.q
    hive/branches/spark/ql/src/test/queries/clientpositive/authorization_role_grant2.q
    hive/branches/spark/ql/src/test/queries/clientpositive/cbo_correctness.q
    hive/branches/spark/ql/src/test/queries/clientpositive/constprog2.q
    hive/branches/spark/ql/src/test/queries/clientpositive/constprog_type.q
    hive/branches/spark/ql/src/test/queries/clientpositive/create_like.q
    hive/branches/spark/ql/src/test/queries/clientpositive/ctas_colname.q
    hive/branches/spark/ql/src/test/queries/clientpositive/decimal_serde.q
    hive/branches/spark/ql/src/test/queries/clientpositive/drop_index.q
    hive/branches/spark/ql/src/test/queries/clientpositive/index_auto_partitioned.q
    hive/branches/spark/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q
    hive/branches/spark/ql/src/test/queries/clientpositive/join_vc.q
    hive/branches/spark/ql/src/test/queries/clientpositive/optimize_nullscan.q
    hive/branches/spark/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
    hive/branches/spark/ql/src/test/queries/clientpositive/pcr.q
    hive/branches/spark/ql/src/test/queries/clientpositive/ptf_matchpath.q
    hive/branches/spark/ql/src/test/queries/clientpositive/show_functions.q
    hive/branches/spark/ql/src/test/queries/clientpositive/tez_smb_1.q
    hive/branches/spark/ql/src/test/queries/clientpositive/vector_data_types.q
    hive/branches/spark/ql/src/test/queries/clientpositive/windowing.q
    hive/branches/spark/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/ambiguous_col.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_disallow_transform.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_show_role_principals_no_admin.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/set_hiveconf_validation2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/acid_vectorization.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/alter_partition_change_col.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ambiguous_col.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_part.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/authorization_role_grant2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_join11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_join12.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_join13.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_join14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_join16.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_join27.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_join29.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/bucket3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/cbo_correctness.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/cluster.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/constprog2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/constprog_dp.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/constprog_type.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/create_like.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/cross_product_check_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ctas_colname.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_serde.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_udf.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/delete_all_partitioned.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/groupby_ppd.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auth.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto_file_format.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto_multiple.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto_partitioned.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto_self_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto_unused.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_auto_update.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_bitmap_compression.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_compression.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_serde.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input23.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input25.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input26.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input42.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input_part0.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input_part1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input_part2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input_part3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input_part5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input_part7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input_part8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/input_part9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join12.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join13.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join16.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join34.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join35.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join38.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/join_vc.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/lateral_view.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/lateral_view_noalias.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/nonmr_fetch.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/optimize_nullscan.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/parallel.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/pcr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_clusterby.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_gby_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_join2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_join3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_join4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_random.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_udf_case.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_udf_col.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ptf_matchpath.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/quotedid_basic.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/quotedid_partition.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/regex_col.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/sample1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/sample8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/semijoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/show_functions.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/show_indexes_syntax.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/skewjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/skewjoinopt10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/subquery_exists.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/subquery_in.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/subquery_in_having.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/subquery_views.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/bucket3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/cbo_correctness.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/sample1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_in.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_smb_1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/union7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_char_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/transform_ppr2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union15.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union17.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union19.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union20.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union21.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union24.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union26.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union29.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union30.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union34.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union_ppr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union_remove_10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union_remove_11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union_remove_19.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union_remove_25.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union_view.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/update_all_partitioned.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_data_types.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/windowing.q.out
    hive/branches/spark/ql/src/test/results/compiler/plan/cast1.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/groupby1.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/groupby2.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/groupby3.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/groupby4.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/groupby5.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/groupby6.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/input20.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/input4.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/input5.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/input_part1.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/join1.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/join2.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/join3.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/join4.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/join5.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/join6.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/join7.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/join8.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/sample1.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/udf1.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/udf4.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/udf6.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/udf_case.q.xml
    hive/branches/spark/ql/src/test/results/compiler/plan/udf_when.q.xml
    hive/branches/spark/serde/pom.xml
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/AbstractSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/OpenCSVSerde.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/BaseCharTypeInfo.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/CharTypeInfo.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/DecimalTypeInfo.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/VarcharTypeInfo.java
    hive/branches/spark/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroDeserializer.java
    hive/branches/spark/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerde.java
    hive/branches/spark/serde/src/test/org/apache/hadoop/hive/serde2/io/TestDateWritable.java
    hive/branches/spark/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazyArrayMapStruct.java
    hive/branches/spark/service/pom.xml
    hive/branches/spark/service/src/java/org/apache/hive/service/auth/HiveAuthFactory.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/CLIService.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/thrift/EmbeddedThriftBinaryCLIService.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpServlet.java
    hive/branches/spark/service/src/java/org/apache/hive/service/server/HiveServer2.java
    hive/branches/spark/service/src/test/org/apache/hive/service/auth/TestPlainSaslHelper.java
    hive/branches/spark/service/src/test/org/apache/hive/service/cli/session/TestSessionGlobalInitFile.java
    hive/branches/spark/service/src/test/org/apache/hive/service/server/TestServerOptionsProcessor.java
    hive/branches/spark/shims/0.20/pom.xml
    hive/branches/spark/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
    hive/branches/spark/shims/0.20S/pom.xml
    hive/branches/spark/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
    hive/branches/spark/shims/0.23/pom.xml
    hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
    hive/branches/spark/shims/aggregator/pom.xml
    hive/branches/spark/shims/common-secure/pom.xml
    hive/branches/spark/shims/common-secure/src/main/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java
    hive/branches/spark/shims/common-secure/src/main/java/org/apache/hadoop/hive/thrift/DBTokenStore.java
    hive/branches/spark/shims/common-secure/src/main/java/org/apache/hadoop/hive/thrift/DelegationTokenStore.java
    hive/branches/spark/shims/common-secure/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge20S.java
    hive/branches/spark/shims/common-secure/src/main/java/org/apache/hadoop/hive/thrift/MemoryTokenStore.java
    hive/branches/spark/shims/common-secure/src/main/java/org/apache/hadoop/hive/thrift/TokenStoreDelegationTokenSecretManager.java
    hive/branches/spark/shims/common-secure/src/main/java/org/apache/hadoop/hive/thrift/ZooKeeperTokenStore.java
    hive/branches/spark/shims/common/pom.xml
    hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
    hive/branches/spark/shims/common/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java
    hive/branches/spark/shims/pom.xml
    hive/branches/spark/testutils/pom.xml
    hive/branches/spark/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java
    hive/branches/spark/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java
    hive/branches/spark/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/ExecutionContext.java
    hive/branches/spark/testutils/ptest2/src/main/resources/batch-exec.vm
    hive/branches/spark/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java
    hive/branches/spark/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
    hive/branches/spark/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt

Propchange: hive/branches/spark/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1629563-1630201,1630203-1631009,1631011-1631470,1631472-1631926,1631928-1632135,1632137-1633421,1633423-1633910,1633912-1634261,1634263-1634441,1634443-1634635,1634637-1634945,1634947-1635377

Modified: hive/branches/spark/accumulo-handler/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/spark/accumulo-handler/pom.xml?rev=1635536&r1=1635535&r2=1635536&view=diff
==============================================================================
--- hive/branches/spark/accumulo-handler/pom.xml (original)
+++ hive/branches/spark/accumulo-handler/pom.xml Thu Oct 30 16:22:33 2014
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.hive</groupId>
     <artifactId>hive</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java?rev=1635536&r1=1635535&r2=1635536&view=diff
==============================================================================
--- hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java (original)
+++ hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ColumnMapper.java Thu Oct 30 16:22:33 2014
@@ -20,11 +20,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.hive.accumulo.AccumuloHiveConstants;
 import org.apache.hadoop.hive.accumulo.serde.TooManyAccumuloColumnsException;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
-import org.apache.hadoop.util.StringUtils;
 import org.apache.log4j.Logger;
 
 import com.google.common.base.Preconditions;

Modified: hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/columns/TestColumnMapper.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/columns/TestColumnMapper.java?rev=1635536&r1=1635535&r2=1635536&view=diff
==============================================================================
--- hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/columns/TestColumnMapper.java (original)
+++ hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/columns/TestColumnMapper.java Thu Oct 30 16:22:33 2014
@@ -20,12 +20,12 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.hive.accumulo.AccumuloHiveConstants;
 import org.apache.hadoop.hive.accumulo.serde.TooManyAccumuloColumnsException;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
-import org.apache.hadoop.util.StringUtils;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java?rev=1635536&r1=1635535&r2=1635536&view=diff
==============================================================================
--- hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java (original)
+++ hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/FirstCharAccumuloCompositeRowId.java Thu Oct 30 16:22:33 2014
@@ -19,10 +19,10 @@ package org.apache.hadoop.hive.accumulo.
 import java.util.Arrays;
 import java.util.Properties;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector;
-import org.apache.hadoop.util.StringUtils;
 import org.apache.log4j.Logger;
 
 /**

Modified: hive/branches/spark/ant/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/spark/ant/pom.xml?rev=1635536&r1=1635535&r2=1635536&view=diff
==============================================================================
--- hive/branches/spark/ant/pom.xml (original)
+++ hive/branches/spark/ant/pom.xml Thu Oct 30 16:22:33 2014
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.hive</groupId>
     <artifactId>hive</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: hive/branches/spark/beeline/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/spark/beeline/pom.xml?rev=1635536&r1=1635535&r2=1635536&view=diff
==============================================================================
--- hive/branches/spark/beeline/pom.xml (original)
+++ hive/branches/spark/beeline/pom.xml Thu Oct 30 16:22:33 2014
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.hive</groupId>
     <artifactId>hive</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>0.15.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLine.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLine.java?rev=1635536&r1=1635535&r2=1635536&view=diff
==============================================================================
--- hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLine.java (original)
+++ hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLine.java Thu Oct 30 16:22:33 2014
@@ -145,9 +145,11 @@ public class BeeLine implements Closeabl
   private final Map<Object, Object> formats = map(new Object[] {
       "vertical", new VerticalOutputFormat(this),
       "table", new TableOutputFormat(this),
-      "csv", new SeparatedValuesOutputFormat(this, ','),
-      "tsv", new SeparatedValuesOutputFormat(this, '\t'),
+      "csv2", new SeparatedValuesOutputFormat(this, ','),
+      "tsv2", new SeparatedValuesOutputFormat(this, '\t'),
       "dsv", new SeparatedValuesOutputFormat(this, BeeLineOpts.DEFAULT_DELIMITER_FOR_DSV),
+      "csv", new DeprecatedSeparatedValuesOutputFormat(this, ','),
+      "tsv", new DeprecatedSeparatedValuesOutputFormat(this, '\t'),
       "xmlattr", new XMLAttributeOutputFormat(this),
       "xmlelements", new XMLElementOutputFormat(this),
   });

Modified: hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java?rev=1635536&r1=1635535&r2=1635536&view=diff
==============================================================================
--- hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java (original)
+++ hive/branches/spark/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java Thu Oct 30 16:22:33 2014
@@ -427,6 +427,9 @@ class BeeLineOpts implements Completor {
   }
 
   public void setOutputFormat(String outputFormat) {
+    if(outputFormat.equalsIgnoreCase("csv") || outputFormat.equalsIgnoreCase("tsv")) {
+      beeLine.info("Format " + outputFormat + " is deprecated, please use " + outputFormat + "2");
+    }
     this.outputFormat = outputFormat;
   }