hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1659014 [1/25] - in /hive/branches/parquet: ./ beeline/src/java/org/apache/hive/beeline/ beeline/src/main/resources/ beeline/src/test/org/apache/hive/beeline/ bin/ common/src/java/org/apache/hadoop/hive/conf/ data/conf/ data/conf/spark/ da...
Date Wed, 11 Feb 2015 17:48:41 GMT
Author: brock
Date: Wed Feb 11 17:48:36 2015
New Revision: 1659014

URL: http://svn.apache.org/r1659014
Log:
Merge from trunk

Added:
    hive/branches/parquet/data/conf/spark/standalone/
      - copied from r1659011, hive/trunk/data/conf/spark/standalone/
    hive/branches/parquet/data/conf/spark/yarn-client/
      - copied from r1659011, hive/trunk/data/conf/spark/yarn-client/
    hive/branches/parquet/data/files/StringMapOfOptionalIntArray.parquet
      - copied unchanged from r1659011, hive/trunk/data/files/StringMapOfOptionalIntArray.parquet
    hive/branches/parquet/data/files/tsformat.json
      - copied unchanged from r1659011, hive/trunk/data/files/tsformat.json
    hive/branches/parquet/jdbc/src/resources/
      - copied from r1659011, hive/trunk/jdbc/src/resources/
    hive/branches/parquet/metastore/scripts/upgrade/derby/hive-schema-1.1.0.derby.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/derby/hive-schema-1.1.0.derby.sql
    hive/branches/parquet/metastore/scripts/upgrade/derby/hive-schema-1.2.0.derby.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/derby/hive-schema-1.2.0.derby.sql
    hive/branches/parquet/metastore/scripts/upgrade/derby/upgrade-0.14.0-to-1.1.0.derby.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/derby/upgrade-0.14.0-to-1.1.0.derby.sql
    hive/branches/parquet/metastore/scripts/upgrade/derby/upgrade-1.1.0-to-1.2.0.derby.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/derby/upgrade-1.1.0-to-1.2.0.derby.sql
    hive/branches/parquet/metastore/scripts/upgrade/mssql/hive-schema-1.1.0.mssql.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/mssql/hive-schema-1.1.0.mssql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mssql/hive-schema-1.2.0.mssql.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/mssql/hive-schema-1.2.0.mssql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mssql/upgrade-0.14.0-to-1.1.0.mssql.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/mssql/upgrade-0.14.0-to-1.1.0.mssql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mssql/upgrade-1.1.0-to-1.2.0.mssql.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/mssql/upgrade-1.1.0-to-1.2.0.mssql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mysql/hive-schema-1.1.0.mysql.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-1.1.0.mysql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mysql/hive-schema-1.2.0.mysql.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-1.2.0.mysql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mysql/upgrade-0.14.0-to-1.1.0.mysql.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/mysql/upgrade-0.14.0-to-1.1.0.mysql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mysql/upgrade-1.1.0-to-1.2.0.mysql.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/mysql/upgrade-1.1.0-to-1.2.0.mysql.sql
    hive/branches/parquet/metastore/scripts/upgrade/oracle/hive-schema-1.1.0.oracle.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-1.1.0.oracle.sql
    hive/branches/parquet/metastore/scripts/upgrade/oracle/hive-schema-1.2.0.oracle.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-1.2.0.oracle.sql
    hive/branches/parquet/metastore/scripts/upgrade/oracle/upgrade-0.14.0-to-1.1.0.oracle.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/oracle/upgrade-0.14.0-to-1.1.0.oracle.sql
    hive/branches/parquet/metastore/scripts/upgrade/oracle/upgrade-1.1.0-to-1.2.0.oracle.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/oracle/upgrade-1.1.0-to-1.2.0.oracle.sql
    hive/branches/parquet/metastore/scripts/upgrade/postgres/hive-schema-1.1.0.postgres.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-1.1.0.postgres.sql
    hive/branches/parquet/metastore/scripts/upgrade/postgres/hive-schema-1.2.0.postgres.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-1.2.0.postgres.sql
    hive/branches/parquet/metastore/scripts/upgrade/postgres/upgrade-0.14.0-to-1.1.0.postgres.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/postgres/upgrade-0.14.0-to-1.1.0.postgres.sql
    hive/branches/parquet/metastore/scripts/upgrade/postgres/upgrade-1.1.0-to-1.2.0.postgres.sql
      - copied unchanged from r1659011, hive/trunk/metastore/scripts/upgrade/postgres/upgrade-1.1.0-to-1.2.0.postgres.sql
    hive/branches/parquet/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
      - copied unchanged from r1659011, hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
    hive/branches/parquet/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
      - copied unchanged from r1659011, hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
    hive/branches/parquet/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
      - copied unchanged from r1659011, hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/filters/
      - copied from r1659011, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/filters/
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUtils.java
      - copied unchanged from r1659011, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUtils.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkSMBMapJoinInfo.java
      - copied unchanged from r1659011, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkSMBMapJoinInfo.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCurrentUser.java
      - copied unchanged from r1659011, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCurrentUser.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNextDay.java
      - copied unchanged from r1659011, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNextDay.java
    hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/io/filters/
      - copied from r1659011, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/filters/
    hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFNextDay.java
      - copied unchanged from r1659011, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFNextDay.java
    hive/branches/parquet/ql/src/test/queries/clientnegative/udf_add_months_error_1.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/udf_add_months_error_1.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/udf_add_months_error_2.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/udf_add_months_error_2.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/udf_last_day_error_1.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/udf_last_day_error_1.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/udf_last_day_error_2.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/udf_last_day_error_2.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/udf_next_day_error_1.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/udf_next_day_error_1.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/udf_next_day_error_2.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/udf_next_day_error_2.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/unionClusterBy.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/unionClusterBy.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/unionDistributeBy.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/unionDistributeBy.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/unionLimit.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/unionLimit.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/unionOrderBy.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/unionOrderBy.q
    hive/branches/parquet/ql/src/test/queries/clientnegative/unionSortBy.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientnegative/unionSortBy.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/json_serde_tsformat.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/json_serde_tsformat.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/lateral_view_explode2.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/lateral_view_explode2.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/parquet_map_of_arrays_of_ints.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/parquet_map_of_arrays_of_ints.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/parquet_write_correct_definition_levels.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/parquet_write_correct_definition_levels.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/udf_current_user.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/udf_current_user.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/udf_decode.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/udf_decode.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/udf_next_day.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/udf_next_day.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/unionDistinct_1.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/unionDistinct_1.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/unionDistinct_2.q
      - copied unchanged from r1659011, hive/trunk/ql/src/test/queries/clientpositive/unionDistinct_2.q
    hive/branches/parquet/ql/src/test/resources/orc-file-dump-bloomfilter.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/resources/orc-file-dump-bloomfilter.out
    hive/branches/parquet/ql/src/test/resources/orc-file-dump-bloomfilter2.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/resources/orc-file-dump-bloomfilter2.out
    hive/branches/parquet/ql/src/test/results/clientnegative/udf_add_months_error_1.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/udf_add_months_error_1.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/udf_add_months_error_2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/udf_add_months_error_2.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/udf_last_day_error_1.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/udf_last_day_error_1.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/udf_last_day_error_2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/udf_last_day_error_2.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/udf_next_day_error_1.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/udf_next_day_error_1.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/udf_next_day_error_2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/udf_next_day_error_2.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/unionClusterBy.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/unionClusterBy.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/unionDistributeBy.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/unionDistributeBy.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/unionLimit.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/unionLimit.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/unionOrderBy.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/unionOrderBy.q.out
    hive/branches/parquet/ql/src/test/results/clientnegative/unionSortBy.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientnegative/unionSortBy.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/json_serde_tsformat.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/json_serde_tsformat.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/lateral_view_explode2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/lateral_view_explode2.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/parquet_map_of_arrays_of_ints.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/parquet_map_of_arrays_of_ints.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/parquet_write_correct_definition_levels.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/parquet_write_correct_definition_levels.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/show_functions.q.out.orig
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/show_functions.q.out.orig
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/bucket5.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/bucket5.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/bucket6.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/bucket6.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/bucketizedhiveinputformat.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/bucketizedhiveinputformat.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/constprog_partitioner.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/constprog_partitioner.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/empty_dir_in_table.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/empty_dir_in_table.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/external_table_with_space_in_location_path.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/external_table_with_space_in_location_path.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/file_with_header_footer.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/file_with_header_footer.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/import_exported_table.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/import_exported_table.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/index_bitmap3.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/index_bitmap3.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/index_bitmap_auto.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/index_bitmap_auto.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/infer_bucket_sort_merge.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/infer_bucket_sort_merge.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/infer_bucket_sort_reducers_power_two.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/infer_bucket_sort_reducers_power_two.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/input16_cc.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/input16_cc.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/lateral_view_explode2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/lateral_view_explode2.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.java1.7.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.java1.7.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/load_fs2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/load_fs2.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/load_hdfs_file_with_space_in_the_name.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/load_hdfs_file_with_space_in_the_name.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx_cbo_1.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx_cbo_1.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/remote_script.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/remote_script.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/root_dir_external_table.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/root_dir_external_table.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/schemeAuthority.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/schemeAuthority.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/schemeAuthority2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/schemeAuthority2.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/temp_table_external.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/temp_table_external.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/uber_reduce.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/spark/uber_reduce.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/orc_merge8.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge8.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/udf_current_user.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/udf_current_user.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/udf_decode.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/udf_decode.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/udf_next_day.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/udf_next_day.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/unionDistinct_1.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/unionDistinct_1.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/unionDistinct_2.q.out
      - copied unchanged from r1659011, hive/trunk/ql/src/test/results/clientpositive/unionDistinct_2.q.out
    hive/branches/parquet/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/MiniSparkOnYARNCluster.java
      - copied unchanged from r1659011, hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/MiniSparkOnYARNCluster.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientUtilities.java
      - copied unchanged from r1659011, hive/trunk/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientUtilities.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/rpc/SaslHandler.java
      - copied unchanged from r1659011, hive/trunk/spark-client/src/main/java/org/apache/hive/spark/client/rpc/SaslHandler.java
