hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1514554 [1/18] - in /hive/branches/vectorization: ./ beeline/src/java/org/apache/hive/beeline/ cli/src/java/org/apache/hadoop/hive/cli/ cli/src/test/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src...
Date Fri, 16 Aug 2013 01:22:02 GMT
Author: hashutosh
Date: Fri Aug 16 01:21:54 2013
New Revision: 1514554

URL: http://svn.apache.org/r1514554
Log:
Merged in with latest trunk.

Added:
    hive/branches/vectorization/cli/src/test/org/apache/hadoop/hive/cli/TestCliSessionState.java
      - copied unchanged from r1513659, hive/trunk/cli/src/test/org/apache/hadoop/hive/cli/TestCliSessionState.java
    hive/branches/vectorization/cli/src/test/org/apache/hadoop/hive/cli/TestOptionsProcessor.java
      - copied unchanged from r1513659, hive/trunk/cli/src/test/org/apache/hadoop/hive/cli/TestOptionsProcessor.java
    hive/branches/vectorization/cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java
      - copied unchanged from r1513659, hive/trunk/cli/src/test/org/apache/hadoop/hive/cli/TestRCFileCat.java
    hive/branches/vectorization/hbase-handler/src/test/queries/positive/hbase_binary_map_queries_prefix.q
      - copied unchanged from r1513659, hive/trunk/hbase-handler/src/test/queries/positive/hbase_binary_map_queries_prefix.q
    hive/branches/vectorization/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out
      - copied unchanged from r1513659, hive/trunk/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out
    hive/branches/vectorization/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java
      - copied unchanged from r1513659, hive/trunk/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatExternalDynamicPartitioned.java
    hive/branches/vectorization/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatExternalHCatNonPartitioned.java
      - copied unchanged from r1513659, hive/trunk/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatExternalHCatNonPartitioned.java
    hive/branches/vectorization/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatExternalPartitioned.java
      - copied unchanged from r1513659, hive/trunk/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatExternalPartitioned.java
    hive/branches/vectorization/hcatalog/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/TestWriteLock.java
      - copied unchanged from r1513659, hive/trunk/hcatalog/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/TestWriteLock.java
    hive/branches/vectorization/hcatalog/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/TestZNodeName.java
      - copied unchanged from r1513659, hive/trunk/hcatalog/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/TestZNodeName.java
    hive/branches/vectorization/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
      - copied unchanged from r1513659, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryImpl.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryImpl.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryProxyHandler.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryProxyHandler.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryUtil.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryUtil.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/IntegerReader.java
      - copied, changed from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/IntegerReader.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/IntegerWriter.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/IntegerWriter.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java.orig
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java.orig
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReaderV2.java
      - copied, changed from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReaderV2.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerWriterV2.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerWriterV2.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/
      - copied from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/PredicateLeaf.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/PredicateLeaf.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgument.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgument.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentImpl.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/sarg/SearchArgumentImpl.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/GenericUDFDecode.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/GenericUDFDecode.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/GenericUDFEncode.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/GenericUDFEncode.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFBase64.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFBase64.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFUnbase64.java
      - copied unchanged from r1513659, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFUnbase64.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestBitPack.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestBitPack.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestIntegerCompressionReader.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestIntegerCompressionReader.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestNewIntegerEncoding.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestNewIntegerEncoding.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/
      - copied from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/udf/TestGenericUDFDecode.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/TestGenericUDFDecode.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/udf/TestGenericUDFEncode.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/TestGenericUDFEncode.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFBase64.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFBase64.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFHex.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFHex.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFUnbase64.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFUnbase64.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFUnhex.java
      - copied unchanged from r1513659, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFUnhex.java
    hive/branches/vectorization/ql/src/test/queries/clientnegative/invalid_arithmetic_type.q
      - copied unchanged from r1513659, hive/trunk/ql/src/test/queries/clientnegative/invalid_arithmetic_type.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer15.q
      - copied unchanged from r1513659, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer15.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/multiMapJoin2.q
      - copied unchanged from r1513659, hive/trunk/ql/src/test/queries/clientpositive/multiMapJoin2.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
      - copied unchanged from r1513659, hive/trunk/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/ppd_vc.q
      - copied unchanged from r1513659, hive/trunk/ql/src/test/queries/clientpositive/ppd_vc.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/schemeAuthority2.q
      - copied unchanged from r1513659, hive/trunk/ql/src/test/queries/clientpositive/schemeAuthority2.q
    hive/branches/vectorization/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
      - copied unchanged from r1513659, hive/trunk/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/invalid_arithmetic_type.q.out
      - copied unchanged from r1513659, hive/trunk/ql/src/test/results/clientnegative/invalid_arithmetic_type.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer15.q.out
      - copied unchanged from r1513659, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer15.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/multiMapJoin2.q.out
      - copied unchanged from r1513659, hive/trunk/ql/src/test/results/clientpositive/multiMapJoin2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/orc_dictionary_threshold.q.out
      - copied unchanged from r1513659, hive/trunk/ql/src/test/results/clientpositive/orc_dictionary_threshold.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/ppd_vc.q.out
      - copied unchanged from r1513659, hive/trunk/ql/src/test/results/clientpositive/ppd_vc.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/schemeAuthority2.q.out
      - copied unchanged from r1513659, hive/trunk/ql/src/test/results/clientpositive/schemeAuthority2.q.out
    hive/branches/vectorization/service/src/java/org/apache/hive/service/auth/SaslQOP.java
      - copied unchanged from r1513659, hive/trunk/service/src/java/org/apache/hive/service/auth/SaslQOP.java
    hive/branches/vectorization/service/src/java/org/apache/hive/service/cli/operation/ClassicTableTypeMapping.java
      - copied unchanged from r1513659, hive/trunk/service/src/java/org/apache/hive/service/cli/operation/ClassicTableTypeMapping.java
    hive/branches/vectorization/service/src/java/org/apache/hive/service/cli/operation/HiveTableTypeMapping.java
      - copied unchanged from r1513659, hive/trunk/service/src/java/org/apache/hive/service/cli/operation/HiveTableTypeMapping.java
    hive/branches/vectorization/service/src/java/org/apache/hive/service/cli/operation/TableTypeMapping.java
      - copied unchanged from r1513659, hive/trunk/service/src/java/org/apache/hive/service/cli/operation/TableTypeMapping.java
    hive/branches/vectorization/service/src/java/org/apache/hive/service/cli/operation/TableTypeMappingFactory.java
      - copied unchanged from r1513659, hive/trunk/service/src/java/org/apache/hive/service/cli/operation/TableTypeMappingFactory.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutorBuilder.java
      - copied unchanged from r1513659, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutorBuilder.java
