hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1506785 [1/8] - in /hive/branches/vectorization: ./ beeline/src/java/org/apache/hive/beeline/ cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src/test/results/clientnegative/ data/files/ ...
Date Thu, 25 Jul 2013 00:15:07 GMT
Author: hashutosh
Date: Thu Jul 25 00:14:58 2013
New Revision: 1506785

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

Added:
    hive/branches/vectorization/hbase-handler/src/test/queries/positive/hbase_scan_params.q
      - copied unchanged from r1506653, hive/trunk/hbase-handler/src/test/queries/positive/hbase_scan_params.q
    hive/branches/vectorization/hbase-handler/src/test/results/positive/hbase_scan_params.q.out
      - copied unchanged from r1506653, hive/trunk/hbase-handler/src/test/results/positive/hbase_scan_params.q.out
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/DemuxOperator.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DemuxOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/MuxOperator.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MuxOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/
      - copied from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
      - copied, changed from r1506653, hive/trunk/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/ExecMapper.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapper.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapperContext.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapperContext.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHook.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHook.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/JobDebugger.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/JobDebugger.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/JobTrackerURLResolver.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/JobTrackerURLResolver.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/Throttle.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/Throttle.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/
      - copied from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/AbstractCorrelationProcCtx.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/AbstractCorrelationProcCtx.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/CorrelationOptimizer.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/CorrelationOptimizer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/CorrelationUtilities.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/CorrelationUtilities.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/IntraQueryCorrelation.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/IntraQueryCorrelation.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/QueryPlanTreeTransformation.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/QueryPlanTreeTransformation.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/ReduceSinkDeDuplication.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/ReduceSinkDeDuplication.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/DemuxDesc.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/DemuxDesc.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/MuxDesc.java
      - copied unchanged from r1506653, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MuxDesc.java
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/
      - copied from r1506653, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/
    hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKeys.java
      - copied unchanged from r1506653, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKeys.java
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer1.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer1.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer10.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer10.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer11.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer11.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer12.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer12.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer13.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer13.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer14.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer14.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer2.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer2.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer3.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer3.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer4.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer4.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer5.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer5.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer6.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer6.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer7.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer7.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer8.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer8.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/correlationoptimizer9.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/correlationoptimizer9.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/create_view_translate.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/create_view_translate.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/optional_outer.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/optional_outer.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/view_cast.q
      - copied unchanged from r1506653, hive/trunk/ql/src/test/queries/clientpositive/view_cast.q
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer11.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer11.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer14.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer14.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer2.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer3.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer4.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer4.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer5.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer5.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer6.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer6.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer7.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer7.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/create_view_translate.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/create_view_translate.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/optional_outer.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/optional_outer.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/view_cast.q.out
      - copied unchanged from r1506653, hive/trunk/ql/src/test/results/clientpositive/view_cast.q.out
    hive/branches/vectorization/testutils/ptest2/
      - copied from r1506653, hive/trunk/testutils/ptest2/
    hive/branches/vectorization/testutils/ptest2/.gitignore
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/.gitignore
    hive/branches/vectorization/testutils/ptest2/README.md
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/README.md
    hive/branches/vectorization/testutils/ptest2/conf/
      - copied from r1506653, hive/trunk/testutils/ptest2/conf/
    hive/branches/vectorization/testutils/ptest2/conf/example-apache-trunk.properties
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/conf/example-apache-trunk.properties
    hive/branches/vectorization/testutils/ptest2/pom.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/pom.xml
    hive/branches/vectorization/testutils/ptest2/src/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/
    hive/branches/vectorization/testutils/ptest2/src/main/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/
    hive/branches/vectorization/testutils/ptest2/src/main/java/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/Status.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/Status.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java
      - copied unchanged from r1506653, hive/trunk/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/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestListRequest.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestListRequest.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestLogRequest.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestLogRequest.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestStartRequest.java
      - copied unchanged from r1506653, hive/trunk/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/request/TestStatusRequest.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestStatusRequest.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestStopRequest.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/request/TestStopRequest.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/GenericResponse.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/GenericResponse.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestListResponse.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestListResponse.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestLogResponse.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestLogResponse.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestStartResponse.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestStartResponse.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestStatus.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestStatus.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestStatusResponse.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestStatusResponse.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestStopResponse.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/response/TestStopResponse.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/ExecutionController.java
      - copied unchanged from r1506653, hive/trunk/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/Test.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/Test.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/TestExecutor.java
      - copied unchanged from r1506653, hive/trunk/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/api/server/TestLogger.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/TestLogger.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/AbortDroneException.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/AbortDroneException.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/CleanupPhase.java
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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/Dirs.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Dirs.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Drone.java
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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/LocalCommand.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommandFactory.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommandFactory.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LogDirectoryCleaner.java
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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/Templates.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Templates.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/TestsFailedException.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/TestsFailedException.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/Context.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/Context.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/ExecutionContextConfiguration.java
      - copied unchanged from r1506653, hive/trunk/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/Host.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/Host.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/QFileTestBatch.java
      - copied unchanged from r1506653, hive/trunk/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/TestBatch.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestBatch.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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/conf/UnitTestBatch.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/UnitTestBatch.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/CloudComputeService.java
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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/context/CreateHostsFailedException.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/CreateHostsFailedException.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/ExecutionContext.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/ExecutionContext.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/ExecutionContextProvider.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/ExecutionContextProvider.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/FixedExecutionContextProvider.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/FixedExecutionContextProvider.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/ServiceNotAvailableException.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/ServiceNotAvailableException.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/AbstractSSHCommand.java
      - copied unchanged from r1506653, hive/trunk/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/AbstractSSHResult.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/AbstractSSHResult.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/NonZeroExitCodeException.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/NonZeroExitCodeException.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RSyncCommand.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RSyncCommand.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RSyncCommandExecutor.java
      - copied unchanged from r1506653, hive/trunk/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/RSyncResult.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RSyncResult.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RemoteCommandResult.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RemoteCommandResult.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommand.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommand.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommandExecutor.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommandExecutor.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHExecutionException.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHExecutionException.java
    hive/branches/vectorization/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHResult.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHResult.java
    hive/branches/vectorization/testutils/ptest2/src/main/resources/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/resources/
    hive/branches/vectorization/testutils/ptest2/src/main/resources/batch-exec.vm
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/resources/batch-exec.vm
    hive/branches/vectorization/testutils/ptest2/src/main/resources/log4j.properties
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/resources/log4j.properties
    hive/branches/vectorization/testutils/ptest2/src/main/resources/smart-apply-patch.sh
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/resources/smart-apply-patch.sh
    hive/branches/vectorization/testutils/ptest2/src/main/resources/source-prep.vm
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/resources/source-prep.vm
    hive/branches/vectorization/testutils/ptest2/src/main/webapp/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/webapp/
    hive/branches/vectorization/testutils/ptest2/src/main/webapp/WEB-INF/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/webapp/WEB-INF/
    hive/branches/vectorization/testutils/ptest2/src/main/webapp/WEB-INF/config/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/main/webapp/WEB-INF/config/
    hive/branches/vectorization/testutils/ptest2/src/main/webapp/WEB-INF/config/web-application-config.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/webapp/WEB-INF/config/web-application-config.xml
    hive/branches/vectorization/testutils/ptest2/src/main/webapp/WEB-INF/config/webmvc-config.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/webapp/WEB-INF/config/webmvc-config.xml
    hive/branches/vectorization/testutils/ptest2/src/main/webapp/WEB-INF/web.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/main/webapp/WEB-INF/web.xml
    hive/branches/vectorization/testutils/ptest2/src/test/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/
    hive/branches/vectorization/testutils/ptest2/src/test/java/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java
      - copied unchanged from r1506653, hive/trunk/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/api/server/TestTestLogger.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java
      - copied unchanged from r1506653, hive/trunk/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/ExtendedAssert.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ExtendedAssert.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/MockLocalCommandFactory.java
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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/TestHostExecutor.testBasic.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testBasic.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testIsolatedFailsOnExec.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testIsolatedFailsOnExec.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testIsolatedFailsOnRsyncOne.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testIsolatedFailsOnRsyncOne.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testIsolatedFailsOnRsyncUnknown.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testIsolatedFailsOnRsyncUnknown.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testParallelFailsOnExec.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testParallelFailsOnExec.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testParallelFailsOnRsync.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.testParallelFailsOnRsync.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java
      - copied unchanged from r1506653, hive/trunk/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.testExecHostsWithFailure.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.testExecHostsWithFailure.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.testExecInstancesWithFailure.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.testExecInstancesWithFailure.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.testRsyncFromLocalToRemoteInstancesWithFailureOne.approved.txt
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPrepPhase.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPrepPhase.testExecute.approved.txt
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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/TestReportingPhase.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportingPhase.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportingPhase.testExecute.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportingPhase.testExecute.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java
      - copied unchanged from r1506653, hive/trunk/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.testBatch.approved.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/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
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/
    hive/branches/vectorization/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java
    hive/branches/vectorization/testutils/ptest2/src/test/resources/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/resources/
    hive/branches/vectorization/testutils/ptest2/src/test/resources/TEST-SomeTest-failure.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/TEST-SomeTest-failure.xml
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-configuration.properties
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-configuration.properties
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/
      - copied from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/TEST-SomeTest-truncated.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/TEST-SomeTest-truncated.xml
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/TEST-index_auth.q-bucketcontex-ba31fb54-1d7f-4c70-a89d-477b7d155191-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/TEST-index_auth.q-bucketcontex-ba31fb54-1d7f-4c70-a89d-477b7d155191-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/TEST-skewjoin.q-ab8536a7-1b5c-45ed-ba29-14450f27db8b-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/TEST-skewjoin.q-ab8536a7-1b5c-45ed-ba29-14450f27db8b-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/TEST-skewjoin_union_remove_1.q-6fa31776-d2b0-4e13-9761-11f750627ad1-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/TEST-skewjoin_union_remove_1.q-6fa31776-d2b0-4e13-9761-11f750627ad1-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/TEST-union_remove_9.q-acb9de8f-1b9c-4874-924c-b2107ca7b07c-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/TEST-union_remove_9.q-acb9de8f-1b9c-4874-924c-b2107ca7b07c-TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/index_auth.q-bucketcontex-ba31fb54-1d7f-4c70-a89d-477b7d155191-hive.log
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/index_auth.q-bucketcontex-ba31fb54-1d7f-4c70-a89d-477b7d155191-hive.log
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/skewjoin.q-ab8536a7-1b5c-45ed-ba29-14450f27db8b-TestCliDriver.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/skewjoin.q-ab8536a7-1b5c-45ed-ba29-14450f27db8b-TestCliDriver.txt
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/skewjoin.q-ab8536a7-1b5c-45ed-ba29-14450f27db8b-hive.log
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/skewjoin.q-ab8536a7-1b5c-45ed-ba29-14450f27db8b-hive.log
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/skewjoin_union_remove_1.q-6fa31776-d2b0-4e13-9761-11f750627ad1-TestCliDriver.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/skewjoin_union_remove_1.q-6fa31776-d2b0-4e13-9761-11f750627ad1-TestCliDriver.txt
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/skewjoin_union_remove_1.q-6fa31776-d2b0-4e13-9761-11f750627ad1-hive.log
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/skewjoin_union_remove_1.q-6fa31776-d2b0-4e13-9761-11f750627ad1-hive.log
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/union_remove_9.q-acb9de8f-1b9c-4874-924c-b2107ca7b07c-TestCliDriver.txt
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/union_remove_9.q-acb9de8f-1b9c-4874-924c-b2107ca7b07c-TestCliDriver.txt
    hive/branches/vectorization/testutils/ptest2/src/test/resources/test-outputs/union_remove_9.q-acb9de8f-1b9c-4874-924c-b2107ca7b07c-hive.log
      - copied unchanged from r1506653, hive/trunk/testutils/ptest2/src/test/resources/test-outputs/union_remove_9.q-acb9de8f-1b9c-4874-924c-b2107ca7b07c-hive.log