Removed:
    hive/branches/parquet/data/conf/spark/hive-site.xml
    hive/branches/parquet/metastore/scripts/upgrade/derby/hive-schema-0.15.0.derby.sql
    hive/branches/parquet/metastore/scripts/upgrade/derby/upgrade-0.14.0-to-0.15.0.derby.sql
    hive/branches/parquet/metastore/scripts/upgrade/mssql/hive-schema-0.15.0.mssql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mssql/upgrade-0.14.0-to-0.15.0.mssql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mysql/hive-schema-0.15.0.mysql.sql
    hive/branches/parquet/metastore/scripts/upgrade/mysql/upgrade-0.14.0-to-0.15.0.mysql.sql
    hive/branches/parquet/metastore/scripts/upgrade/oracle/hive-schema-0.15.0.oracle.sql
    hive/branches/parquet/metastore/scripts/upgrade/oracle/upgrade-0.14.0-to-0.15.0.oracle.sql
    hive/branches/parquet/metastore/scripts/upgrade/postgres/hive-schema-0.15.0.postgres.sql
    hive/branches/parquet/metastore/scripts/upgrade/postgres/upgrade-0.14.0-to-0.15.0.postgres.sql
Modified:
    hive/branches/parquet/   (props changed)
    hive/branches/parquet/beeline/src/java/org/apache/hive/beeline/BeeLine.java
    hive/branches/parquet/beeline/src/main/resources/BeeLine.properties
    hive/branches/parquet/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
    hive/branches/parquet/bin/hive
    hive/branches/parquet/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/parquet/data/conf/hive-log4j.properties
    hive/branches/parquet/hbase-handler/pom.xml   (props changed)
    hive/branches/parquet/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java
    hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java
    hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java
    hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java
    hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/InsertMessage.java
    hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageDeserializer.java
    hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageFactory.java
    hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONInsertMessage.java
    hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageDeserializer.java
    hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java
    hive/branches/parquet/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/TestDbNotificationListener.java
    hive/branches/parquet/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/storage/ColumnarStorageBench.java
    hive/branches/parquet/itests/pom.xml
    hive/branches/parquet/itests/qtest-spark/pom.xml
    hive/branches/parquet/itests/src/test/resources/testconfiguration.properties
    hive/branches/parquet/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
    hive/branches/parquet/jdbc/pom.xml
    hive/branches/parquet/metastore/if/hive_metastore.thrift
    hive/branches/parquet/metastore/scripts/upgrade/derby/upgrade.order.derby
    hive/branches/parquet/metastore/scripts/upgrade/mssql/upgrade.order.mssql
    hive/branches/parquet/metastore/scripts/upgrade/mysql/upgrade.order.mysql
    hive/branches/parquet/metastore/scripts/upgrade/oracle/upgrade.order.oracle
    hive/branches/parquet/metastore/scripts/upgrade/postgres/upgrade.order.postgres
    hive/branches/parquet/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
    hive/branches/parquet/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
    hive/branches/parquet/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
    hive/branches/parquet/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
    hive/branches/parquet/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
    hive/branches/parquet/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
    hive/branches/parquet/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
    hive/branches/parquet/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
    hive/branches/parquet/metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php
    hive/branches/parquet/metastore/src/gen/thrift/gen-php/metastore/Types.php
    hive/branches/parquet/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
    hive/branches/parquet/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
    hive/branches/parquet/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
    hive/branches/parquet/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
    hive/branches/parquet/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
    hive/branches/parquet/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hive/branches/parquet/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
    hive/branches/parquet/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
    hive/branches/parquet/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
    hive/branches/parquet/metastore/src/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java
    hive/branches/parquet/packaging/src/main/assembly/bin.xml
    hive/branches/parquet/packaging/src/main/assembly/src.xml
    hive/branches/parquet/pom.xml
    hive/branches/parquet/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/OrcProto.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorUtils.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsNoJobTask.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/RemoteHiveSparkClient.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkPlanGenerator.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/impl/LocalSparkJobStatus.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/impl/RemoteSparkJobStatus.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/InStream.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/IntegerWriter.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcOutputFormat.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerWriter.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerWriterV2.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StreamName.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/serde/ParquetHiveSerDe.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/timestamp/NanoTimeUtils.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GlobalLimitOptimizer.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/RelOptHiveTable.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTConverter.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ExprNodeConverter.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/index/RewriteParseContextGenerator.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/index/RewriteQueryUsingAggregateIndexCtx.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkSortMergeJoinFactory.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/GenSparkProcContext.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/GenSparkUtils.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/GenSparkWork.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkCompiler.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsNoJobWork.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAddMonths.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateAdd.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateSub.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLastDay.java
    hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFInline.java
    hive/branches/parquet/ql/src/protobuf/org/apache/hadoop/hive/ql/io/orc/orc_proto.proto
    hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestFileDump.java
    hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
    hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestRecordReaderImpl.java
    hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFAddMonths.java
    hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFLastDay.java
    hive/branches/parquet/ql/src/test/queries/clientpositive/cbo_union.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/explode_null.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/groupby10.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/groupby_multi_insert_common_distinct.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/input25.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/input26.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/load_dyn_part14.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/orc_analyze.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/script_env_var1.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/script_env_var2.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/udf_add_months.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/udf_last_day.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/union3.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/union_null.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/union_remove_25.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/union_top_level.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/vector_multi_insert.q
    hive/branches/parquet/ql/src/test/queries/clientpositive/windowing_windowspec.q
    hive/branches/parquet/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
    hive/branches/parquet/ql/src/test/resources/orc-file-dump.out
    hive/branches/parquet/ql/src/test/resources/orc-file-has-null.out
    hive/branches/parquet/ql/src/test/results/clientpositive/annotate_stats_part.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/annotate_stats_table.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/ba_table_union.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/cbo_union.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/char_union1.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/explain_logical.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/explode_null.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby10.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby11.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby8.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby8_map.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby8_map_skew.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby8_noskew.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby9.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby_multi_insert_common_distinct.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/input25.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/input26.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/input_part7.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/join34.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/join35.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/limit_pushdown.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/load_dyn_part14.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/merge4.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/metadataOnlyOptimizer.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/metadata_only_queries.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/optimize_nullscan.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/orc_analyze.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/ptf.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/script_env_var1.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/script_env_var2.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/show_functions.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby10.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby11.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby8.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby8_map.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby8_map_skew.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby8_noskew.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby9.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/join34.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/join35.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/metadata_only_queries.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/metadata_only_queries_with_filters.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/ptf.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/script_env_var1.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/script_env_var2.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/union3.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/union_null.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/union_ppr.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/subquery_notin.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/subquery_views.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/cbo_union.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/limit_pushdown.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/orc_analyze.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/ptf.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/script_env_var1.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/script_env_var2.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/union3.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vector_left_outer_join.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vector_varchar_simple.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_0.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_13.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_14.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_15.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_16.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_7.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_8.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_9.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_div0.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_limit.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_pushdown.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorization_short_regress.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorized_distinct_gby.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorized_mapjoin.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorized_nested_mapjoin.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/tez/vectorized_shufflejoin.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/udf_add_months.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/udf_last_day.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/union17.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/union22.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/union24.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/union3.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/union_null.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/union_ppr.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/union_remove_25.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/union_top_level.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/varchar_union1.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vector_char_simple.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vector_coalesce.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vector_decimal_cast.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vector_elt.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vector_if_expr.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vector_left_outer_join.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vector_multi_insert.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vector_varchar_simple.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_0.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_13.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_14.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_15.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_16.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_7.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_8.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_9.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_div0.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_limit.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_pushdown.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorization_short_regress.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_case.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_casts.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_distinct_gby.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_math_funcs.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_nested_mapjoin.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_ptf.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/vectorized_string_funcs.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/windowing_streaming.q.out
    hive/branches/parquet/ql/src/test/results/clientpositive/windowing_windowspec.q.out
    hive/branches/parquet/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java
    hive/branches/parquet/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java
    hive/branches/parquet/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
    hive/branches/parquet/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
    hive/branches/parquet/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
    hive/branches/parquet/shims/common/src/main/java/org/apache/hadoop/hive/shims/Utils.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/JobContext.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/JobContextImpl.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientFactory.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/rpc/KryoMessageCodec.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/rpc/README.md
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/rpc/Rpc.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/rpc/RpcConfiguration.java
    hive/branches/parquet/spark-client/src/main/java/org/apache/hive/spark/client/rpc/RpcServer.java
    hive/branches/parquet/spark-client/src/test/java/org/apache/hive/spark/client/rpc/TestKryoMessageCodec.java
    hive/branches/parquet/spark-client/src/test/java/org/apache/hive/spark/client/rpc/TestRpc.java

