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/11/18 01:48:46 UTC

svn commit: r1640263 [1/12] - in /hive/branches/spark: ./ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/ accu...

Author: brock
Date: Tue Nov 18 00:48:40 2014
New Revision: 1640263

URL: http://svn.apache.org/r1640263
Log:
HIVE-8899 - Merge from trunk to spark [Spark Branch]

Added:
    hive/branches/spark/beeline/src/main/resources/beeline-log4j.properties
      - copied unchanged from r1637505, hive/trunk/beeline/src/main/resources/beeline-log4j.properties
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java
      - copied unchanged from r1638004, hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java
    hive/branches/spark/metastore/scripts/upgrade/oracle/pre-0-upgrade-0.13.0-to-0.14.0.oracle.sql
      - copied unchanged from r1640207, hive/trunk/metastore/scripts/upgrade/oracle/pre-0-upgrade-0.13.0-to-0.14.0.oracle.sql
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/DefaultMetaStoreFilterHookImpl.java
      - copied unchanged from r1638004, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/DefaultMetaStoreFilterHookImpl.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreFilterHook.java
      - copied unchanged from r1638004, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreFilterHook.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestColumnStatistics.java
      - copied unchanged from r1637302, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestColumnStatistics.java
    hive/branches/spark/ql/src/test/queries/clientnegative/authorization_grant_server.q
      - copied unchanged from r1638001, hive/trunk/ql/src/test/queries/clientnegative/authorization_grant_server.q
    hive/branches/spark/ql/src/test/queries/clientnegative/authorization_grant_uri.q
      - copied unchanged from r1638001, hive/trunk/ql/src/test/queries/clientnegative/authorization_grant_uri.q
    hive/branches/spark/ql/src/test/queries/clientnegative/gby_star.q
      - copied unchanged from r1640207, hive/trunk/ql/src/test/queries/clientnegative/gby_star.q
    hive/branches/spark/ql/src/test/queries/clientnegative/gby_star2.q
      - copied unchanged from r1640207, hive/trunk/ql/src/test/queries/clientnegative/gby_star2.q
    hive/branches/spark/ql/src/test/queries/clientnegative/timestamp_literal.q
      - copied unchanged from r1638402, hive/trunk/ql/src/test/queries/clientnegative/timestamp_literal.q
    hive/branches/spark/ql/src/test/queries/clientpositive/acid_join.q
      - copied unchanged from r1637419, hive/trunk/ql/src/test/queries/clientpositive/acid_join.q
    hive/branches/spark/ql/src/test/queries/clientpositive/decimal_join2.q
      - copied unchanged from r1637469, hive/trunk/ql/src/test/queries/clientpositive/decimal_join2.q
    hive/branches/spark/ql/src/test/queries/clientpositive/gby_star.q
      - copied unchanged from r1640207, hive/trunk/ql/src/test/queries/clientpositive/gby_star.q
    hive/branches/spark/ql/src/test/queries/clientpositive/index_skewtable.q
      - copied unchanged from r1640207, hive/trunk/ql/src/test/queries/clientpositive/index_skewtable.q
    hive/branches/spark/ql/src/test/queries/clientpositive/insert_nonacid_from_acid.q
      - copied unchanged from r1637419, hive/trunk/ql/src/test/queries/clientpositive/insert_nonacid_from_acid.q
    hive/branches/spark/ql/src/test/queries/clientpositive/partition_multilevels.q
      - copied unchanged from r1638597, hive/trunk/ql/src/test/queries/clientpositive/partition_multilevels.q
    hive/branches/spark/ql/src/test/queries/clientpositive/partition_timestamp.q
      - copied unchanged from r1638402, hive/trunk/ql/src/test/queries/clientpositive/partition_timestamp.q
    hive/branches/spark/ql/src/test/queries/clientpositive/partition_timestamp2.q
      - copied unchanged from r1638402, hive/trunk/ql/src/test/queries/clientpositive/partition_timestamp2.q
    hive/branches/spark/ql/src/test/queries/clientpositive/partition_type_in_plan.q
      - copied unchanged from r1638191, hive/trunk/ql/src/test/queries/clientpositive/partition_type_in_plan.q
    hive/branches/spark/ql/src/test/queries/clientpositive/timestamp_literal.q
      - copied unchanged from r1638402, hive/trunk/ql/src/test/queries/clientpositive/timestamp_literal.q
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_grant_server.q.out
      - copied unchanged from r1638001, hive/trunk/ql/src/test/results/clientnegative/authorization_grant_server.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_grant_uri.q.out
      - copied unchanged from r1638001, hive/trunk/ql/src/test/results/clientnegative/authorization_grant_uri.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/gby_star.q.out
      - copied unchanged from r1640207, hive/trunk/ql/src/test/results/clientnegative/gby_star.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/gby_star2.q.out
      - copied unchanged from r1640207, hive/trunk/ql/src/test/results/clientnegative/gby_star2.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/timestamp_literal.q.out
      - copied unchanged from r1638402, hive/trunk/ql/src/test/results/clientnegative/timestamp_literal.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/acid_join.q.out
      - copied, changed from r1637419, hive/trunk/ql/src/test/results/clientpositive/acid_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_join2.q.out
      - copied unchanged from r1637469, hive/trunk/ql/src/test/results/clientpositive/decimal_join2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/gby_star.q.out
      - copied unchanged from r1640207, hive/trunk/ql/src/test/results/clientpositive/gby_star.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/index_skewtable.q.out
      - copied unchanged from r1640207, hive/trunk/ql/src/test/results/clientpositive/index_skewtable.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/insert_nonacid_from_acid.q.out
      - copied, changed from r1637419, hive/trunk/ql/src/test/results/clientpositive/insert_nonacid_from_acid.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/partition_multilevels.q.out
      - copied unchanged from r1638597, hive/trunk/ql/src/test/results/clientpositive/partition_multilevels.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/partition_timestamp.q.out
      - copied unchanged from r1638402, hive/trunk/ql/src/test/results/clientpositive/partition_timestamp.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/partition_timestamp2.q.out
      - copied unchanged from r1638402, hive/trunk/ql/src/test/results/clientpositive/partition_timestamp2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/partition_type_in_plan.q.out
      - copied unchanged from r1638191, hive/trunk/ql/src/test/results/clientpositive/partition_type_in_plan.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
      - copied unchanged from r1637489, hive/trunk/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/timestamp_literal.q.out
      - copied unchanged from r1638402, hive/trunk/ql/src/test/results/clientpositive/timestamp_literal.q.out