Removed:
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapper.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecReducer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHelper.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHook.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/JobDebugger.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/JobTrackerURLResolver.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/MapRedTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/MapredLocalTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/Throttle.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ReduceSinkDeDuplication.java
Modified:
    hive/branches/vectorization/   (props changed)
    hive/branches/vectorization/.gitignore
    hive/branches/vectorization/RELEASE_NOTES.txt
    hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.properties
    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/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/vectorization/conf/hive-default.xml.template
    hive/branches/vectorization/contrib/src/test/results/clientnegative/case_with_row_sequence.q.out
    hive/branches/vectorization/data/files/kv1kv2.cogroup.txt
    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/HBaseSerDe.java
    hive/branches/vectorization/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
    hive/branches/vectorization/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java
    hive/branches/vectorization/hbase-handler/src/java/org/apache/hadoop/hive/hbase/LazyHBaseCellMap.java
    hive/branches/vectorization/hbase-handler/src/java/org/apache/hadoop/hive/hbase/LazyHBaseRow.java
    hive/branches/vectorization/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java
    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.xml
    hive/branches/vectorization/hcatalog/core/src/main/java/org/apache/hcatalog/shims/HCatHadoopShims.java
    hive/branches/vectorization/hcatalog/shims/src/20/java/org/apache/hadoop/mapred/TempletonJobTracker.java
    hive/branches/vectorization/hcatalog/shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java
    hive/branches/vectorization/hcatalog/shims/src/23/java/org/apache/hadoop/mapred/TempletonJobTracker.java
    hive/branches/vectorization/hcatalog/shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java
    hive/branches/vectorization/hcatalog/src/test/e2e/hcatalog/build.xml
    hive/branches/vectorization/hcatalog/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm
    hive/branches/vectorization/hcatalog/src/test/e2e/hcatalog/drivers/TestDriverHadoop.pm
    hive/branches/vectorization/hcatalog/src/test/e2e/hcatalog/drivers/TestDriverHive.pm
    hive/branches/vectorization/hcatalog/src/test/e2e/hcatalog/drivers/TestDriverPig.pm
    hive/branches/vectorization/hcatalog/src/test/e2e/hcatalog/drivers/Util.pm
    hive/branches/vectorization/hcatalog/src/test/e2e/templeton/build.xml
    hive/branches/vectorization/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
    hive/branches/vectorization/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
    hive/branches/vectorization/hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DeleteDelegator.java
    hive/branches/vectorization/hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ListDelegator.java
    hive/branches/vectorization/hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StatusDelegator.java
    hive/branches/vectorization/hcatalog/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TempletonDelegator.java
    hive/branches/vectorization/hcatalog/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestWebHCatE2e.java
    hive/branches/vectorization/ivy/libraries.properties
    hive/branches/vectorization/jdbc/build.xml
    hive/branches/vectorization/metastore/ivy.xml
    hive/branches/vectorization/ql/build.xml
    hive/branches/vectorization/ql/if/queryplan.thrift
    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-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.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/QueryPlan.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnStatsTask.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/DDLTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.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/GroupByOperator.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/MapOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/MapredContext.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/TableScanOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/Task.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/UDFArgumentException.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/persistence/AbstractRowContainer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinDoubleKeys.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectKey.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectValue.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinRowContainer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/RowContainer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorExecMapper.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/exec/vector/VectorMapOperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/BucketizedHiveInputSplit.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveRecordReader.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/HiveRecordReader.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/ReaderImpl.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/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/io/rcfile/stats/PartialScanTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/lib/DefaultGraphWalker.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/HiveLockObject.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMROperator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRRedSink1.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRRedSink2.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRRedSink3.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/GenMRUnion1.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/MapJoinFactory.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/MapJoinProcessor.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/AbstractJoinTaskDispatcher.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/BucketingSortingInferenceOptimizer.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/physical/MapJoinResolver.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SamplingOptimizer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SortMergeJoinTaskDispatcher.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/index/IndexWhereProcessor.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/GenMapRedWalker.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/IndexUpdater.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.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/SemanticAnalyzer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/parse/UnparseTranslator.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDeserializer.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
    hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionDesc.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/exec/TestExecDriver.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/udf/generic/DummyContextUDF.java
    hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/ptf_npath.q
    hive/branches/vectorization/ql/src/test/queries/clientpositive/serde_reported_schema.q
    hive/branches/vectorization/ql/src/test/results/clientnegative/autolocal1.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/cachingprintstream.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/cluster_tasklog_retrieval.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/dyn_part3.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/fatal.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/index_compact_size_limit.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/invalid_cast_from_binary_1.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/invalid_cast_from_binary_2.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/invalid_cast_from_binary_3.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/invalid_cast_from_binary_4.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/invalid_cast_from_binary_5.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/invalid_cast_from_binary_6.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/local_mapred_error_cache.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/mapreduce_stack_trace.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/mapreduce_stack_trace_hadoop20.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/mapreduce_stack_trace_turnoff.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/mapreduce_stack_trace_turnoff_hadoop20.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/minimr_broken_pipe.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/nested_complex_neg.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/script_broken_pipe1.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/script_broken_pipe2.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/script_broken_pipe3.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/script_error.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/serde_regex2.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/udf_assert_true.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/udf_assert_true2.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/udf_reflect_neg.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/udf_test_error.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/udfnull.q.out
    hive/branches/vectorization/ql/src/test/results/clientnegative/wrong_column_type.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/authorization_2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/authorization_6.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_join25.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketmapjoin1.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/bucketmapjoin4.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/bucketsortoptimize_insert_2.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/join_nullsafe.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/loadpart_err.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/mapjoin_distinct.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/mapjoin_hook.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/ptf_npath.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/serde_reported_schema.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
    hive/branches/vectorization/ql/src/test/results/clientpositive/stats11.q.out
    hive/branches/vectorization/ql/src/test/results/compiler/errors/invalid_function_param2.q.out
    hive/branches/vectorization/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/cast1.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/groupby1.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/groupby2.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/groupby3.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/groupby4.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/groupby5.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/groupby6.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input1.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input2.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input20.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input3.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input4.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input5.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input6.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input7.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input8.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input9.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input_part1.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input_testxpath.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/join1.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/join2.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/join3.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/join4.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/join5.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/join6.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/join7.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/join8.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/sample1.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/sample2.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/sample3.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/sample4.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/sample5.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/sample6.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/sample7.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/subq.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/udf1.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/udf4.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/udf6.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/udf_case.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/udf_when.q.xml
    hive/branches/vectorization/ql/src/test/results/compiler/plan/union.q.xml
    hive/branches/vectorization/serde/src/test/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java
    hive/branches/vectorization/shims/src/common-secure/test/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java