Propchange: hive/branches/parquet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 11 17:48:36 2015
@@ -1,5 +1,7 @@
 /hive/branches/branch-0.11:1480385,1480458,1481120,1481344,1481346,1481348,1481352,1483872,1505184
+/hive/branches/branch-1.1:1658284
 /hive/branches/cbo:1605012-1627125
-/hive/branches/spark:1608589-1654414
+/hive/branches/spark:1608589-1657401
 /hive/branches/tez:1494760-1622766
 /hive/branches/vectorization:1466908-1527856
+/hive/trunk:1656617-1659011

Modified: hive/branches/parquet/beeline/src/java/org/apache/hive/beeline/BeeLine.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/beeline/src/java/org/apache/hive/beeline/BeeLine.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/beeline/src/java/org/apache/hive/beeline/BeeLine.java (original)
+++ hive/branches/parquet/beeline/src/java/org/apache/hive/beeline/BeeLine.java Wed Feb 11 17:48:36 2015
@@ -39,6 +39,9 @@ import java.lang.reflect.Modifier;
 import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.Driver;
@@ -87,7 +90,6 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.hadoop.io.IOUtils;
 
-
 /**
  * A console SQL shell with command completion.
  * <p>
@@ -294,6 +296,14 @@ public class BeeLine implements Closeabl
         .withDescription("the password to connect as")
         .create('p'));
 
+    // -w (or) --password-file <file>
+    options.addOption(OptionBuilder
+        .hasArg()
+        .withArgName("password-file")
+        .withDescription("the password file to read password from")
+        .withLongOpt("password-file")
+        .create('w'));
+
     // -a <authType>
     options.addOption(OptionBuilder
         .hasArg()
@@ -660,7 +670,11 @@ public class BeeLine implements Closeabl
     auth = cl.getOptionValue("a");
     user = cl.getOptionValue("n");
     getOpts().setAuthType(auth);
-    pass = cl.getOptionValue("p");
+    if (cl.hasOption("w")) {
+      pass = obtainPasswordFromFile(cl.getOptionValue("w"));
+    } else {
+      pass = cl.getOptionValue("p");
+    }
     url = cl.getOptionValue("u");
     getOpts().setInitFile(cl.getOptionValue("i"));
     getOpts().setScriptFile(cl.getOptionValue("f"));
@@ -708,6 +722,19 @@ public class BeeLine implements Closeabl
     return code;
   }
 
+  /**
+   * Obtains a password from the passed file path.
+   */
+  private String obtainPasswordFromFile(String passwordFilePath) {
+    try {
+      Path path = Paths.get(passwordFilePath);
+      byte[] passwordFileContents = Files.readAllBytes(path);
+      return new String(passwordFileContents, "UTF-8").trim();
+    } catch (Exception e) {
+      throw new RuntimeException("Unable to read user password from the password file: "
+          + passwordFilePath, e);
+    }
+  }
 
   /**
    * Start accepting input from stdin, and dispatch it

Modified: hive/branches/parquet/beeline/src/main/resources/BeeLine.properties
URL: http://svn.apache.org/viewvc/hive/branches/parquet/beeline/src/main/resources/BeeLine.properties?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/beeline/src/main/resources/BeeLine.properties (original)
+++ hive/branches/parquet/beeline/src/main/resources/BeeLine.properties Wed Feb 11 17:48:36 2015
@@ -148,6 +148,7 @@ cmd-usage: Usage: java org.apache.hive.c
 \  -i <init file>                  script file for initialization\n \
 \  -e <query>                      query that should be executed\n \
 \  -f <exec file>                  script file that should be executed\n \
+\  -w (or) --password-file <password file>  the password file to read password from\n \
 \  --hiveconf property=value       Use value for given property\n \
 \  --hivevar name=value            hive variable name and value\n \
 \                                  This is Hive specific settings in which variables\n \

Modified: hive/branches/parquet/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java (original)
+++ hive/branches/parquet/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java Wed Feb 11 17:48:36 2015
@@ -21,6 +21,9 @@ package org.apache.hive.beeline;
 import java.util.ArrayList;
 import java.util.List;
 
+import java.io.File;
+import java.io.FileOutputStream;
+
 import junit.framework.Assert;
 
 import org.junit.Test;
@@ -61,6 +64,25 @@ public class TestBeelineArgParsing {
     Assert.assertTrue(bl.getOpts().getAuthType().equals("authType"));
   }
 
+  @Test
+  public void testPasswordFileArgs() throws Exception {
+    TestBeeline bl = new TestBeeline();
+    File passFile = new File("file.password");
+    passFile.deleteOnExit();
+    FileOutputStream passFileOut = new FileOutputStream(passFile);
+    passFileOut.write("mypass\n".getBytes());
+    passFileOut.close();
+    String args[] = new String[] {"-u", "url", "-n", "name",
+      "-w", "file.password", "-p", "not-taken-if-w-is-present",
+      "-d", "driver", "-a", "authType"};
+    bl.initArgs(args);
+    System.out.println(bl.connectArgs);
+    // Password file contents are trimmed of trailing whitespaces and newlines
+    Assert.assertTrue(bl.connectArgs.equals("url name mypass driver"));
+    Assert.assertTrue(bl.getOpts().getAuthType().equals("authType"));
+    passFile.delete();
+  }
+
   /**
    * The first flag is taken by the parser.
    */