Removed:
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/
    hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/service/
    hive/branches/spark/jdbc/src/java/org/apache/hadoop/
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsSetupConst.java
    hive/branches/spark/ql/src/test/results/compiler/parse/
    hive/branches/spark/ql/src/test/results/compiler/plan/
    hive/branches/spark/ql/src/test/templates/TestParse.vm
    hive/branches/spark/service/src/java/org/apache/hadoop/
    hive/branches/spark/service/src/test/org/apache/hadoop/
Modified:
    hive/branches/spark/   (props changed)
    hive/branches/spark/LICENSE
    hive/branches/spark/NOTICE
    hive/branches/spark/RELEASE_NOTES.txt
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/AccumuloHiveRow.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/AccumuloStorageHandler.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/LazyAccumuloRow.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/HiveAccumuloTableInputFormat.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/AccumuloPredicateHandler.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/PrimitiveComparisonFilter.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/CompareOp.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/DoubleCompare.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/Equal.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/GreaterThan.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/GreaterThanOrEqual.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/IntCompare.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/LessThan.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/LessThanOrEqual.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/Like.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/LongCompare.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/NotEqual.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/PrimitiveComparison.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/compare/StringCompare.java
    hive/branches/spark/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableInputFormat.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/TestAccumuloPredicateHandler.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/compare/TestDoubleCompare.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/compare/TestIntCompare.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/compare/TestLongComparison.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/predicate/compare/TestStringCompare.java
    hive/branches/spark/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java
    hive/branches/spark/beeline/src/java/org/apache/hive/beeline/Commands.java
    hive/branches/spark/bin/ext/beeline.sh
    hive/branches/spark/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
    hive/branches/spark/cli/src/java/org/apache/hadoop/hive/cli/CliSessionState.java
    hive/branches/spark/cli/src/java/org/apache/hadoop/hive/cli/OptionsProcessor.java
    hive/branches/spark/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
    hive/branches/spark/cli/src/test/org/apache/hadoop/hive/cli/TestCliSessionState.java
    hive/branches/spark/cli/src/test/org/apache/hadoop/hive/cli/TestOptionsProcessor.java
    hive/branches/spark/common/src/java/org/apache/hadoop/hive/common/type/Decimal128.java
    hive/branches/spark/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
    hive/branches/spark/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/spark/common/src/java/org/apache/hive/common/util/Decimal128FastBuffer.java
    hive/branches/spark/common/src/test/org/apache/hadoop/hive/common/type/TestDecimal128.java
    hive/branches/spark/common/src/test/org/apache/hadoop/hive/common/type/TestHiveDecimal.java
    hive/branches/spark/dev-support/jenkins-common.sh
    hive/branches/spark/dev-support/jenkins-execute-build.sh
    hive/branches/spark/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseKeyFactory3.java
    hive/branches/spark/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java
    hive/branches/spark/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
    hive/branches/spark/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/MetadataJSONSerializer.java
    hive/branches/spark/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/MetadataSerializer.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/hive/beeline/TestBeeLineWithArgs.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/service/cli/TestEmbeddedThriftBinaryCLIService.java
    hive/branches/spark/itests/qtest/pom.xml
    hive/branches/spark/itests/src/test/resources/testconfiguration.properties
    hive/branches/spark/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
    hive/branches/spark/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
    hive/branches/spark/metastore/if/hive_metastore.thrift
    hive/branches/spark/metastore/scripts/upgrade/oracle/020-HIVE-7784.oracle.sql
    hive/branches/spark/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp
    hive/branches/spark/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h
    hive/branches/spark/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java
    hive/branches/spark/metastore/src/gen/thrift/gen-php/metastore/Types.php
    hive/branches/spark/metastore/src/gen/thrift/gen-py/hive_metastore/constants.py
    hive/branches/spark/metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb
    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/MetaStoreThread.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/PartitionExpressionProxy.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/parser/ExpressionTree.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java
    hive/branches/spark/metastore/src/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.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/MockPartitionExpressionForMetastore.java
    hive/branches/spark/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java
    hive/branches/spark/metastore/src/test/org/apache/hadoop/hive/metastore/txn/TestTxnHandler.java
    hive/branches/spark/packaging/src/main/assembly/bin.xml
    hive/branches/spark/packaging/src/main/assembly/src.xml
    hive/branches/spark/pom.xml
    hive/branches/spark/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/OrcProto.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractFileMergeOperator.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/FileSinkOperator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableLoader.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/PTFTopNHash.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/mapjoin/MapJoinMemoryExhaustionHandler.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HashTableLoader.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/BytesBytesMultiHashMap.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinBytesTableContainer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HashTableLoader.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/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/hooks/ATSHook.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ColumnStatisticsImpl.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.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/OrcNewSplit.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/Reader.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ReaderImpl.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/TimestampColumnStatistics.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.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/write/ParquetRecordWriterWrapper.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentFactory.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/lib/ForwardWalker.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/SessionHiveMetaStoreClient.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/MergeJoinProc.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/AnnotateWithOpTraits.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/TraitsUtil.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/cost/HiveVolcanoPlanner.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/HiveRelMdUniqueKeys.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/ppr/PartExprEvalUtils.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionExpressionForMetastore.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/parse/DDLSemanticAnalyzer.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
    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/IdentifiersParser.g
    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/TypeCheckProcFactory.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactory.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/stats/jdbc/JDBCStatsAggregator.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/stats/jdbc/JDBCStatsPublisher.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/stats/jdbc/JDBCStatsSetupConstants.java
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/stats/jdbc/JDBCStatsUtils.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/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/protobuf/org/apache/hadoop/hive/ql/io/orc/orc_proto.proto
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestFileSinkOperator.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestDecimalUtil.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.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/parquet/serde/primitive/TestParquetByteInspector.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/primitive/TestParquetShortInspector.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/parse/TestUpdateDeleteSemanticAnalyzer.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestHiveAuthorizationTaskFactory.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/udf/generic/TestGenericUDFOPDivide.java
    hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPNumeric.java
    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/database_drop.q
    hive/branches/spark/ql/src/test/queries/clientpositive/orc_merge_incompat1.q
    hive/branches/spark/ql/src/test/queries/clientpositive/parquet_create.q
    hive/branches/spark/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
    hive/branches/spark/ql/src/test/resources/orc-file-dump.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_role_case.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/date_literal2.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/date_literal3.q.out
    hive/branches/spark/ql/src/test/results/clientnegative/illegal_partition_type4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/alter_merge_orc.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/alter_partition_change_col.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_part.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_table.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/authorization_index.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/avro_decimal.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/avro_decimal_native.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/char_pad_convert.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/create_like.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/ctas_colname.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/database_drop.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_precision.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_trailing.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/decimal_udf.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/groupby_ppd.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/orc_analyze.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/parquet_create.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/parquet_decimal.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/parquet_decimal1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/serde_regex.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/show_roles.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/alter_merge_orc.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.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/ctas.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_analyze.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_union_group_by.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/update_all_types.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_between_in.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/vector_decimal_10_0.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_aggregate.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_cast.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_expressions.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_precision.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_trailing.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_decimal_udf.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_reduce_groupby_decimal.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/udf_case.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/udf_when.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/update_all_types.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_aggregate_9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_between_in.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_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_cast.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_precision.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_round_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_trailing.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_udf.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vector_reduce_groupby_decimal.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/vectorized_ptf.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/windowing_decimal.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/windowing_navfn.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/windowing_rank.q.out
    hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroObjectInspectorException.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/objectinspector/ObjectInspectorUtils.java
    hive/branches/spark/serde/src/test/org/apache/hadoop/hive/serde2/io/TestDateWritable.java
    hive/branches/spark/service/src/java/org/apache/hive/service/auth/HiveAuthFactory.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/operation/LogDivertAppender.java
    hive/branches/spark/service/src/java/org/apache/hive/service/cli/operation/OperationManager.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/server/HiveServer2.java
    hive/branches/spark/service/src/test/org/apache/hive/service/cli/operation/TestOperationLoggingAPI.java
    hive/branches/spark/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java