Removed:
    hive/branches/vectorization/hcatalog/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/WriteLockTest.java
    hive/branches/vectorization/hcatalog/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/snapshot/lock/ZNodeNameTest.java
    hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_join33.q
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join33.q.out
Modified:
    hive/branches/vectorization/   (props changed)
    hive/branches/vectorization/.gitattributes
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractCommandHandler.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCommandCompletor.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCompletor.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineSignalHandler.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BufferedRows.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/CommandHandler.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Commands.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnections.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DriverInfo.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFile.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFormat.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Reflector.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Rows.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SQLCompletor.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SeparatedValuesOutputFormat.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SunSignalHandler.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLAttributeOutputFormat.java
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLElementOutputFormat.java
    hive/branches/vectorization/build-common.xml
    hive/branches/vectorization/build.properties
    hive/branches/vectorization/build.xml
    hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
    hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java
    hive/branches/vectorization/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
    hive/branches/vectorization/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/vectorization/conf/hive-default.xml.template
    hive/branches/vectorization/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java
    hive/branches/vectorization/contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/GenericUDTFExplode2.java
    hive/branches/vectorization/eclipse-templates/.classpath
    hive/branches/vectorization/eclipse-templates/.classpath._hbase
    hive/branches/vectorization/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java
    hive/branches/vectorization/hbase-handler/src/test/templates/TestHBaseCliDriver.vm
    hive/branches/vectorization/hcatalog/bin/hcat
    hive/branches/vectorization/hcatalog/build-support/ant/deploy.xml
    hive/branches/vectorization/hcatalog/build-support/ant/test.xml
    hive/branches/vectorization/hcatalog/build.properties
    hive/branches/vectorization/hcatalog/build.xml
    hive/branches/vectorization/hcatalog/core/src/main/java/org/apache/hcatalog/mapreduce/FosterStorageHandler.java
    hive/branches/vectorization/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/HCatMapReduceTest.java
    hive/branches/vectorization/hcatalog/storage-handlers/hbase/build.xml
    hive/branches/vectorization/hcatalog/webhcat/svr/build.xml
    hive/branches/vectorization/ivy/libraries.properties
    hive/branches/vectorization/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
    hive/branches/vectorization/jdbc/src/java/org/apache/hive/jdbc/HivePreparedStatement.java
    hive/branches/vectorization/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java
    hive/branches/vectorization/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hive/branches/vectorization/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
    hive/branches/vectorization/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
    hive/branches/vectorization/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
    hive/branches/vectorization/metastore/src/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java
    hive/branches/vectorization/metastore/src/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java
    hive/branches/vectorization/ql/ivy.xml
    hive/branches/vectorization/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/OrcProto.java
    hive/branches/vectorization/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp
    hive/branches/vectorization/ql/src/gen/thrift/gen-cpp/queryplan_types.h
    hive/branches/vectorization/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
    hive/branches/vectorization/ql/src/gen/thrift/gen-php/Types.php
    hive/branches/vectorization/ql/src/gen/thrift/gen-py/queryplan/ttypes.py
    hive/branches/vectorization/ql/src/gen/thrift/gen-rb/queryplan_types.rb
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/Context.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/DemuxOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/NumericOpMethodResolver.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorUtils.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/WindowFunctionDescription.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/WindowFunctionInfo.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFileSinkOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistoryViewer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OutStream.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReader.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerWriter.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SerializationUtils.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/StringRedBlackTree.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/BlockMergeTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/metadata/VirtualColumn.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/AbstractBucketJoinProc.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/AbstractSMBJoinProc.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/AvgPartitionSizeBasedBigTableSelectorForAutoSMJ.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/BucketingSortingReduceSinkOptimizer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GlobalLimitOptimizer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GroupByOptimizer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/IndexUtils.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SimpleFetchOptimizer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/TableSizeBasedBigTableSelectorForAutoSMJ.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/QueryPlanTreeTransformation.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/LBPartitionProcFactory.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/ListBucketingPruner.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/pcr/PcrExprProcCtx.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/pcr/PcrExprProcFactory.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/pcr/PcrOpProcFactory.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/CommonJoinTaskDispatcher.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartExprEvalUtils.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/PrunedPartitionList.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/FetchWork.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/ListBucketingCtx.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFHex.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFType.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFUnhex.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFReflect.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCollectSet.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFContextNGrams.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCumeDist.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFDenseRank.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFFirstValue.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFHistogramNumeric.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLag.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLastValue.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLead.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFLeadLag.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMax.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMin.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFNTile.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentRank.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFPercentileApprox.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFRank.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArray.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArrayContains.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseCompare.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCase.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCoalesce.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcatWS.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFElt.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFField.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUtcTimestamp.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIf.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIn.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInFile.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLeadLag.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLocate.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMap.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapKeys.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMapValues.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFNvl.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPAnd.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNot.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPOr.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPrintf.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFReflect2.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSentences.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSize.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSortArray.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSplit.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFStringToMap.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTimestamp.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToBinary.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToDate.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToDecimal.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToUnixTimeStamp.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTranslate.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUnion.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFWhen.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFExplode.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFInline.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFJSONTuple.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFStack.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NGramEstimator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/udf/xml/GenericUDFXPath.java
    hive/branches/vectorization/ql/src/protobuf/org/apache/hadoop/hive/ql/io/orc/orc_proto.proto
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/TestFunctionRegistry.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/TestSymlinkTextInputFormat.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestFileDump.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcNullOptimization.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestTranslate.java
    hive/branches/vectorization/ql/src/test/queries/clientpositive/ba_table_udfs.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer1.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer3.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer4.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer5.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer6.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer7.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/multiMapJoin1.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/partition_date.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/partition_date2.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/udf_sentences.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/union34.q
    hive/branches/vectorization/ql/src/test/resources/orc-file-dump.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/fs_default_name1.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/fs_default_name2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join0.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join10.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join11.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join12.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join13.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join14.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join15.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join16.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join20.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join21.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join22.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join23.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join24.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join26.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join28.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join29.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join32.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/ba_table_udfs.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin3.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/combine2_win.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer3.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer4.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer6.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer7.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/input12.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/join14.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/join28.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/join32.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/join32_lessSize.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/join33.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/join_star.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/mapjoin_subquery.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/mapjoin_subquery2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/multiMapJoin1.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/multi_join_union.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/partition_date.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/partition_date2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/show_functions.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/stats11.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/udaf_context_ngrams.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/udf_hex.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/udf_sentences.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/udf_unhex.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/union22.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/union34.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/union_remove_19.q.out
    hive/branches/vectorization/ql/src/test/templates/TestCliDriver.vm
    hive/branches/vectorization/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
    hive/branches/vectorization/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/AbstractPrimitiveObjectInspector.java
    hive/branches/vectorization/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java
    hive/branches/vectorization/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorConverters.java
    hive/branches/vectorization/service/src/java/org/apache/hive/service/auth/HiveAuthFactory.java
    hive/branches/vectorization/service/src/java/org/apache/hive/service/auth/KerberosSaslHelper.java
    hive/branches/vectorization/service/src/java/org/apache/hive/service/cli/operation/GetTableTypesOperation.java
    hive/branches/vectorization/service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java
    hive/branches/vectorization/shims/ivy.xml
    hive/branches/vectorization/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
    hive/branches/vectorization/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
    hive/branches/vectorization/shims/src/0.23/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
    hive/branches/vectorization/shims/src/common-secure/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java
    hive/branches/vectorization/shims/src/common-secure/java/org/apache/hadoop/hive/thrift/DBTokenStore.java
    hive/branches/vectorization/shims/src/common-secure/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge20S.java
    hive/branches/vectorization/shims/src/common-secure/test/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java
    hive/branches/vectorization/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java
    hive/branches/vectorization/shims/src/common/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestStartRequest.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/ExecutionController.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/TestExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/CleanupPhase.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Constants.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Drone.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ExecutionPhase.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JUnitReportParser.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LogDirectoryCleaner.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Phase.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PrepPhase.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ReportingPhase.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/ExecutionContextConfiguration.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/QFileTestBatch.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/CloudComputeService.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/CloudExecutionContextProvider.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/AbstractSSHCommand.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RSyncCommandExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommandExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/main/resources/batch-exec.vm
    hive/branches/vectorization/testutils/ptest2/src/main/resources/log4j.properties
    hive/branches/vectorization/testutils/ptest2/src/main/resources/source-prep.vm
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/MockLocalCommandFactory.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/MockRSyncCommandExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/MockSSHCommandExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestCleanupPhase.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestCleanupPhase.testExecute.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingQFile.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingUnitTest.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingQFileTest.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingUnitTest.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.testRsyncFromLocalToRemoteInstancesWithFailureOne.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.testRsyncFromLocalToRemoteInstancesWithFailureUnknown.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPrepPhase.testExecute.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/resources/SomeTest-success.xml
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/SomeTest-truncated.xml
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/skewjoin_union_remove_1.q-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml

Propchange: hive/branches/vectorization/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1508580-1513659

Modified: hive/branches/vectorization/.gitattributes
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/.gitattributes?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/.gitattributes (original)
+++ hive/branches/vectorization/.gitattributes Fri Aug 16 01:21:54 2013
@@ -14,6 +14,9 @@
 
 *.sh     text eol=lf
 
+#test files, use lf so that size is same on windows as well
+data/files/*.dat    text eol=lf
+
 *.bat    text eol=crlf
 *.csproj text merge=union eol=crlf
 *.sln    text merge=union eol=crlf

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractCommandHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractCommandHandler.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractCommandHandler.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractCommandHandler.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCommandCompletor.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCommandCompletor.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCommandCompletor.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCommandCompletor.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,19 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
- *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
- *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
- */
-
-/*
- * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCompletor.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCompletor.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCompletor.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineCompletor.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineSignalHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineSignalHandler.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineSignalHandler.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLineSignalHandler.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 
 package org.apache.hive.beeline;

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BufferedRows.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BufferedRows.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BufferedRows.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BufferedRows.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/CommandHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/CommandHandler.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/CommandHandler.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/CommandHandler.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Commands.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Commands.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Commands.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Commands.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- *  Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- *  All rights reserved.
- *
- *
- *  Redistribution and use in source and binary forms,
- *  with or without modification, are permitted provided
- *  that the following conditions are met:
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Redistributions of source code must retain the above
- *  copyright notice, this list of conditions and the following
- *  disclaimer.
- *  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.
- *  Neither the name of the <ORGANIZATION> nor the names
- *  of its contributors may be used to endorse or promote
- *  products derived from this software without specific
- *  prior written permission.
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- *  AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
- *  OWNER OR 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.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  This software is hosted by SourceForge.
- *  SourceForge is a trademark of VA Linux Systems, Inc.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
  * This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
  */
 package org.apache.hive.beeline;
 



Mime
View raw message