Modified: hive/branches/parquet/bin/hive
URL: http://svn.apache.org/viewvc/hive/branches/parquet/bin/hive?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/bin/hive (original)
+++ hive/branches/parquet/bin/hive Wed Feb 11 17:48:36 2015
@@ -72,6 +72,17 @@ if [ -f "${HIVE_CONF_DIR}/hive-env.sh" ]
   . "${HIVE_CONF_DIR}/hive-env.sh"
 fi
 
+if [[ -z "$SPARK_HOME" ]]
+then
+  bin=`dirname "$0"`
+  # many hadoop installs are in dir/{spark,hive,hadoop,..}
+  sparkHome=$(readlink -f $bin/../../spark)
+  if [[ -d $sparkHome ]]
+  then
+    export SPARK_HOME=$sparkHome
+  fi
+fi
+
 CLASSPATH="${HIVE_CONF_DIR}"
 
 HIVE_LIB=${HIVE_HOME}/lib

Modified: hive/branches/parquet/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/parquet/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Wed Feb 11 17:48:36 2015
@@ -593,6 +593,8 @@ public class HiveConf extends Configurat
         "* implies all the keys will get inherited."),
     METASTORE_FILTER_HOOK("hive.metastore.filter.hook", "org.apache.hadoop.hive.metastore.DefaultMetaStoreFilterHookImpl",
         "Metastore hook class for filtering the metadata read results"),