Propchange: hive/branches/vectorization/
------------------------------------------------------------------------------
  Merged /hive/branches/branch-0.11:r1505184
  Merged /hive/trunk:r1501134-1506653

Modified: hive/branches/vectorization/.gitignore
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/.gitignore?rev=1506785&r1=1506784&r2=1506785&view=diff
==============================================================================
--- hive/branches/vectorization/.gitignore (original)
+++ hive/branches/vectorization/.gitignore Thu Jul 25 00:14:58 2013
@@ -16,4 +16,4 @@ common/src/gen
 ql/derby.log
 derby.log
 .arc
-
+ql/TempStatsStore

Modified: hive/branches/vectorization/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/RELEASE_NOTES.txt?rev=1506785&r1=1506784&r2=1506785&view=diff
==============================================================================
--- hive/branches/vectorization/RELEASE_NOTES.txt (original)
+++ hive/branches/vectorization/RELEASE_NOTES.txt Thu Jul 25 00:14:58 2013
@@ -15,6 +15,7 @@ Release Notes - Hive - Version 0.11.0
     * [HIVE-4326] - Clean up remaining items in hive/hcatalog/historical/trunk
 
 ** Bug
+    * [HIVE-4820] - webhcat_config.sh should set default values for HIVE_HOME and HCAT_PREFIX that work with default build tree structure
     * [HIVE-2264] - Hive server is SHUTTING DOWN when invalid queries beeing executed.
     * [HIVE-2332] - If all of the parameters of distinct functions are exists in group by columns, query fails in runtime
     * [HIVE-2689] - ObjectInspectorConverters cannot convert Void types to Array/Map/Struct types.

Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.properties
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.properties?rev=1506785&r1=1506784&r2=1506785&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.properties (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/BeeLine.properties Thu Jul 25 00:14:58 2013
@@ -141,6 +141,8 @@ cmd-usage: Usage: java org.apache.hive.c
 \  -n <username>                   the username to connect as\n \
 \  -p <password>                   the password to connect as\n \
 \  -d <driver class>               the driver class to use\n \
+\  -e <query>                      query that should be executed\n \
+\  -f <file>                       script file that should be executed\n \
 \  --color=[true/false]            control whether color is used for display\n \
 \  --showHeader=[true/false]       show column names in query results\n \
 \  --headerInterval=ROWS;          the interval between which heades are displayed\n \

Modified: hive/branches/vectorization/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/build.properties?rev=1506785&r1=1506784&r2=1506785&view=diff
==============================================================================
--- hive/branches/vectorization/build.properties (original)
+++ hive/branches/vectorization/build.properties Thu Jul 25 00:14:58 2013
@@ -73,12 +73,30 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ex
 common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
 
 # module names needed for build process
-iterate.hive.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog
-iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog
-iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,beeline,metastore,odbc,serde,service,hcatalog
-iterate.hive.thrift=ql,service,metastore,serde
-iterate.hive.protobuf=ql
-iterate.hive.cpp=odbc
+
+# full profile
+iterate.hive.full.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog
+iterate.hive.full.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog
+iterate.hive.full.tests=ql,contrib,hbase-handler,hwi,jdbc,beeline,metastore,odbc,serde,service,hcatalog
+iterate.hive.full.thrift=ql,service,metastore,serde
+iterate.hive.full.protobuf=ql
+iterate.hive.full.cpp=odbc
+
+# no hcatalog profile
+iterate.hive.nohcat.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils
+iterate.hive.nohcat.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils
+iterate.hive.nohcat.tests=ql,contrib,hbase-handler,hwi,jdbc,beeline,metastore,odbc,serde,service
+iterate.hive.nohcat.thrift=ql,service,metastore,serde
+iterate.hive.nohcat.protobuf=ql
+iterate.hive.nohcat.cpp=odbc
+
+# core profile
+iterate.hive.core.all=ant,shims,common,serde,metastore,ql,cli
+iterate.hive.core.modules=shims,common,serde,metastore,ql,cli
+iterate.hive.core.tests=ql
+iterate.hive.core.thrift=ql
+iterate.hive.core.protobuf=ql
+iterate.hive.core.cpp=
 
 #
 # Test Properties
@@ -88,7 +106,7 @@ iterate.hive.cpp=odbc
 # (measured in milliseconds). Ignored if fork is disabled. When running
 # multiple tests inside the same Java VM (see forkMode), timeout
 # applies to the time that all tests use together, not to an individual test.
-test.junit.timeout=43200000
+test.junit.timeout=86400000
 
 # Use this property to selectively disable tests from the command line:
 # ant test -Dtest.junit.exclude="**/TestCliDriver.class"

Modified: hive/branches/vectorization/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/build.xml?rev=1506785&r1=1506784&r2=1506785&view=diff
==============================================================================
--- hive/branches/vectorization/build.xml (original)
+++ hive/branches/vectorization/build.xml Thu Jul 25 00:14:58 2013
@@ -59,6 +59,51 @@
   <property name="rat.build.dir" location="${build.dir.hive}/rat"/>
   <property name="md5sum.format" value="{0}  {1}"/>
 
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+    <classpath>
+      <pathelement location="${hive.root}/testlibs/ant-contrib-1.0b3.jar"/>
+    </classpath>
+  </taskdef>
+
+  <if>
+    <equals arg1="${build.profile}" arg2="core"/>
+    <then>
+      <property name="iterate.hive.all" value="${iterate.hive.core.all}"/>
+      <property name="iterate.hive.modules" value="${iterate.hive.core.modules}"/>
+      <property name="iterate.hive.tests" value="${iterate.hive.core.tests}"/>
+      <property name="iterate.hive.thrift" value="${iterate.hive.core.thrift}"/>
+      <property name="iterate.hive.protobuf" value="${iterate.hive.core.protobuf}"/>
+      <property name="iterate.hive.cpp" value="${iterate.hive.core.cpp}"/>
+    </then>
+  </if>
+
+  <if>
+    <equals arg1="${build.profile}" arg2="nohcat"/>
+    <then>
+      <property name="iterate.hive.all" value="${iterate.hive.nohcat.all}"/>
+      <property name="iterate.hive.modules" value="${iterate.hive.nohcat.modules}"/>
+      <property name="iterate.hive.tests" value="${iterate.hive.nohcat.tests}"/>
+      <property name="iterate.hive.thrift" value="${iterate.hive.nohcat.thrift}"/>
+      <property name="iterate.hive.protobuf" value="${iterate.hive.nohcat.protobuf}"/>
+      <property name="iterate.hive.cpp" value="${iterate.hive.nohcat.cpp}"/>
+    </then>
+  </if>
+
+  <if>
+    <or>
+      <equals arg1="${build.profile}" arg2="full"/>
+      <not><isset property="build.profile"/></not>
+    </or>
+    <then>
+      <property name="iterate.hive.all" value="${iterate.hive.full.all}"/>
+      <property name="iterate.hive.modules" value="${iterate.hive.full.modules}"/>
+      <property name="iterate.hive.tests" value="${iterate.hive.full.tests}"/>
+      <property name="iterate.hive.thrift" value="${iterate.hive.full.thrift}"/>
+      <property name="iterate.hive.protobuf" value="${iterate.hive.full.protobuf}"/>
+      <property name="iterate.hive.cpp" value="${iterate.hive.full.cpp}"/>
+    </then>
+  </if>
+
   <!-- Check minimum ant version required -->
   <fail message="Please use ant version 1.8.0 or greater for building hive.">
     <condition>
@@ -477,18 +522,18 @@
         <exclude name="**/hive-anttasks*.jar"/>
         <exclude name="**/hive-testutils*.jar"/>
       </fileset>
-      <fileset file="${build.dir.hive}/beeline/hive-beeline-${version}.jar"/>
-      <fileset file="${build.dir.hive}/cli/hive-cli-${version}.jar"/>
-      <fileset file="${build.dir.hive}/common/hive-common-${version}.jar"/>
-      <fileset file="${build.dir.hive}/ql/hive-exec-${version}.jar"/>
-      <fileset file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"/>
-      <fileset file="${build.dir.hive}/hwi/hive-hwi-${version}.war"/>
-      <fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"/>
+      <fileset file="${build.dir.hive}/beeline/hive-beeline-${version}.jar" erroronmissingdir="false"/>
+      <fileset file="${build.dir.hive}/cli/hive-cli-${version}.jar" erroronmissingdir="false"/>
+      <fileset file="${build.dir.hive}/common/hive-common-${version}.jar" erroronmissingdir="false"/>
+      <fileset file="${build.dir.hive}/ql/hive-exec-${version}.jar" erroronmissingdir="false"/>
+      <fileset file="${build.dir.hive}/metastore/hive-metastore-${version}.jar" erroronmissingdir="false"/>
+      <fileset file="${build.dir.hive}/hwi/hive-hwi-${version}.war" erroronmissingdir="false"/>
+      <fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar" erroronmissingdir="false"/>
       <fileset dir="${build.dir.hive}/ivy/lib/default">
         <include name="*.jar"/>
         <exclude name="*.tar.gz"/>
         <exclude name="hadoop-*.jar" />
-	<exclude name="**/*high-scale-lib-*"/>
+        <exclude name="**/*high-scale-lib-*"/>
         <exclude name="**/hamcrest-core-*jar"/>
         <exclude name="**/junit*.jar"/>
         <exclude name="**/asm*.jar"/>
@@ -516,17 +561,27 @@
     </chmod>
 
     <!-- Package the hcat stuff and pull it up into Hive's build dir -->
-    <ant antfile="${hive.root}/hcatalog/build.xml" target="package"
-        inheritAll="false"/>
-    <mkdir dir="${target.dir}/hcatalog"/>
-    <copy todir="${target.dir}/hcatalog">
-        <fileset dir="${hive.root}/hcatalog/build/hcatalog-${hcatalog.version}"/>
-    </copy>
+    <if>
+      <matches string="${iterate.hive.all}" pattern="hcatalog"/>
+      <then>
+        <ant antfile="${hive.root}/hcatalog/build.xml" target="package"
+          inheritAll="false"/>
+        <mkdir dir="${target.dir}/hcatalog"/>
+        <copy todir="${target.dir}/hcatalog">
+          <fileset dir="${hive.root}/hcatalog/build/hcatalog-${hcatalog.version}"/>
+        </copy>
+      </then>
+    </if>
     <!--fix permissions since 'copy' looses them (known ant/Java issue)-->
-    <chmod perm="ugo+x" type="file">
-      <fileset dir="${target.dir}/hcatalog/bin"/>
-      <fileset dir="${target.dir}/hcatalog/sbin"/>
-    </chmod>
+    <if>
+      <matches string="${iterate.hive.all}" pattern="hcatalog"/>
+      <then>
+        <chmod perm="ugo+x" type="file">
+          <fileset dir="${target.dir}/hcatalog/bin"/>
+          <fileset dir="${target.dir}/hcatalog/sbin"/>
+        </chmod>
+      </then>
+    </if>
   </target>
 
 

Modified: hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java?rev=1506785&r1=1506784&r2=1506785&view=diff
==============================================================================
--- hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java (original)
+++ hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java Thu Jul 25 00:14:58 2013
@@ -52,9 +52,9 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.ql.CommandNeedRetryException;
 import org.apache.hadoop.hive.ql.Driver;
 import org.apache.hadoop.hive.ql.exec.FunctionRegistry;
-import org.apache.hadoop.hive.ql.exec.HadoopJobExecHelper;
 import org.apache.hadoop.hive.ql.exec.Utilities;
 import org.apache.hadoop.hive.ql.exec.Utilities.StreamPrinter;
+import org.apache.hadoop.hive.ql.exec.mr.HadoopJobExecHelper;
 import org.apache.hadoop.hive.ql.parse.HiveParser;
 import org.apache.hadoop.hive.ql.parse.VariableSubstitution;
 import org.apache.hadoop.hive.ql.processors.CommandProcessor;



Mime
View raw message