hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r808036 [1/4] - in /hadoop/mapreduce/branches/MAPREDUCE-233: ./ .eclipse.templates/ conf/ ivy/ lib/ src/c++/ src/contrib/ src/contrib/capacity-scheduler/ src/contrib/data_join/ src/contrib/dynamic-scheduler/ src/contrib/eclipse-plugin/ src/...
Date Wed, 26 Aug 2009 15:01:34 GMT
Author: stevel
Date: Wed Aug 26 15:01:29 2009
New Revision: 808036

URL: http://svn.apache.org/viewvc?rev=808036&view=rev
Log:
MAPREDUCE-233 -updating with trunk

Added:
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriverBase.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriverBase.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/
      - copied from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/
      - copied from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockInputSplit.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockInputSplit.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockMapContextWrapper.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockMapContextWrapper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockOutputCommitter.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockOutputCommitter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockRawKeyValueIterator.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockRawKeyValueIterator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockReduceContextWrapper.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockReduceContextWrapper.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/
      - copied from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/AllTests.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/AllTests.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/ThirdPartyTests.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/ThirdPartyTests.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/QuasiMonteCarlo.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/examples/org/apache/hadoop/examples/QuasiMonteCarlo.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/filecache/TaskDistributedCacheManager.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/filecache/TaskDistributedCacheManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/filecache/TrackerDistributedCacheManager.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/filecache/TrackerDistributedCacheManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/
      - copied from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/ArrayListBackedIterator.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/ArrayListBackedIterator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/ComposableInputFormat.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/ComposableInputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/ComposableRecordReader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/ComposableRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputSplit.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputSplit.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/CompositeRecordReader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/CompositeRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/InnerJoinRecordReader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/InnerJoinRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/JoinRecordReader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/JoinRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/MultiFilterRecordReader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/MultiFilterRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/OuterJoinRecordReader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/OuterJoinRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/OverrideRecordReader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/OverrideRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/Parser.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/Parser.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/ResetableIterator.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/ResetableIterator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/StreamBackedIterator.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/StreamBackedIterator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/TupleWritable.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/TupleWritable.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/WrappedRecordReader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/WrappedRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/lib/join/package.html
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/lib/join/package.html
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobTrackerStart.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestJobTrackerStart.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMRWithDistributedCache.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestMRWithDistributedCache.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMapredSystemDir.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestMapredSystemDir.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/
      - copied from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinProperties.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinProperties.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinTupleWritable.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinTupleWritable.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestWrappedRRClassloader.java
      - copied unchanged from r807678, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestWrappedRRClassloader.java
Removed:
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/PiEstimator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestDistributedCache.java
Modified:
    hadoop/mapreduce/branches/MAPREDUCE-233/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath
    hadoop/mapreduce/branches/MAPREDUCE-233/.gitignore   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt
    hadoop/mapreduce/branches/MAPREDUCE-233/conf/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/conf/capacity-scheduler.xml.template   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/ivy/libraries.properties
    hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-core-0.21.0-dev.jar
    hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-core-test-0.21.0-dev.jar
    hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-hdfs-0.21.0-dev.jar
    hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-hdfs-test-0.21.0-dev.jar
    hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/build-contrib.xml   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/build.xml   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/data_join/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/dynamic-scheduler/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.classpath
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/META-INF/MANIFEST.MF
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/build.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/index/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/TestDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/AllTests.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/build.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/AllTests.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/ivy.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/vaidya/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/docs/src/documentation/content/xdocs/commands_manual.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/ExampleDriver.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/Join.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/examples/org/apache/hadoop/examples/RandomTextWriter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/mapred-default.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/Child.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobClient.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobConf.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobEndNotifier.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobHistory.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/JobTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/MapTaskRunner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/QueueManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/ReduceTask.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/ReduceTaskRunner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskRunner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/TaskTracker.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/ArrayListBackedIterator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/ComposableInputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/ComposableRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/CompositeInputSplit.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/CompositeRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/InnerJoinRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/JoinRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/MultiFilterRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/OuterJoinRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/OverrideRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/Parser.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/ResetableIterator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/StreamBackedIterator.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/TupleWritable.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/join/WrappedRecordReader.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapred/pipes/Submitter.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/Counters.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/java/org/apache/hadoop/mapreduce/filecache/DistributedCache.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/commit-tests
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/findbugsExcludeFile.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/   (props changed)
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred-site.xml
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/BigMapOutput.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/FakeObjectUtilities.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/MiniMRCluster.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestBadRecords.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestIsolationRunner.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestJobRetire.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMRServerPorts.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRWithDFS.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestNodeRefresh.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestRecoveryManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/TestTrackerReservation.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/MapReduceTestUtil.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/TestChild.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLocal.java
    hadoop/mapreduce/branches/MAPREDUCE-233/src/webapps/job/   (props changed)

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:804974-805826
+/hadoop/mapreduce/trunk:804974-807678

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/.eclipse.templates/.classpath Wed Aug 26 15:01:29 2009
@@ -30,7 +30,6 @@
 	<classpathentry kind="lib" path="lib/hadoop-hdfs-0.21.0-dev.jar"/>
 	<classpathentry kind="lib" path="lib/hadoop-hdfs-test-0.21.0-dev.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-cli-1.2.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-cli-2.0-mahout.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-codec-1.3.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-el-1.0.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-httpclient-3.0.1.jar"/>

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,4 +1,4 @@
 /hadoop/core/branches/HADOOP-4687/mapred/.gitignore:776175-784965
 /hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
 /hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:804974-805826
+/hadoop/mapreduce/trunk/.gitignore:804974-807678

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/CHANGES.txt Wed Aug 26 15:01:29 2009
@@ -23,6 +23,13 @@
     MAPREDUCE-711. Moved Distributed Cache from Common to Map/Reduce
     project. (Vinod Kumar Vavilapalli via yhemanth)
 
+    MAPREDUCE-895. Per the contract elucidated in HADOOP-6201, throw
+    FileNotFoundException from FileSystem::listStatus rather than returning
+    null. (Jakob Homan via cdouglas)
+
+    MAPREDUCE-479. Provide full task id to map output servlet rather than the
+    reduce id, only. (Jiaqi Tan via cdouglas)
+
   NEW FEATURES
 
     MAPREDUCE-706. Support for FIFO pools in the fair scheduler.
@@ -62,6 +69,15 @@
     MAPREDUCE-814. Provide a way to configure completed job history files 
     to be on HDFS. (sharad)
 