+    FIRE_EVENTS_FOR_DML("hive.metastore.dml.events", false, "If true, the metastore will be asked" +
+        " to fire events for DML operations"),
 
     // Parameters for exporting metadata on table drop (requires the use of the)
     // org.apache.hadoop.hive.ql.parse.MetaDataExportListener preevent listener
@@ -684,20 +686,6 @@ public class HiveConf extends Configurat
     HIVEALIAS("hive.alias", "", ""),
     HIVEMAPSIDEAGGREGATE("hive.map.aggr", true, "Whether to use map-side aggregation in Hive Group By queries"),
     HIVEGROUPBYSKEW("hive.groupby.skewindata", false, "Whether there is skew in data to optimize group by queries"),
-    HIVE_OPTIMIZE_MULTI_GROUPBY_COMMON_DISTINCTS("hive.optimize.multigroupby.common.distincts", true,
-        "Whether to optimize a multi-groupby query with the same distinct.\n" +
-        "Consider a query like:\n" +
-        "\n" +
-        "  from src\n" +
-        "    insert overwrite table dest1 select col1, count(distinct colx) group by col1\n" +
-        "    insert overwrite table dest2 select col2, count(distinct colx) group by col2;\n" +
-        "\n" +
-        "With this parameter set to true, first we spray by the distinct value (colx), and then\n" +
-        "perform the 2 groups bys. This makes sense if map-side aggregation is turned off. However,\n" +
-        "with maps-side aggregation, it might be useful in some cases to treat the 2 inserts independently, \n" +
-        "thereby performing the query above in 2MR jobs instead of 3 (due to spraying by distinct key first).\n" +
-        "If this parameter is turned off, we don't consider the fact that the distinct key is the same across\n" +
-        "different MR jobs."),
     HIVEJOINEMITINTERVAL("hive.join.emit.interval", 1000,
         "How many rows in the right-most join operand Hive should buffer before emitting the join result."),
     HIVEJOINCACHESIZE("hive.join.cache.size", 25000,
@@ -2028,7 +2016,9 @@ public class HiveConf extends Configurat
     SPARK_RPC_MAX_MESSAGE_SIZE("hive.spark.client.rpc.max.size", 50 * 1024 * 1024,
       "Maximum message size in bytes for communication between Hive client and remote Spark driver. Default is 50MB."),
     SPARK_RPC_CHANNEL_LOG_LEVEL("hive.spark.client.channel.log.level", null,
-      "Channel logging level for remote Spark driver.  One of {DEBUG, ERROR, INFO, TRACE, WARN}.");
+      "Channel logging level for remote Spark driver.  One of {DEBUG, ERROR, INFO, TRACE, WARN}."),
+    SPARK_RPC_SASL_MECHANISM("hive.spark.client.rpc.sasl.mechanisms", "DIGEST-MD5",
+      "Name of the SASL mechanism to use for authentication.");
 
     public final String varname;
     private final String defaultExpr;