Propchange: hive/branches/spark/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1637278-1637520,1637522-1639433,1639435-1639785,1639787-1640207

Modified: hive/branches/spark/LICENSE
URL: http://svn.apache.org/viewvc/hive/branches/spark/LICENSE?rev=1640263&r1=1640262&r2=1640263&view=diff
==============================================================================
--- hive/branches/spark/LICENSE (original)
+++ hive/branches/spark/LICENSE Tue Nov 18 00:48:40 2014
@@ -207,57 +207,7 @@ APACHE HIVE SUBCOMPONENTS:
 The Apache Hive project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
-licenses. 
-
-For the org.apache.hadoop.hive.ql.util.jdbm.* classes:
-
-/**
- * JDBM LICENSE v1.00
- *
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- *    statements and notices.  Redistributions must also contain a
- *    copy of this document.
- *
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions and the
- *    following disclaimer in the documentation and/or other
- *    materials provided with the distribution.
- *
- * 3. The name "JDBM" must not be used to endorse or promote
- *    products derived from this Software without prior written
- *    permission of Cees de Groot.  For written permission,
- *    please contact cg@cdegroot.com.
- *
- * 4. Products derived from this Software may not be called "JDBM"
- *    nor may "JDBM" appear in their names without prior written
- *    permission of Cees de Groot.
- *
- * 5. Due credit should be given to the JDBM Project
- *    (http://jdbm.sourceforge.net/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE JDBM PROJECT AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * CEES DE GROOT OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2000 (C) Cees de Groot. All Rights Reserved.
- * Copyright 2000-2001 (C) Alex Boisvert. All Rights Reserved.
- * Contributions are Copyright (C) 2000 by their associated contributors.
- *
- * $Id: RecordManager.java,v 1.3 2005/06/25 23:12:31 doomdark Exp $
- */
+licenses.
 
 
 For the ANTLR libraries:

Modified: hive/branches/spark/NOTICE
URL: http://svn.apache.org/viewvc/hive/branches/spark/NOTICE?rev=1640263&r1=1640262&r2=1640263&view=diff
==============================================================================
--- hive/branches/spark/NOTICE (original)
+++ hive/branches/spark/NOTICE Tue Nov 18 00:48:40 2014
@@ -1,9 +1,9 @@
 Apache Hive
-Copyright 2008-2013 The Apache Software Foundation
+Copyright 2008-2014 The Apache Software Foundation
 
 This product includes software developed by The Apache Software
 Foundation (http://www.apache.org/).
 
 This product includes Jersey (https://jersey.java.net/)
-Copyright (c) 2010-2013 Oracle and/or its affiliates.
+Copyright (c) 2010-2014 Oracle and/or its affiliates.