+    MAPREDUCE-800. MRUnit should support the new API. (Aaron Kimball via
+    tomwhite)
+
+    MAPREDUCE-798. MRUnit should be able to test a succession of MapReduce
+    passes. (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-768. Provide an option to dump jobtracker configuration in JSON
+    format to standard output. (V.V.Chaitanya Krishna via yhemanth)
+
   IMPROVEMENTS
 
     MAPREDUCE-816. Rename "local" mysql import to "direct" in Sqoop.
@@ -213,6 +229,36 @@
       deprecated mapred.child.ulimit
     (acmurthy)
 
+    MAPREDUCE-767. Remove the dependence on the CLI 2.0 snapshot.
+    (Amar Kamat via omalley)
+
+    MAPREDUCE-712. Minor efficiency tweaks to RandomTextWriter. (cdouglas)
+
+    MAPREDUCE-870. Remove the job retire thread and the associated 
+    config parameters. (sharad)
+
+    MAPREDUCE-749. Make Sqoop unit tests more Hudson-friendly.
+    (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-874. Rename the PiEstimator example to QuasiMonteCarlo.
+    (szetszwo)
+
+    MAPREDUCE-336. Allow logging level of map/reduce tasks to be configurable. 
+    Configuration changes:
+      add mapred.map.child.log.level 
+      add mapred.reduce.child.log.level 
+    (acmurthy)
+
+    MAPREDUCE-355. Update mapred.join package to use the new API. (Amareshwari
+    Sriramadasu via cdouglas)
+
+    HADOOP-6184. Updated hadoop common and test jars to get the new API
+    in Configuration for dumping in JSON format from Hudson trunk build #68.
+    (yhemanth)
+
+    MAPREDUCE-476. Extend DistributedCache to work locally (LocalJobRunner).
+    (Philip Zeyliger via tomwhite)
+
   BUG FIXES
 
     MAPREDUCE-878. Rename fair scheduler design doc to 
@@ -409,3 +455,21 @@
     MAPREDUCE-773. Sends progress reports for compressed gzip inputs in maps.
     Fixes a native direct buffer leak in LineRecordReader classes.
     (Hong Tang and ddas)
+
+    MAPREDUCE-832. Reduce number of warning messages printed when
+    deprecated memory variables are used. (Rahul Kumar Singh via yhemanth)
+
+    MAPREDUCE-745. Fixes a testcase problem to do with generation of JobTracker
+    IDs. (Amar Kamat via ddas)
+
+    MAPREDUCE-834. Enables memory management on tasktrackers when old
+    memory management parameters are used in configuration.
+    (Sreekanth Ramakrishnan via yhemanth)
+
+    MAPREDUCE-818. Fixes Counters#getGroup API. (Amareshwari Sriramadasu 
+    via sharad)
+
+    MAPREDUCE-807. Handles the AccessControlException during the deletion of
+    mapred.system.dir in the JobTracker. The JobTracker will bail out if it
+    encounters such an exception. (Amar Kamat via ddas)
+

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf:713112
 /hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:804974-805826
+/hadoop/mapreduce/trunk/conf:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112
 /hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643
-/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:804974-805826
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:804974-807678

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/ivy.xml?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/ivy.xml (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/ivy.xml Wed Aug 26 15:01:29 2009
@@ -82,10 +82,6 @@
   <dependencies>
 
  <!--used client side-->
-    <dependency org="org.apache.mahout.commons"
-      name="commons-cli"
-      rev="${commons-cli2.version}"
-      conf="client->default"/>
     <dependency org="commons-cli"
       name="commons-cli"
       rev="${commons-cli.version}"

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/ivy/libraries.properties?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/ivy/libraries.properties (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/ivy/libraries.properties Wed Aug 26 15:01:29 2009
@@ -19,7 +19,6 @@
 checkstyle.version=4.2
 
 commons-cli.version=1.2
-commons-cli2.version=2.0-mahout
 commons-codec.version=1.3
 commons-collections.version=3.1
 commons-httpclient.version=3.0.1

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-core-0.21.0-dev.jar
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-core-0.21.0-dev.jar?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-core-test-0.21.0-dev.jar
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-core-test-0.21.0-dev.jar?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-hdfs-0.21.0-dev.jar
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-hdfs-0.21.0-dev.jar?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-hdfs-test-0.21.0-dev.jar
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/lib/hadoop-hdfs-test-0.21.0-dev.jar?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
Binary files - no diff available.

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/c++:713112
 /hadoop/core/trunk/src/c++:776175-784663
-/hadoop/mapreduce/trunk/src/c++:804974-805826
+/hadoop/mapreduce/trunk/src/c++:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
 /hadoop/core/trunk/src/contrib:784664-785643
-/hadoop/mapreduce/trunk/src/contrib:804974-805826
+/hadoop/mapreduce/trunk/src/contrib:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
 /hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
 /hadoop/core/trunk/src/contrib/build.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build.xml:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/build.xml:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
 /hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
 /hadoop/core/trunk/src/contrib/data_join:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/data_join:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/data_join:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112
 /hadoop/core/trunk/src/contrib/dynamic-scheduler:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
 /hadoop/core/trunk/src/contrib/eclipse-plugin:776175-784663
-/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:804974-807678

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.classpath
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.classpath?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.classpath (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/.classpath Wed Aug 26 15:01:29 2009
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry excluding="org/apache/hadoop/eclipse/server/CopyOfHadoopServer.java" kind="src" path="src/java"/>
 	<classpathentry exported="true" kind="lib" path="classes" sourcepath="classes"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/hadoop-core.jar" sourcepath="/hadoop-socks/src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/META-INF/MANIFEST.MF?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/META-INF/MANIFEST.MF (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/META-INF/MANIFEST.MF Wed Aug 26 15:01:29 2009
@@ -24,6 +24,5 @@
  org.apache.commons.logging
 Eclipse-LazyStart: true
 Bundle-ClassPath: classes/,
- lib/commons-cli-2.0-SNAPSHOT.jar,
  lib/hadoop-core.jar
 Bundle-Vendor: Apache Hadoop

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/build.xml?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/build.xml (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/eclipse-plugin/build.xml Wed Aug 26 15:01:29 2009
@@ -71,7 +71,6 @@
       <fileset dir="${hadoop.root}/lib" includes="hadoop-core-*.jar" excludes="hadoop-core-test-*.jar"/>
     </copy> 
     <copy file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli.version}.jar"  todir="${build.dir}/lib" verbose="true"/>
-    <copy file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli2.version}.jar"  todir="${build.dir}/lib" verbose="true"/>
     <jar
       jarfile="${build.dir}/hadoop-${version}-${name}.jar"
       manifest="${root}/META-INF/MANIFEST.MF">

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112
 /hadoop/core/trunk/src/contrib/fairscheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/fairscheduler:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
 /hadoop/core/trunk/src/contrib/index:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/index:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/index:804974-807678

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112
 /hadoop/core/trunk/src/contrib/mrunit:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/mrunit:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/mrunit:804974-807678

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriver.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriver.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriver.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriver.java Wed Aug 26 15:01:29 2009
@@ -38,15 +38,12 @@
  * single (k, v) -> (k, v)* case from the Mapper, representing a single unit
  * test. Multiple input (k, v) pairs should go in separate unit tests.
  */
-public class MapDriver<K1, V1, K2, V2> extends TestDriver<K1, V1, K2, V2> {
+public class MapDriver<K1, V1, K2, V2> extends MapDriverBase<K1, V1, K2, V2> {
 
   public static final Log LOG = LogFactory.getLog(MapDriver.class);
 
   private Mapper<K1, V1, K2, V2> myMapper;
 
-  private K1 inputKey;
-  private V1 inputVal;
-
   public MapDriver(final Mapper<K1, V1, K2, V2> m) {
     myMapper = m;
   }
@@ -54,7 +51,6 @@
   public MapDriver() {
   }
 
-
   /**
    * Set the Mapper instance to use with this test driver
    *
@@ -78,18 +74,6 @@
   }
 
   /**
-   * Sets the input key to send to the mapper
-   *
-   */
-  public void setInputKey(K1 key) {
-    inputKey = key;
-  }
-
-  public K1 getInputKey() {
-    return inputKey;
-  }
-
-  /**
    * Identical to setInputKey() but with fluent programming style
    *
    * @return this
@@ -100,19 +84,6 @@
   }
 
   /**
-   * Sets the input value to send to the mapper
-   *
-   * @param val
-   */
-  public void setInputValue(V1 val) {
-    inputVal = val;
-  }
-
-  public V1 getInputValue() {
-    return inputVal;
-  }
-
-  /**
    * Identical to setInputValue() but with fluent programming style
    *
    * @param val
@@ -124,15 +95,6 @@
   }
 
   /**
-   * Sets the input to send to the mapper
-   *
-   */
-  public void setInput(K1 key, V1 val) {
-    setInputKey(key);
-    setInputValue(val);
-  }
-
-  /**
    * Identical to setInput() but returns self for fluent programming style
    *
    * @return this
@@ -143,21 +105,6 @@
   }
 
   /**
-   * Sets the input to send to the mapper
-   *
-   * @param inputRecord
-   *          a (key, val) pair
-   */
-  public void setInput(Pair<K1, V1> inputRecord) {
-    if (null != inputRecord) {
-      setInputKey(inputRecord.getFirst());
-      setInputValue(inputRecord.getSecond());
-    } else {
-      throw new IllegalArgumentException("null inputRecord in setInput()");
-    }
-  }
-
-  /**
    * Identical to setInput() but returns self for fluent programming style
    *
    * @param inputRecord
@@ -169,20 +116,6 @@
   }
 
   /**
-   * Adds an output (k, v) pair we expect from the Mapper
-   *
-   * @param outputRecord
-   *          The (k, v) pair to add
-   */
-  public void addOutput(Pair<K2, V2> outputRecord) {
-    if (null != outputRecord) {
-      expectedOutputs.add(outputRecord);
-    } else {
-      throw new IllegalArgumentException("Tried to add null outputRecord");
-    }
-  }
-
-  /**
    * Works like addOutput(), but returns self for fluent style
    *
    * @param outputRecord
@@ -194,14 +127,6 @@
   }
 
   /**
-   * Adds a (k, v) pair we expect as output from the mapper
-   *
-   */
-  public void addOutput(K2 key, V2 val) {
-    addOutput(new Pair<K2, V2>(key, val));
-  }
-
-  /**
    * Functions like addOutput() but returns self for fluent programming
    * style
    *
@@ -213,30 +138,6 @@
   }
 
   /**
-   * Expects an input of the form "key \t val" Forces the Mapper input types
-   * to Text.
-   *
-   * @param input
-   *          A string of the form "key \t val".
-   */
-  public void setInputFromString(String input) {
-    if (null == input) {
-      throw new IllegalArgumentException("null input given to setInputFromString");
-    } else {
-      Pair<Text, Text> inputPair = parseTabbedPair(input);
-      if (null != inputPair) {
-        // I know this is not type-safe, but I don't know a better way to do
-        // this.
-        setInputKey((K1) inputPair.getFirst());
-        setInputValue((V1) inputPair.getSecond());
-      } else {
-        throw new IllegalArgumentException(
-            "Could not parse input pair in setInputFromString");
-      }
-    }
-  }
-
-  /**
    * Identical to setInputFromString, but with a fluent programming style
    *
    * @param input
@@ -249,28 +150,6 @@
   }
 
   /**
-   * Expects an input of the form "key \t val" Forces the Mapper output types
-   * to Text.
-   *
-   * @param output
-   *          A string of the form "key \t val". Trims any whitespace.
-   */
-  public void addOutputFromString(String output) {
-    if (null == output) {
-      throw new IllegalArgumentException("null input given to setOutput");
-    } else {
-      Pair<Text, Text> outputPair = parseTabbedPair(output);
-      if (null != outputPair) {
-        // I know this is not type-safe, but I don't know a better way to do
-        // this.
-        addOutput((Pair<K2, V2>) outputPair);
-      } else {
-        throw new IllegalArgumentException("Could not parse output pair in setOutput");
-      }
-    }
-  }
-
-  /**
    * Identical to addOutputFromString, but with a fluent programming style
    *
    * @param output
@@ -294,33 +173,6 @@
   }
 
   @Override
-  public void runTest() throws RuntimeException {
-    String inputKeyStr = "(null)";
-    String inputValStr = "(null)";
-
-    if (null != inputKey) {
-      inputKeyStr = inputKey.toString();
-    }
-
-    if (null != inputVal) {
-      inputValStr = inputVal.toString();
-    }
-
-    LOG.debug("Mapping input (" + inputKeyStr + ", " + inputValStr + ")");
-
-    List<Pair<K2, V2>> outputs = null;
-
-    try {
-      outputs = run();
-      validate(outputs);
-    } catch (IOException ioe) {
-      LOG.error("IOException in mapper: " + ioe.toString());
-      LOG.debug("Setting success to false based on IOException");
-      throw new RuntimeException();
-    }
-  }
-
-  @Override
   public String toString() {
     return "MapDriver (" + myMapper + ")";
   }

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriver.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriver.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriver.java Wed Aug 26 15:01:29 2009
@@ -41,14 +41,14 @@
  * inputs. By calling runTest(), the harness will deliver the input to the
  * Mapper, feed the intermediate results to the Reducer (without checking
  * them), and will check the Reducer's outputs against the expected results.
- * This is designed to handle a single (k, v)* -> (k, v)* case from the
+ * This is designed to handle the (k, v)* -> (k, v)* case from the
  * Mapper/Reducer pair, representing a single unit test.
  *
  * If a combiner is specified, then it will be run exactly once after
  * the Mapper and before the Reducer.
  */
 public class MapReduceDriver<K1, V1, K2, V2, K3, V3>
-    extends TestDriver<K1, V1, K3, V3> {
+    extends MapReduceDriverBase<K1, V1, K2, V2, K3, V3> {
 
   public static final Log LOG = LogFactory.getLog(MapReduceDriver.class);
 
@@ -56,13 +56,10 @@
   private Reducer<K2, V2, K3, V3> myReducer;
   private Reducer<K2, V2, K2, V2> myCombiner;
 
-  private List<Pair<K1, V1>> inputList;
-
   public MapReduceDriver(final Mapper<K1, V1, K2, V2> m,
                          final Reducer<K2, V2, K3, V3> r) {
     myMapper = m;
     myReducer = r;
-    inputList = new ArrayList<Pair<K1, V1>>();
   }
 
   public MapReduceDriver(final Mapper<K1, V1, K2, V2> m,
@@ -71,11 +68,9 @@
     myMapper = m;
     myReducer = r;
     myCombiner = c;
-    inputList = new ArrayList<Pair<K1, V1>>();
   }
 
   public MapReduceDriver() {
-    inputList = new ArrayList<Pair<K1, V1>>();
   }
 
   /** Set the Mapper instance to use with this test driver
@@ -151,15 +146,6 @@
   }
 
   /**
-   * Adds an input to send to the mapper
-   * @param key
-   * @param val
-   */
-  public void addInput(K1 key, V1 val) {
-    inputList.add(new Pair<K1, V1>(key, val));
-  }
-
-  /**
    * Identical to addInput() but returns self for fluent programming style
    * @param key
    * @param val
@@ -171,18 +157,6 @@
   }
 
   /**
-   * Adds an input to send to the Mapper
-   * @param input The (k, v) pair to add to the input list.
-   */
-  public void addInput(Pair<K1, V1> input) {
-    if (null == input) {
-      throw new IllegalArgumentException("Null input in addInput()");
-    }
-
-    inputList.add(input);
-  }
-
-  /**
    * Identical to addInput() but returns self for fluent programming style
    * @param input The (k, v) pair to add
    * @return this
@@ -194,18 +168,6 @@
   }
 
   /**
-   * Adds an output (k, v) pair we expect from the Reducer
-   * @param outputRecord The (k, v) pair to add
-   */
-  public void addOutput(Pair<K3, V3> outputRecord) {
-    if (null != outputRecord) {
-      expectedOutputs.add(outputRecord);
-    } else {
-      throw new IllegalArgumentException("Tried to add null outputRecord");
-    }
-  }
-
-  /**
    * Works like addOutput(), but returns self for fluent style
    * @param outputRecord
    * @return this
@@ -217,15 +179,6 @@
   }
 
   /**
-   * Adds a (k, v) pair we expect as output from the Reducer
-   * @param key
-   * @param val
-   */
-  public void addOutput(K3 key, V3 val) {
-    addOutput(new Pair<K3, V3>(key, val));
-  }
-
-  /**
    * Functions like addOutput() but returns self for fluent programming style
    * @param key
    * @param val
@@ -237,26 +190,6 @@
   }
 
   /**
-   * Expects an input of the form "key \t val"
-   * Forces the Mapper input types to Text.
-   * @param input A string of the form "key \t val". Trims any whitespace.
-   */
-  public void addInputFromString(String input) {
-    if (null == input) {
-      throw new IllegalArgumentException("null input given to setInput");
-    } else {
-      Pair<Text, Text> inputPair = parseTabbedPair(input);
-      if (null != inputPair) {
-        // I know this is not type-safe, but I don't
-        // know a better way to do this.
-        addInput((Pair<K1, V1>) inputPair);
-      } else {
-        throw new IllegalArgumentException("Could not parse input pair in addInput");
-      }
-    }
-  }
-
-  /**
    * Identical to addInputFromString, but with a fluent programming style
    * @param input A string of the form "key \t val". Trims any whitespace.
    * @return this
@@ -267,27 +200,6 @@
   }
 
   /**
-   * Expects an input of the form "key \t val"
-   * Forces the Reducer output types to Text.
-   * @param output A string of the form "key \t val". Trims any whitespace.
-   */
-  public void addOutputFromString(String output) {
-    if (null == output) {
-      throw new IllegalArgumentException("null input given to setOutput");
-    } else {
-      Pair<Text, Text> outputPair = parseTabbedPair(output);
-      if (null != outputPair) {
-        // I know this is not type-safe,
-        // but I don't know a better way to do this.
-        addOutput((Pair<K3, V3>) outputPair);
-      } else {
-        throw new IllegalArgumentException(
-            "Could not parse output pair in setOutput");
-      }
-    }
-  }
-
-  /**
    * Identical to addOutputFromString, but with a fluent programming style
    * @param output A string of the form "key \t val". Trims any whitespace.
    * @return this
@@ -347,58 +259,7 @@
   }
 
   @Override
-  public void runTest() throws RuntimeException {
-    List<Pair<K3, V3>> reduceOutputs = null;
-    boolean succeeded;
-
-    try {
-      reduceOutputs = run();
-      validate(reduceOutputs);
-    } catch (IOException ioe) {
-      LOG.error("IOException: " + ioe.toString());
-      LOG.debug("Setting success to false based on IOException");
-      throw new RuntimeException();
-    }
-  }
-
-  /** Take the outputs from the Mapper, combine all values for the
-   *  same key, and sort them by key.
-   * @param mapOutputs An unordered list of (key, val) pairs from the mapper
-   * @return the sorted list of (key, list(val))'s to present to the reducer
-   */
-  List<Pair<K2, List<V2>>> shuffle(List<Pair<K2, V2>> mapOutputs) {
-    HashMap<K2, List<V2>> reducerInputs = new HashMap<K2, List<V2>>();
-
-    // step 1: condense all values with the same key into a list.
-    for (Pair<K2, V2> mapOutput : mapOutputs) {
-      List<V2> valuesForKey = reducerInputs.get(mapOutput.getFirst());
-
-      if (null == valuesForKey) {
-        // this is the first (k, v) pair for this key. Add it to the list.
-        valuesForKey = new ArrayList<V2>();
-        valuesForKey.add(mapOutput.getSecond());
-        reducerInputs.put(mapOutput.getFirst(), valuesForKey);
-      } else {
-        // add this value to the existing list for this key
-        valuesForKey.add(mapOutput.getSecond());
-      }
-    }
-
-    // build a list out of these (k, list(v)) pairs
-    List<Pair<K2, List<V2>>> finalInputs = new ArrayList<Pair<K2, List<V2>>>();
-    Set<Map.Entry<K2, List<V2>>> entries = reducerInputs.entrySet();
-    for (Map.Entry<K2, List<V2>> entry : entries) {
-      K2 key = entry.getKey();
-      List<V2> vals = entry.getValue();
-      finalInputs.add(new Pair<K2, List<V2>>(key, vals));
-    }
-
-    // and then sort the output list by key
-    if (finalInputs.size() > 0) {
-      Collections.sort(finalInputs,
-              finalInputs.get(0).new FirstElemComparator());
-    }
-
-    return finalInputs;
+  public String toString() {
+    return "MapReduceDriver (" + myMapper + ", " + myReducer + ")";
   }
 }

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriver.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriver.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriver.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriver.java Wed Aug 26 15:01:29 2009
@@ -40,22 +40,17 @@
  * (k, v*) -> (k, v)* case from the Reducer, representing a single unit test.
  * Multiple input (k, v*) sets should go in separate unit tests.
  */
-public class ReduceDriver<K1, V1, K2, V2> extends TestDriver<K1, V1, K2, V2> {
+public class ReduceDriver<K1, V1, K2, V2> extends ReduceDriverBase<K1, V1, K2, V2> {
 
   public static final Log LOG = LogFactory.getLog(ReduceDriver.class);
 
   private Reducer<K1, V1, K2, V2> myReducer;
 
-  private K1 inputKey;
-  private List<V1> inputValues;
-
   public ReduceDriver(final Reducer<K1, V1, K2, V2> r) {
     myReducer = r;
-    inputValues = new ArrayList<V1>();
   }
 
   public ReduceDriver() {
-    inputValues = new ArrayList<V1>();
   }
 
   /**
@@ -85,14 +80,6 @@
   }
 
   /**
-   * Sets the input key to send to the Reducer
-   *
-   */
-  public void setInputKey(K1 key) {
-    inputKey = key;
-  }
-
-  /**
    * Identical to setInputKey() but with fluent programming style
    *
    * @return this
@@ -103,15 +90,6 @@
   }
 
   /**
-   * adds an input value to send to the reducer
-   *
-   * @param val
-   */
-  public void addInputValue(V1 val) {
-    inputValues.add(val);
-  }
-
-  /**
    * Identical to addInputValue() but with fluent programming style
    *
    * @param val
@@ -123,25 +101,6 @@
   }
 
   /**
-   * Sets the input values to send to the reducer; overwrites existing ones
-   *
-   * @param values
-   */
-  public void setInputValues(List<V1> values) {
-    inputValues.clear();
-    inputValues.addAll(values);
-  }
-
-  /**
-   * Adds a set of input values to send to the reducer
-   *
-   * @param values
-   */
-  public void addInputValues(List<V1> values) {
-    inputValues.addAll(values);
-  }
-
-  /**
    * Identical to addInputValues() but with fluent programming style
    *
    * @param values
@@ -153,16 +112,6 @@
   }
 
   /**
-   * Sets the input to send to the reducer
-   *
-   * @param values
-   */
-  public void setInput(K1 key, List<V1> values) {
-    setInputKey(key);
-    setInputValues(values);
-  }
-
-  /**
    * Identical to setInput() but returns self for fluent programming style
    *
    * @return this
@@ -173,20 +122,6 @@
   }
 
   /**
-   * Adds an output (k, v) pair we expect from the Reducer
-   *
-   * @param outputRecord
-   *          The (k, v) pair to add
-   */
-  public void addOutput(Pair<K2, V2> outputRecord) {
-    if (null != outputRecord) {
-      expectedOutputs.add(outputRecord);
-    } else {
-      throw new IllegalArgumentException("Tried to add null outputRecord");
-    }
-  }
-
-  /**
    * Works like addOutput(), but returns self for fluent style
    *
    * @param outputRecord
@@ -198,16 +133,6 @@
   }
 
   /**
-   * Adds an output (k, v) pair we expect from the Reducer
-   *
-   * @param key The key part of a (k, v) pair to add
-   * @param val The val part of a (k, v) pair to add
-   */
-  public void addOutput(K2 key, V2 val) {
-    addOutput(new Pair<K2, V2>(key, val));
-  }
-
-  /**
    * Works like addOutput(), but returns self for fluent style
    *
    * @param key The key part of a (k, v) pair to add
@@ -220,31 +145,6 @@
   }
 
   /**
-   * Expects an input of the form "key \t val, val, val..." Forces the Reducer
-   * input types to Text.
-   *
-   * @param input
-   *          A string of the form "key \t val,val,val". Trims any whitespace.
-   */
-  public void setInputFromString(String input) {
-    if (null == input) {
-      throw new IllegalArgumentException("null input given to setInputFromString");
-    } else {
-      Pair<Text, Text> inputPair = parseTabbedPair(input);
-      if (null != inputPair) {
-        // I know this is not type-safe, but I don't know a better way to do
-        // this.
-        setInputKey((K1) inputPair.getFirst());
-        setInputValues((List<V1>) parseCommaDelimitedList(inputPair.getSecond()
-                .toString()));
-      } else {
-        throw new IllegalArgumentException(
-            "Could not parse input pair in setInputFromString");
-      }
-    }
-  }
-
-  /**
    * Identical to setInput, but with a fluent programming style
    *
    * @param input
@@ -257,28 +157,6 @@
   }
 
   /**
-   * Expects an input of the form "key \t val" Forces the Reducer output types
-   * to Text.
-   *
-   * @param output
-   *          A string of the form "key \t val". Trims any whitespace.
-   */
-  public void addOutputFromString(String output) {
-    if (null == output) {
-      throw new IllegalArgumentException("null input given to setOutput");
-    } else {
-      Pair<Text, Text> outputPair = parseTabbedPair(output);
-      if (null != outputPair) {
-        // I know this is not type-safe, but I don't know a better way to do
-        // this.
-        addOutput((Pair<K2, V2>) outputPair);
-      } else {
-        throw new IllegalArgumentException("Could not parse output pair in setOutput");
-      }
-    }
-  }
-
-  /**
    * Identical to addOutput, but with a fluent programming style
    *
    * @param output
@@ -292,7 +170,6 @@
 
   @Override
   public List<Pair<K2, V2>> run() throws IOException {
-
     MockOutputCollector<K2, V2> outputCollector =
       new MockOutputCollector<K2, V2>();
     MockReporter reporter = new MockReporter(MockReporter.ReporterType.Reducer);
@@ -305,39 +182,8 @@
   }
 
   @Override
-  public void runTest() throws RuntimeException {
-
-    String inputKeyStr = "(null)";
-
-    if (null != inputKey) {
-      inputKeyStr = inputKey.toString();
-    }
-
-    StringBuilder sb = new StringBuilder();
-    formatValueList(inputValues, sb);
-
-    LOG.debug("Reducing input (" + inputKeyStr + ", " + sb.toString() + ")");
-
-    List<Pair<K2, V2>> outputs = null;
-    try {
-      outputs = run();
-      validate(outputs);
-    } catch (IOException ioe) {
-      LOG.error("IOException in reducer: " + ioe.toString());
-      LOG.debug("Setting success to false based on IOException");
-      throw new RuntimeException();
-    }
-  }
-
-  @Override
   public String toString() {
-    String reducerStr = "null";
-
-    if (null != myReducer) {
-      reducerStr = myReducer.toString();
-    }
-
-    return "ReduceDriver (" + reducerStr + ")";
+    return "ReduceDriver (" + myReducer + ")";
   }
 }
 

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/TestDriver.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/TestDriver.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/TestDriver.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/TestDriver.java Wed Aug 26 15:01:29 2009
@@ -70,7 +70,7 @@
    * Split "key \t val" into Pair(Text(key), Text(val))
    * @param tabSeparatedPair
    */
-  static Pair<Text, Text> parseTabbedPair(String tabSeparatedPair) {
+  public static Pair<Text, Text> parseTabbedPair(String tabSeparatedPair) {
 
     String key, val;
 

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/AllTests.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/AllTests.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/AllTests.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/AllTests.java Wed Aug 26 15:01:29 2009
@@ -36,6 +36,7 @@
 
     suite.addTestSuite(TestMapDriver.class);
     suite.addTestSuite(TestMapReduceDriver.class);
+    suite.addTestSuite(TestPipelineMapReduceDriver.class);
     suite.addTestSuite(TestMockReporter.class);
     suite.addTestSuite(TestMockOutputCollector.class);
     suite.addTestSuite(TestReduceDriver.class);
@@ -43,6 +44,7 @@
     suite.addTestSuite(TestExample.class);
 
     suite.addTest(org.apache.hadoop.mrunit.types.AllTests.suite());
+    suite.addTest(org.apache.hadoop.mrunit.mapreduce.AllTests.suite());
     return suite;
   }
 

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/src/contrib/sqoop:713112
 /hadoop/core/trunk/src/contrib/sqoop:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/sqoop:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/sqoop:804974-807678

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/build.xml?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/build.xml (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/build.xml Wed Aug 26 15:01:29 2009
@@ -25,6 +25,7 @@
 
   <import file="../build-contrib.xml"/>
   <property environment="env"/>
+  <property name="sqoop.thirdparty.lib.dir" value="" />
 
   <!-- ================================================================== -->
   <!-- Run unit tests                                                     -->
@@ -76,6 +77,11 @@
       -->
       <sysproperty key="sqoop.src.dir" value="${build.test}/data"/>
 
+      <!-- Override standalone Hadoop's working dirs to allow parallel
+           execution of multiple Hudson builders
+      -->
+      <sysproperty key="hadoop.tmp.dir" value="${build.test}/hadoop"/>
+
       <sysproperty key="fs.default.name" value="${fs.default.name}"/>
       <sysproperty key="hadoop.test.localoutputfile" value="${hadoop.test.localoutputfile}"/>
       <sysproperty key="hadoop.log.dir" value="${hadoop.log.dir}"/>
@@ -91,6 +97,8 @@
         <path refid="test.classpath"/>
         <path refid="contrib-classpath"/>
         <pathelement path="${env.JAVA_HOME}/lib/tools.jar" />
+        <fileset dir="${sqoop.thirdparty.lib.dir}"
+            includes="*.jar" />
       </classpath>
       <formatter type="${test.junit.output.format}" />
       <batchtest todir="${build.test}" unless="testcase">

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/AllTests.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/AllTests.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/AllTests.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/AllTests.java Wed Aug 26 15:01:29 2009
@@ -21,9 +21,6 @@
 import org.apache.hadoop.sqoop.hive.TestHiveImport;
 import org.apache.hadoop.sqoop.lib.TestFieldFormatter;
 import org.apache.hadoop.sqoop.lib.TestRecordParser;
-import org.apache.hadoop.sqoop.manager.LocalMySQLTest;
-import org.apache.hadoop.sqoop.manager.MySQLAuthTest;
-import org.apache.hadoop.sqoop.manager.OracleManagerTest;
 import org.apache.hadoop.sqoop.manager.TestHsqldbManager;
 import org.apache.hadoop.sqoop.manager.TestSqlManager;
 import org.apache.hadoop.sqoop.orm.TestClassWriter;
@@ -52,14 +49,12 @@
     suite.addTestSuite(TestMultiCols.class);
     suite.addTestSuite(TestOrderBy.class);
     suite.addTestSuite(TestWhere.class);
-    suite.addTestSuite(LocalMySQLTest.class);
-    suite.addTestSuite(MySQLAuthTest.class);
     suite.addTestSuite(TestHiveImport.class);
     suite.addTestSuite(TestRecordParser.class);
     suite.addTestSuite(TestFieldFormatter.class);
     suite.addTestSuite(TestImportOptions.class);
     suite.addTestSuite(TestParseMethods.class);
-    suite.addTestSuite(OracleManagerTest.class);
+    suite.addTest(ThirdPartyTests.suite());
 
     return suite;
   }

Propchange: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 15:01:29 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112
 /hadoop/core/trunk/src/contrib/streaming:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/streaming:804974-805826
+/hadoop/mapreduce/trunk/src/contrib/streaming:804974-807678

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/ivy.xml?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/ivy.xml (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/ivy.xml Wed Aug 26 15:01:29 2009
@@ -24,10 +24,6 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.mahout.commons"
-      name="commons-cli"
-      rev="${commons-cli2.version}"
-      conf="common->default"/>
     <dependency org="commons-cli"
       name="commons-cli"
       rev="${commons-cli.version}"

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Wed Aug 26 15:01:29 2009
@@ -32,21 +32,16 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.apache.commons.cli2.Argument;
-import org.apache.commons.cli2.CommandLine;
-import org.apache.commons.cli2.Group;
-import org.apache.commons.cli2.Option;
-import org.apache.commons.cli2.OptionException;
-import org.apache.commons.cli2.WriteableCommandLine;
-import org.apache.commons.cli2.builder.ArgumentBuilder;
-import org.apache.commons.cli2.builder.DefaultOptionBuilder;
-import org.apache.commons.cli2.builder.GroupBuilder;
-import org.apache.commons.cli2.commandline.Parser;
-import org.apache.commons.cli2.option.PropertyOption;
-import org.apache.commons.cli2.resource.ResourceConstants;
-import org.apache.commons.cli2.util.HelpFormatter;
-import org.apache.commons.cli2.validation.InvalidArgumentException;
-import org.apache.commons.cli2.validation.Validator;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.OptionGroup;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.Parser;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -86,18 +81,8 @@
   final static String REDUCE_NONE = "NONE";
     
   /** -----------Streaming CLI Implementation  **/
-  private DefaultOptionBuilder builder = 
-    new DefaultOptionBuilder("-","-", false);
-  private ArgumentBuilder argBuilder = new ArgumentBuilder(); 
-  private Parser parser = new Parser(); 
-  private Group allOptions; 
-  HelpFormatter helpFormatter = new HelpFormatter("  ", "  ", "  ", 900);
-  // need these two at class level to extract values later from 
-  // commons-cli command line
-  private MultiPropertyOption jobconf = new MultiPropertyOption(
-                                                                "-jobconf", "(n=v) Optional. Add or override a JobConf property.", 'D'); 
-  private MultiPropertyOption cmdenv = new MultiPropertyOption(
-                                                               "-cmdenv", "(n=v) Pass env.var to streaming commands.", 'E');  
+  private CommandLineParser parser = new BasicParser(); 
+  private Options allOptions;
   /**@deprecated use StreamJob() with ToolRunner or set the 
    * Configuration using {@link #setConf(Configuration)} and 
    * run with {@link #run(String[])}.  
@@ -255,74 +240,83 @@
   void parseArgv(){
     CommandLine cmdLine = null; 
     try{
-      cmdLine = parser.parse(argv_);
+      cmdLine = parser.parse(allOptions, argv_);
     }catch(Exception oe){
       LOG.error(oe.getMessage());
       exitUsage(argv_.length > 0 && "-info".equals(argv_[0]));
     }
     
     if (cmdLine != null){
-      verbose_ =  cmdLine.hasOption("-verbose");
-      detailedUsage_ = cmdLine.hasOption("-info");
-      debug_ = cmdLine.hasOption("-debug")? debug_ + 1 : debug_;
+      verbose_ =  cmdLine.hasOption("verbose");
+      detailedUsage_ = cmdLine.hasOption("info");
+      debug_ = cmdLine.hasOption("debug")? debug_ + 1 : debug_;
       
-      inputSpecs_.addAll(cmdLine.getValues("-input"));
-      output_ = (String) cmdLine.getValue("-output"); 
+      String[] values = cmdLine.getOptionValues("input");
+      if (values != null && values.length > 0) {
+        for (String input : values) {
+          inputSpecs_.add(input);
+        }
+      }
+      output_ = (String) cmdLine.getOptionValue("output"); 
       
-      mapCmd_ = (String)cmdLine.getValue("-mapper"); 
-      comCmd_ = (String)cmdLine.getValue("-combiner"); 
-      redCmd_ = (String)cmdLine.getValue("-reducer"); 
+      mapCmd_ = (String)cmdLine.getOptionValue("mapper"); 
+      comCmd_ = (String)cmdLine.getOptionValue("combiner"); 
+      redCmd_ = (String)cmdLine.getOptionValue("reducer"); 
       
-      lazyOutput_ = cmdLine.hasOption("-lazyOutput");
+      lazyOutput_ = cmdLine.hasOption("lazyOutput");
       
-      if(!cmdLine.getValues("-file").isEmpty()) {
-        packageFiles_.addAll(cmdLine.getValues("-file"));
+      values = cmdLine.getOptionValues("file");
+      if (values != null && values.length > 0) {
+        for (String file : values) {
+          packageFiles_.add(file);
+        }
+        validate(packageFiles_);
       }
          
-      String fsName = (String)cmdLine.getValue("-dfs");
+      String fsName = (String)cmdLine.getOptionValue("dfs");
       if (null != fsName){
         LOG.warn("-dfs option is deprecated, please use -fs instead.");
         config_.set("fs.default.name", fsName);
       }
       
-      additionalConfSpec_ = (String)cmdLine.getValue("-additionalconfspec"); 
-      inputFormatSpec_ = (String)cmdLine.getValue("-inputformat"); 
-      outputFormatSpec_ = (String)cmdLine.getValue("-outputformat");
-      numReduceTasksSpec_ = (String)cmdLine.getValue("-numReduceTasks"); 
-      partitionerSpec_ = (String)cmdLine.getValue("-partitioner");
-      inReaderSpec_ = (String)cmdLine.getValue("-inputreader"); 
-      mapDebugSpec_ = (String)cmdLine.getValue("-mapdebug");    
-      reduceDebugSpec_ = (String)cmdLine.getValue("-reducedebug");
-      ioSpec_ = (String)cmdLine.getValue("-io");
+      additionalConfSpec_ = (String)cmdLine.getOptionValue("additionalconfspec"); 
+      inputFormatSpec_ = (String)cmdLine.getOptionValue("inputformat"); 
+      outputFormatSpec_ = (String)cmdLine.getOptionValue("outputformat");
+      numReduceTasksSpec_ = (String)cmdLine.getOptionValue("numReduceTasks"); 
+      partitionerSpec_ = (String)cmdLine.getOptionValue("partitioner");
+      inReaderSpec_ = (String)cmdLine.getOptionValue("inputreader"); 
+      mapDebugSpec_ = (String)cmdLine.getOptionValue("mapdebug");    
+      reduceDebugSpec_ = (String)cmdLine.getOptionValue("reducedebug");
+      ioSpec_ = (String)cmdLine.getOptionValue("io");
       
-      List<String> car = cmdLine.getValues("-cacheArchive"); 
-      if (null != car && !car.isEmpty()){
+      String[] car = cmdLine.getOptionValues("cacheArchive"); 
+      if (null != car && car.length > 0){
         LOG.warn("-cacheArchive option is deprecated, please use -archives instead.");
         for(String s : car){
           cacheArchives = (cacheArchives == null)?s :cacheArchives + "," + s;  
         }
       }
 
-      List<String> caf = cmdLine.getValues("-cacheFile"); 
-      if (null != caf && !caf.isEmpty()){
+      String[] caf = cmdLine.getOptionValues("cacheFile"); 
+      if (null != caf && caf.length > 0){
         LOG.warn("-cacheFile option is deprecated, please use -files instead.");
         for(String s : caf){
           cacheFiles = (cacheFiles == null)?s :cacheFiles + "," + s;  
         }
       }
       
-      List<String> jobConfArgs = (List<String>)cmdLine.getValue(jobconf); 
-      List<String> envArgs = (List<String>)cmdLine.getValue(cmdenv); 
-      
-      if (null != jobConfArgs && !jobConfArgs.isEmpty()){
+      String[] jobconf = cmdLine.getOptionValues("jobconf"); 
+      if (null != jobconf && jobconf.length > 0){
         LOG.warn("-jobconf option is deprecated, please use -D instead.");
-        for(String s : jobConfArgs){
-          String []parts = s.split("=", 2); 
+        for(String s : jobconf){
+          String[] parts = s.split("=", 2);
           config_.set(parts[0], parts[1]);
         }
       }
-      if (null != envArgs){
-        for(String s : envArgs){
+      
+      String[] cmd = cmdLine.getOptionValues("cmdenv"); 
+      if (null != cmd && cmd.length > 0){
+        for(String s : cmd) {
           if (addTaskEnvironment_.length() > 0) {
             addTaskEnvironment_ += " ";
           }
@@ -342,83 +336,31 @@
   
   private Option createOption(String name, String desc, 
                               String argName, int max, boolean required){
-    Argument argument = argBuilder.
-      withName(argName).
-      withMinimum(1).
-      withMaximum(max).
-      create();
-    return builder.
-      withLongName(name).
-      withArgument(argument).
-      withDescription(desc).
-      withRequired(required).
-      create();
+    return OptionBuilder
+           .withArgName(argName)
+           .hasArgs(max)
+           .withDescription(desc)
+           .isRequired(required)
+           .create(name);
   }
   
-  private Option createOption(String name, String desc, 
-                              String argName, int max, boolean required, Validator validator){
-    
-    Argument argument = argBuilder.
-      withName(argName).
-      withMinimum(1).
-      withMaximum(max).
-      withValidator(validator).
-      create();
-   
-    return builder.
-      withLongName(name).
-      withArgument(argument).
-      withDescription(desc).
-      withRequired(required).
-      create();
-  }  
-  
   private Option createBoolOption(String name, String desc){
-    return builder.withLongName(name).withDescription(desc).create();
+    return OptionBuilder.withDescription(desc).create(name);
+  }
+  
+  private static void validate(final List<String> values) 
+  throws IllegalArgumentException {
+    for (String file : values) {
+      File f = new File(file);  
+      if (!f.canRead()) {
+        throw new IllegalArgumentException("File : " + f.getAbsolutePath() 
+                                           + " is not readable."); 
+      }
+    }
   }
   
   private void setupOptions(){
 
-    final Validator fileValidator = new Validator(){
-        public void validate(final List values) throws InvalidArgumentException {
-          // Note : This code doesnt belong here, it should be changed to 
-          // an can exec check in java 6
-          for (String file : (List<String>)values) {
-            File f = new File(file);  
-            if (!f.exists()) {
-              throw new InvalidArgumentException("Argument : " + 
-                                                 f.getAbsolutePath() + " doesn't exist."); 
-            }
-            if (!f.isFile()) {
-              throw new InvalidArgumentException("Argument : " + 
-                                                 f.getAbsolutePath() + " is not a file."); 
-            }
-            if (!f.canRead()) {
-              throw new InvalidArgumentException("Argument : " + 
-                                                 f.getAbsolutePath() + " is not accessible"); 
-            }
-          }
-        }      
-      }; 
-
-    // Note: not extending CLI2's FileValidator, that overwrites 
-    // the String arg into File and causes ClassCastException 
-    // in inheritance tree. 
-    final Validator execValidator = new Validator(){
-        public void validate(final List values) throws InvalidArgumentException {
-          // Note : This code doesnt belong here, it should be changed to 
-          // an can exec check in java 6
-          for (String file : (List<String>)values) {
-            try{
-              Runtime.getRuntime().exec("chmod 0777 " + (new File(file)).getAbsolutePath());
-            }catch(IOException ioe){
-              // ignore 
-            }
-          }
-          fileValidator.validate(values);
-        }      
-      }; 
-
     Option input   = createOption("input", 
                                   "DFS input file(s) for the Map step", 
                                   "path", 
@@ -436,8 +378,8 @@
     Option reducer = createOption("reducer", 
                                   "The streaming command to run", "cmd", 1, false); 
     Option file = createOption("file", 
-                               "File/dir to be shipped in the Job jar file", 
-                               "file", Integer.MAX_VALUE, false, execValidator); 
+                               "File to be shipped in the Job jar file", 
+                               "file", Integer.MAX_VALUE, false); 
     Option dfs = createOption("dfs", 
                               "Optional. Override DFS configuration", "<h:p>|local", 1, false); 
     Option jt = createOption("jt", 
@@ -458,6 +400,14 @@
                                    "Optional.", "spec", 1, false);
     Option reduceDebug = createOption("reducedebug",
                                       "Optional", "spec",1, false);
+    Option jobconf = 
+      createOption("jobconf", 
+                   "(n=v) Optional. Add or override a JobConf property.", 
+                   "spec", 1, false);
+    
+    Option cmdenv = 
+      createOption("cmdenv", "(n=v) Pass env.var to streaming commands.", 
+                   "spec", 1, false);
     Option cacheFile = createOption("cacheFile", 
                                     "File name URI", "fileNameURI", Integer.MAX_VALUE, false);
     Option cacheArchive = createOption("cacheArchive", 
@@ -474,37 +424,34 @@
     Option inputtagged = createBoolOption("inputtagged", "inputtagged"); 
     Option lazyOutput = createBoolOption("lazyOutput", "create outputs lazily");
     
-    allOptions = new GroupBuilder().
-      withOption(input).
-      withOption(output).
-      withOption(mapper).
-      withOption(combiner).
-      withOption(reducer).
-      withOption(file).
-      withOption(dfs).
-      withOption(jt).
-      withOption(additionalconfspec).
-      withOption(inputformat).
-      withOption(outputformat).
-      withOption(partitioner).
-      withOption(numReduceTasks).
-      withOption(inputreader).
-      withOption(mapDebug).
-      withOption(reduceDebug).
-      withOption(jobconf).
-      withOption(cmdenv).
-      withOption(cacheFile).
-      withOption(cacheArchive).
-      withOption(io).
-      withOption(verbose).
-      withOption(info).
-      withOption(debug).
-      withOption(inputtagged).
-      withOption(help).
-      withOption(lazyOutput).
-      create();
-    parser.setGroup(allOptions);
-    
+    allOptions = new Options().
+      addOption(input).
+      addOption(output).
+      addOption(mapper).
+      addOption(combiner).
+      addOption(reducer).
+      addOption(file).
+      addOption(dfs).
+      addOption(jt).
+      addOption(additionalconfspec).
+      addOption(inputformat).
+      addOption(outputformat).
+      addOption(partitioner).
+      addOption(numReduceTasks).
+      addOption(inputreader).
+      addOption(mapDebug).
+      addOption(reduceDebug).
+      addOption(jobconf).
+      addOption(cmdenv).
+      addOption(cacheFile).
+      addOption(cacheArchive).
+      addOption(io).
+      addOption(verbose).
+      addOption(info).
+      addOption(debug).
+      addOption(inputtagged).
+      addOption(help).
+      addOption(lazyOutput);
   }
 
   public void exitUsage(boolean detailed) {
@@ -551,7 +498,7 @@
     System.out.println("Map output format, reduce input/output format:");
     System.out.println("  Format defined by what the mapper command outputs. Line-oriented");
     System.out.println();
-    System.out.println("The files or directories named in the -file argument[s] end up in the");
+    System.out.println("The files named in the -file argument[s] end up in the");
     System.out.println("  working directory when the mapper and reducer are run.");
     System.out.println("  The location of this working directory is unspecified.");
     System.out.println();
@@ -1030,58 +977,6 @@
     }
     return 0;
   }
-  /** Support -jobconf x=y x1=y1 type options **/
-  static class MultiPropertyOption extends PropertyOption{
-    private String optionString; 
-    MultiPropertyOption(){
-      super(); 
-    }
-    
-    MultiPropertyOption(final String optionString,
-                        final String description,
-                        final int id){
-      super(optionString, description, id); 
-      this.optionString = optionString;
-    }
-
-    @Override
-    public boolean canProcess(final WriteableCommandLine commandLine,
-                              final String argument) {
-      boolean ret = (argument != null) && argument.startsWith(optionString);
-        
-      return ret;
-    }    
-    @Override
-    public void process(final WriteableCommandLine commandLine,
-                        final ListIterator arguments) throws OptionException {
-      final String arg = (String) arguments.next();
-
-      if (!canProcess(commandLine, arg)) {
-        throw new OptionException(this, 
-                                  ResourceConstants.UNEXPECTED_TOKEN, arg);
-      }
-      
-      ArrayList properties = new ArrayList(); 
-      String next = ""; 
-      while(arguments.hasNext()){
-        next = (String) arguments.next();
-        if (!next.startsWith("-")){
-          properties.add(next);
-        }else{
-          arguments.previous();
-          break; 
-        }
-      } 
-
-      // add to any existing values (support specifying args multiple times)
-      List<String> oldVal = (List<String>)commandLine.getValue(this); 
-      if (oldVal == null){
-        commandLine.addValue(this, properties);
-      }else{
-        oldVal.addAll(properties); 
-      }
-    }
-  }
 
   protected String[] argv_;
   protected boolean verbose_;

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java Wed Aug 26 15:01:29 2009
@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Properties;
 import java.util.StringTokenizer;
 
 import org.apache.commons.logging.Log;
@@ -65,7 +66,13 @@
     utilTest.checkUserDir();
     utilTest.redirectIfAntJunit();
   }
-  
+
+  protected void setUp() throws Exception {
+    Properties props = new Properties();
+    props.setProperty("mapred.job.tracker.retire.jobs", "false");
+    startCluster(true, props);
+  }
+
   private void createInput() throws Exception {
     OutputStream os = getFileSystem().create(new Path(getInputDir(), 
         "text.txt"));

Modified: hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java?rev=808036&r1=808035&r2=808036&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java (original)
+++ hadoop/mapreduce/branches/MAPREDUCE-233/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java Wed Aug 26 15:01:29 2009
@@ -26,6 +26,7 @@
 
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.MiniMRCluster;
 import org.apache.hadoop.mapred.TaskReport;
 
@@ -78,8 +79,10 @@
   public void testStreamingStatus() throws Exception {
     MiniMRCluster mr = null;
     FileSystem fs = null;
+    JobConf conf = new JobConf();
+    conf.setBoolean("mapred.job.tracker.retire.jobs", false);
     try {
-      mr = new MiniMRCluster(1, "file:///", 3);
+      mr = new MiniMRCluster(1, "file:///", 3, null , null, conf);
 
       Path inFile = new Path(INPUT_FILE);
       fs = inFile.getFileSystem(mr.createJobConf());



Mime
View raw message