@@ -2268,10 +2258,33 @@ public class HiveConf extends Configurat
       throw new IllegalArgumentException("Cannot modify " + name + " at runtime. It is in the list"
           + "of parameters that can't be modified at runtime");
     }
-    isSparkConfigUpdated = name.startsWith("spark");
+    isSparkConfigUpdated = isSparkRelatedConfig(name);
     set(name, value);
   }
 
+  /**
+   * check whether spark related property is updated, which includes spark configurations,
+   * RSC configurations and yarn configuration in Spark on YARN mode.
+   * @param name
+   * @return
+   */
+  private boolean isSparkRelatedConfig(String name) {
+    boolean result = false;
+    if (name.startsWith("spark")) { // Spark property.
+      result = true;
+    } else if (name.startsWith("yarn")) { // YARN property in Spark on YARN mode.
+      String sparkMaster = get("spark.master");
+      if (sparkMaster != null &&
+        (sparkMaster.equals("yarn-client") || sparkMaster.equals("yarn-cluster"))) {
+        result = true;
+      }
+    } else if (name.startsWith("hive.spark")) { // Remote Spark Context property.
+      result = true;
+    }
+
+    return result;
+  }
+
   public static int getIntVar(Configuration conf, ConfVars var) {
     assert (var.valClass == Integer.class) : var.varname;
     return conf.getInt(var.varname, var.defaultIntVal);

Modified: hive/branches/parquet/data/conf/hive-log4j.properties
URL: http://svn.apache.org/viewvc/hive/branches/parquet/data/conf/hive-log4j.properties?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/data/conf/hive-log4j.properties (original)
+++ hive/branches/parquet/data/conf/hive-log4j.properties Wed Feb 11 17:48:36 2015
@@ -93,3 +93,5 @@ log4j.logger.org.apache.zookeeper.Client
 log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,DRFA
 log4j.logger.org.apache.hadoop.hive.ql.log.PerfLogger=WARN,DRFA
 log4j.logger.org.apache.hadoop.hive.ql.exec.Operator=INFO,DRFA
+log4j.logger.org.apache.hadoop.hive.serde2.lazy=INFO,DRFA
+log4j.logger.org.apache.hadoop.hive.metastore.ObjectStore=INFO,DRFA

Propchange: hive/branches/parquet/hbase-handler/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 11 17:48:36 2015
@@ -1,6 +1,6 @@
 /hive/branches/branch-0.11/hbase-handler/pom.xml:1480385,1480458,1481120,1481344,1481346,1481348,1481352,1483872,1505184
 /hive/branches/cbo/hbase-handler/pom.xml:1605012-1627125
-/hive/branches/spark/hbase-handler/pom.xml:1608589-1654414
+/hive/branches/spark/hbase-handler/pom.xml:1608589-1657401
 /hive/branches/tez/hbase-handler/pom.xml:1494760-1622766
 /hive/branches/vectorization/hbase-handler/pom.xml:1466908-1527856
-/hive/trunk/hbase-handler/pom.xml:1494760-1537575
+/hive/trunk/hbase-handler/pom.xml:1494760-1537575,1656617-1659011

Modified: hive/branches/parquet/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java (original)
+++ hive/branches/parquet/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java Wed Feb 11 17:48:36 2015
@@ -70,6 +70,8 @@ import org.apache.hadoop.hive.serde2.typ
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
+import org.apache.hive.common.util.HiveStringUtils;
+import org.apache.hive.common.util.TimestampParser;
 import org.apache.hive.hcatalog.common.HCatException;
 import org.apache.hive.hcatalog.data.schema.HCatFieldSchema;
 import org.apache.hive.hcatalog.data.schema.HCatFieldSchema.Type;
@@ -91,6 +93,7 @@ public class JsonSerDe implements SerDe
   private JsonFactory jsonFactory = null;
 
   private HCatRecordObjectInspector cachedObjectInspector;
+  private TimestampParser tsParser;
 
   @Override
   public void initialize(Configuration conf, Properties tbl)
@@ -138,6 +141,8 @@ public class JsonSerDe implements SerDe
     }
 
     jsonFactory = new JsonFactory();
+    tsParser = new TimestampParser(
+        HiveStringUtils.splitAndUnEscape(tbl.getProperty(serdeConstants.TIMESTAMP_FORMATS)));
   }
 
   /**
@@ -300,7 +305,7 @@ public class JsonSerDe implements SerDe
       val = (valueToken == JsonToken.VALUE_NULL) ? null : Date.valueOf(p.getText());
       break;
     case TIMESTAMP:
-      val = (valueToken == JsonToken.VALUE_NULL) ? null : Timestamp.valueOf(p.getText());
+      val = (valueToken == JsonToken.VALUE_NULL) ? null : tsParser.parseTimestamp(p.getText());
       break;
     case DECIMAL:
       val = (valueToken == JsonToken.VALUE_NULL) ? null : HiveDecimal.create(p.getText());
@@ -512,15 +517,20 @@ public class JsonSerDe implements SerDe
         case DECIMAL:
           sb.append(((HiveDecimalObjectInspector)poi).getPrimitiveJavaObject(o));
           break;
-        case VARCHAR:
-          appendWithQuotes(sb, 
-                  ((HiveVarcharObjectInspector)poi).getPrimitiveJavaObject(o).toString());
+        case VARCHAR: {
+          String s = SerDeUtils.escapeString(
+              ((HiveVarcharObjectInspector) poi).getPrimitiveJavaObject(o).toString());
+          appendWithQuotes(sb, s);
           break;
-        case CHAR:
+        }
+        case CHAR: {
           //this should use HiveChar.getPaddedValue() but it's protected; currently (v0.13)
           // HiveChar.toString() returns getPaddedValue()
-          appendWithQuotes(sb, ((HiveCharObjectInspector)poi).getPrimitiveJavaObject(o).toString());
+          String s = SerDeUtils.escapeString(
+              ((HiveCharObjectInspector) poi).getPrimitiveJavaObject(o).toString());
+          appendWithQuotes(sb, s);
           break;
+        }
         default:
           throw new RuntimeException("Unknown primitive type: " + poi.getPrimitiveCategory());
         }

Modified: hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java (original)
+++ hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java Wed Feb 11 17:48:36 2015
@@ -56,7 +56,7 @@ public class TestJsonSerDe extends TestC
     rlist.add(new Long(1000L));
     rlist.add(new Double(5.3D));
     rlist.add(new Float(2.39F));
-    rlist.add(new String("hcat and hadoop"));
+    rlist.add(new String("hcat\nand\nhadoop"));
     rlist.add(null);
 
     List<Object> innerStruct = new ArrayList<Object>(2);
@@ -94,8 +94,8 @@ public class TestJsonSerDe extends TestC
     c1.add(c1_1);
     rlist.add(c1);
     rlist.add(HiveDecimal.create(new BigDecimal("123.45")));//prec 5, scale 2
-    rlist.add(new HiveChar("hive_char", 10));
-    rlist.add(new HiveVarchar("hive_varchar", 20));
+    rlist.add(new HiveChar("hive\nchar", 10));
+    rlist.add(new HiveVarchar("hive\nvarchar", 20));
     rlist.add(Date.valueOf("2014-01-07"));
     rlist.add(new Timestamp(System.currentTimeMillis()));
 

Modified: hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java (original)
+++ hive/branches/parquet/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java Wed Feb 11 17:48:36 2015
@@ -139,13 +139,19 @@ public class TestMultiOutputFormat {
     // Verify if the configs are merged
     Path[] fileClassPaths = DistributedCache.getFileClassPaths(job.getConfiguration());
     List<Path> fileClassPathsList = Arrays.asList(fileClassPaths);
-    Assert.assertTrue(fileClassPathsList.contains(new Path(inputFile)));
-    Assert.assertTrue(fileClassPathsList.contains(new Path(dummyFile)));
+    Assert.assertTrue("Cannot find " + (new Path(inputFile)) + " in " + fileClassPathsList,
+      fileClassPathsList.contains(new Path(inputFile)));
+    Assert.assertTrue("Cannot find " + (new Path(dummyFile)) + " in " + fileClassPathsList,
+      fileClassPathsList.contains(new Path(dummyFile)));
 
     URI[] cacheFiles = DistributedCache.getCacheFiles(job.getConfiguration());
     List<URI> cacheFilesList = Arrays.asList(cacheFiles);
-    Assert.assertTrue(cacheFilesList.contains(new Path(inputFile).makeQualified(fs).toUri()));
-    Assert.assertTrue(cacheFilesList.contains(new Path(dummyFile).makeQualified(fs).toUri()));
+    URI inputFileURI = new Path(inputFile).makeQualified(fs).toUri();
+    Assert.assertTrue("Cannot find " + inputFileURI + " in " + cacheFilesList,
+      cacheFilesList.contains(inputFileURI));
+    URI dummyFileURI = new Path(dummyFile).makeQualified(fs).toUri();
+    Assert.assertTrue("Cannot find " + dummyFileURI + " in " + cacheFilesList,
+      cacheFilesList.contains(dummyFileURI));
 
     Assert.assertTrue(job.waitForCompletion(true));
 

Modified: hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java (original)
+++ hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java Wed Feb 11 17:48:36 2015
@@ -29,6 +29,7 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.metastore.api.NotificationEvent;
 import org.apache.hadoop.hive.metastore.api.Partition;
 import org.apache.hadoop.hive.metastore.api.Table;
+import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
 import org.apache.hadoop.hive.metastore.events.AddPartitionEvent;
 import org.apache.hadoop.hive.metastore.events.AlterPartitionEvent;
 import org.apache.hadoop.hive.metastore.events.AlterTableEvent;
@@ -43,8 +44,7 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hive.hcatalog.common.HCatConstants;
 import org.apache.hive.hcatalog.messaging.MessageFactory;
 
-import java.util.ArrayDeque;
-import java.util.Queue;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -228,8 +228,8 @@ public class DbNotificationListener exte
   @Override
   public void onInsert(InsertEvent insertEvent) throws MetaException {
     NotificationEvent event = new NotificationEvent(0, now(), HCatConstants.HCAT_INSERT_EVENT,
-        msgFactory.buildInsertMessage(insertEvent.getDb(), insertEvent.getTable(), insertEvent
-            .getPartitions()).toString());
+        msgFactory.buildInsertMessage(insertEvent.getDb(), insertEvent.getTable(),
+            insertEvent.getPartitions(), insertEvent.getFiles()).toString());
     event.setDbName(insertEvent.getDb());
     event.setTableName(insertEvent.getTable());
     enqueue(event);

Modified: hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/InsertMessage.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/InsertMessage.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/InsertMessage.java (original)
+++ hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/InsertMessage.java Wed Feb 11 17:48:36 2015
@@ -43,6 +43,12 @@ public abstract class InsertMessage exte
    */
   public abstract List<String> getPartitionValues();
 
+  /**
+   * Get the list of files created as a result of this DML operation.  May be null.
+   * @return List of new files, or null.
+   */
+  public abstract List<String> getFiles();
+
   @Override
   public HCatEventMessage checkValid() {
     if (getTable() == null)

Modified: hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageDeserializer.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageDeserializer.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageDeserializer.java (original)
+++ hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageDeserializer.java Wed Feb 11 17:48:36 2015
@@ -46,6 +46,8 @@ public abstract class MessageDeserialize
       return getAlterPartitionMessage(messageBody);
     case DROP_PARTITION:
       return getDropPartitionMessage(messageBody);
+    case INSERT:
+      return getInsertMessage(messageBody);
 
     default:
       throw new IllegalArgumentException("Unsupported event-type: " + eventTypeString);
@@ -96,6 +98,13 @@ public abstract class MessageDeserialize
    */
   public abstract DropPartitionMessage getDropPartitionMessage(String messageBody);
 
+  /**
+   * Method to deserialize InsertMessage
+   * @param messageBody the message in serialized form
+   * @return message in object form
+   */
+  public abstract InsertMessage getInsertMessage(String messageBody);
+
   // Protection against construction.
   protected MessageDeserializer() {}
 }

Modified: hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageFactory.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageFactory.java (original)
+++ hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/MessageFactory.java Wed Feb 11 17:48:36 2015
@@ -171,5 +171,15 @@ public abstract class MessageFactory {
    */
   public abstract DropPartitionMessage buildDropPartitionMessage(Table table, Partition partition);
 
-  public abstract InsertMessage buildInsertMessage(String db, String table, List<String> partVals);
+  /**
+   * Factory method for building insert message
+   * @param db Name of the database the insert occurred in
+   * @param table Name of the table the insert occurred in
+   * @param partVals Partition values for the partition that the insert occurred in, may be null
+   *                 if the insert was done into a non-partitioned table
+   * @param files List of files created as a result of the insert, may be null.
+   * @return instance of InsertMessage
+   */
+  public abstract InsertMessage buildInsertMessage(String db, String table,
+                                                   List<String> partVals, List<String> files);
 }

Modified: hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONInsertMessage.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONInsertMessage.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONInsertMessage.java (original)
+++ hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONInsertMessage.java Wed Feb 11 17:48:36 2015
@@ -37,7 +37,7 @@ public class JSONInsertMessage extends I
   Long timestamp;
 
   @JsonProperty
-  List<String> partitionValues;
+  List<String> partitionValues, files;
 
   /**
    * Default constructor, needed for Jackson.
@@ -45,13 +45,14 @@ public class JSONInsertMessage extends I
   public JSONInsertMessage() {}
 
   public JSONInsertMessage(String server, String servicePrincipal, String db, String table,
-                           List<String> partVals, Long timestamp) {
+                           List<String> partVals, List<String> files, Long timestamp) {
     this.server = server;
     this.servicePrincipal = servicePrincipal;
     this.db = db;
     this.table = table;
     this.timestamp = timestamp;
     partitionValues = partVals;
+    this.files = files;
     checkValid();
   }
 
@@ -68,6 +69,11 @@ public class JSONInsertMessage extends I
   }
 
   @Override
+  public List<String> getFiles() {
+    return files;
+  }
+
+  @Override
   public String getServicePrincipal() { return servicePrincipal; }
 
   @Override

Modified: hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageDeserializer.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageDeserializer.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageDeserializer.java (original)
+++ hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageDeserializer.java Wed Feb 11 17:48:36 2015
@@ -28,6 +28,7 @@ import org.apache.hive.hcatalog.messagin
 import org.apache.hive.hcatalog.messaging.DropDatabaseMessage;
 import org.apache.hive.hcatalog.messaging.DropPartitionMessage;
 import org.apache.hive.hcatalog.messaging.DropTableMessage;
+import org.apache.hive.hcatalog.messaging.InsertMessage;
 import org.apache.hive.hcatalog.messaging.MessageDeserializer;
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -122,4 +123,13 @@ public class JSONMessageDeserializer ext
       throw new IllegalArgumentException("Could not construct DropPartitionMessage.", exception);
     }
   }
+
+  @Override
+  public InsertMessage getInsertMessage(String messageBody) {
+    try {
+      return mapper.readValue(messageBody, JSONInsertMessage.class);
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Could not construct InsertMessage", e);
+    }
+  }
 }

Modified: hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java?rev=1659014&r1=1659013&r2=1659014&view=diff
==============================================================================
--- hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java (original)
+++ hive/branches/parquet/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java Wed Feb 11 17:48:36 2015
@@ -124,9 +124,10 @@ public class JSONMessageFactory extends
   }
 
   @Override
-  public InsertMessage buildInsertMessage(String db, String table, List<String> partVals) {
+  public InsertMessage buildInsertMessage(String db, String table, List<String> partVals,
+                                          List<String> files) {
     return new JSONInsertMessage(HCAT_SERVER_URL, HCAT_SERVICE_PRINCIPAL, db, table, partVals,
-        now());
+        files, now());
   }
 
   private long now() {



Mime
View raw message