Updated Branches: refs/heads/TEZ-1 fe170fb84 -> 9f7a21d36
TEZ-66. Fix build to allow tez to be built against a specified version of hadoop. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/9f7a21d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/9f7a21d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/9f7a21d3 Branch: refs/heads/TEZ-1 Commit: 9f7a21d36eec0743187352de16d8ade8440c9564 Parents: fe170fb Author: Hitesh Shah <[email protected]> Authored: Thu May 2 15:23:14 2013 -0700 Committer: Hitesh Shah <[email protected]> Committed: Thu May 2 15:23:14 2013 -0700 ---------------------------------------------------------------------- pom.xml | 167 +++++++++++---- tez-engine/pom.xml | 4 - .../engine/common/sort/impl/PipelinedSorter.java | 8 +- .../common/sort/impl/dflt/DefaultSorter.java | 8 +- .../sort/impl/dflt/InMemoryShuffleSorter.java | 8 +- .../tez/engine/lib/input/LocalMergedInput.java | 8 +- .../tez/engine/lib/input/ShuffledMergedInput.java | 8 +- .../engine/lib/output/InMemorySortedOutput.java | 8 +- .../engine/lib/output/LocalOnFileSorterOutput.java | 8 +- .../tez/engine/lib/output/OnFileSortedOutput.java | 8 +- tez-mapreduce/pom.xml | 8 - .../apache/tez/mapreduce/input/SimpleInput.java | 8 +- .../apache/tez/mapreduce/output/SimpleOutput.java | 10 +- .../tez/mapreduce/processor/map/MapProcessor.java | 8 +- .../processor/reduce/ReduceProcessor.java | 7 +- 15 files changed, 143 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e92c7a3..586eb18 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,49 @@ <url>http://www.apache.org</url> </organization> + <properties> + <clover.license>${user.home}/clover.license</clover.license> + <hadoop.version>3.0.0-SNAPSHOT</hadoop.version> + <jetty.version>7.6.10.v20130312</jetty.version> + <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId> + <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName> + <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl> + <distMgmtStagingId>apache.staging.https</distMgmtStagingId> + <distMgmtStagingName>Apache Release Distribution Repository</distMgmtStagingName> + <distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl> + <failIfNoTests>false</failIfNoTests> + </properties> + + <distributionManagement> + <repository> + <id>${distMgmtStagingId}</id> + <name>${distMgmtStagingName}</name> + <url>${distMgmtStagingUrl}</url> + </repository> + <snapshotRepository> + <id>${distMgmtSnapshotsId}</id> + <name>${distMgmtSnapshotsName}</name> + <url>${distMgmtSnapshotsUrl}</url> + </snapshotRepository> + </distributionManagement> + + <repositories> + <repository> + <id>${distMgmtSnapshotsId}</id> + <name>${distMgmtSnapshotsName}</name> + <url>${distMgmtSnapshotsUrl}</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>maven2-repository.atlassian</id> + <name>Atlassian Maven Repository</name> + <url>https://maven.atlassian.com/repository/public</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies> <dependency> @@ -74,88 +117,78 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-common</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-common</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-nodemanager</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-tests</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> <type>test-jar</type> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assistedinject</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>3.0</version> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-common</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-shuffle</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> <scope>provided</scope> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> <scope>test</scope> <type>test-jar</type> - <version>3.0.0-SNAPSHOT</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -165,27 +198,17 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>7.6.7.v20120910</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>7.6.7.v20120910</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>7.6.7.v20120910</version> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-servlet</artifactId> - <version>3.0</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>com.sun.jersey.contribs</groupId> @@ -245,6 +268,11 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.4</version> </plugin> @@ -258,6 +286,21 @@ <artifactId>avro-maven-plugin</artifactId> <version>1.5.3</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>always</forkMode> + <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds> + <argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine> + <environmentVariables> + <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX> + </environmentVariables> + <systemPropertyVariables> + <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack> + </systemPropertyVariables> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -274,5 +317,55 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>clover</id> + <activation> + <activeByDefault>false</activeByDefault> + <property> + <name>clover</name> + </property> + </activation> + <properties> + <maven.clover.licenseLocation>${clover.license}</maven.clover.licenseLocation> + <clover.version>3.1.11</clover.version> + </properties> + <build> + <plugins> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <version>${clover.version}</version> + <configuration> + <includesAllSourceRoots>true</includesAllSourceRoots> + <includesTestSourceRoots>true</includesTestSourceRoots> + <targetPercentage>50%</targetPercentage> + <generateHtml>true</generateHtml> + <generateXml>true</generateXml> + <excludes> + <exclude>**/generated/**</exclude> + </excludes> + </configuration> + <executions> + <execution> + <id>clover-setup</id> + <phase>process-sources</phase> + <goals> + <goal>setup</goal> + </goals> + </execution> + <execution> + <id>clover</id> + <phase>test</phase> + <goals> + <goal>clover</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/pom.xml ---------------------------------------------------------------------- diff --git a/tez-engine/pom.xml b/tez-engine/pom.xml index a3d4d82..ba5b6e6 100644 --- a/tez-engine/pom.xml +++ b/tez-engine/pom.xml @@ -38,10 +38,6 @@ <artifactId>hadoop-yarn-common</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assistedinject</artifactId> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-nodemanager</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java index 080c2a2..6ce39da 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java @@ -53,9 +53,6 @@ import org.apache.tez.engine.common.sort.impl.TezMerger.Segment; import org.apache.tez.engine.records.OutputContext; import org.apache.tez.engine.records.TezTaskAttemptID; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - @SuppressWarnings({"unchecked", "rawtypes"}) public class PipelinedSorter extends ExternalSorter implements SortingOutput { @@ -96,10 +93,7 @@ public class PipelinedSorter extends ExternalSorter implements SortingOutput { private int indexCacheMemoryLimit; - @Inject - public PipelinedSorter( - @Assisted TezEngineTaskContext task - ) throws IOException { + public PipelinedSorter(TezEngineTaskContext task) throws IOException { super(task); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java index 7354dc2..75c7de3 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java @@ -55,9 +55,6 @@ import org.apache.tez.engine.common.sort.impl.TezMerger.Segment; import org.apache.tez.engine.records.OutputContext; import org.apache.tez.engine.records.TezTaskAttemptID; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - @SuppressWarnings({"unchecked", "rawtypes"}) public class DefaultSorter extends ExternalSorter implements IndexedSortable { @@ -115,10 +112,7 @@ public class DefaultSorter extends ExternalSorter implements IndexedSortable { private int totalIndexCacheMemory; private int indexCacheMemoryLimit; - @Inject - public DefaultSorter( - @Assisted TezTaskContext task - ) throws IOException { + public DefaultSorter(TezTaskContext task) throws IOException { // Does this assisted inject work ? super((TezEngineTaskContext)task); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/InMemoryShuffleSorter.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/InMemoryShuffleSorter.java b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/InMemoryShuffleSorter.java index e0eea19..6af6dab 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/InMemoryShuffleSorter.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/InMemoryShuffleSorter.java @@ -36,9 +36,6 @@ import org.apache.tez.engine.common.shuffle.server.ShuffleHandler; import org.apache.tez.engine.common.sort.impl.IFile; import org.apache.tez.engine.records.OutputContext; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - public class InMemoryShuffleSorter extends DefaultSorter { private static final Log LOG = LogFactory.getLog(InMemoryShuffleSorter.class); @@ -55,10 +52,7 @@ public class InMemoryShuffleSorter extends DefaultSorter { byte[] kvbuffer; IntBuffer kvmeta; - @Inject - public InMemoryShuffleSorter( - @Assisted TezTaskContext task - ) throws IOException { + public InMemoryShuffleSorter(TezTaskContext task) throws IOException { super(task); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/src/main/java/org/apache/tez/engine/lib/input/LocalMergedInput.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/lib/input/LocalMergedInput.java b/tez-engine/src/main/java/org/apache/tez/engine/lib/input/LocalMergedInput.java index 3e03105..ce7dd90 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/lib/input/LocalMergedInput.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/lib/input/LocalMergedInput.java @@ -28,9 +28,6 @@ import org.apache.tez.engine.common.combine.CombineInput; import org.apache.tez.engine.common.localshuffle.LocalShuffle; import org.apache.tez.engine.common.sort.impl.TezRawKeyValueIterator; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - /** * {@link LocalMergedInput} in an {@link Input} which shuffles intermediate * sorted data, merges them and provides key/<values> to the consumer. @@ -42,10 +39,7 @@ public class LocalMergedInput extends ShuffledMergedInput { private Configuration conf; private CombineInput raw; - @Inject - public LocalMergedInput( - @Assisted TezEngineTaskContext task - ) { + public LocalMergedInput(TezEngineTaskContext task) { super(task); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/src/main/java/org/apache/tez/engine/lib/input/ShuffledMergedInput.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/lib/input/ShuffledMergedInput.java b/tez-engine/src/main/java/org/apache/tez/engine/lib/input/ShuffledMergedInput.java index 22ebf42..ddd1b70 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/lib/input/ShuffledMergedInput.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/lib/input/ShuffledMergedInput.java @@ -31,9 +31,6 @@ import org.apache.tez.engine.common.combine.CombineInput; import org.apache.tez.engine.common.shuffle.impl.Shuffle; import org.apache.tez.engine.common.sort.impl.TezRawKeyValueIterator; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - /** * {@link ShuffledMergedInput} in an {@link Input} which shuffles intermediate * sorted data, merges them and provides key/<values> to the consumer. @@ -49,10 +46,7 @@ public class ShuffledMergedInput implements Input { private Configuration conf; private CombineInput raw; - @Inject - public ShuffledMergedInput( - @Assisted TezEngineTaskContext task - ) { + public ShuffledMergedInput(TezEngineTaskContext task) { this.task = task; } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/src/main/java/org/apache/tez/engine/lib/output/InMemorySortedOutput.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/lib/output/InMemorySortedOutput.java b/tez-engine/src/main/java/org/apache/tez/engine/lib/output/InMemorySortedOutput.java index 95fc562..99486be 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/lib/output/InMemorySortedOutput.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/lib/output/InMemorySortedOutput.java @@ -28,9 +28,6 @@ import org.apache.tez.engine.common.sort.SortingOutput; import org.apache.tez.engine.common.sort.impl.dflt.InMemoryShuffleSorter; import org.apache.tez.engine.records.OutputContext; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - /** * {@link InMemorySortedOutput} is an {@link Output} which sorts key/value pairs * written to it and persists it to a file. @@ -39,10 +36,7 @@ public class InMemorySortedOutput implements SortingOutput { protected InMemoryShuffleSorter sorter; - @Inject - public InMemorySortedOutput( - @Assisted TezEngineTaskContext task - ) throws IOException { + public InMemorySortedOutput(TezEngineTaskContext task) throws IOException { sorter = new InMemoryShuffleSorter(task); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/src/main/java/org/apache/tez/engine/lib/output/LocalOnFileSorterOutput.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/lib/output/LocalOnFileSorterOutput.java b/tez-engine/src/main/java/org/apache/tez/engine/lib/output/LocalOnFileSorterOutput.java index d36c661..1d2360b 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/lib/output/LocalOnFileSorterOutput.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/lib/output/LocalOnFileSorterOutput.java @@ -27,17 +27,11 @@ import org.apache.hadoop.fs.Path; import org.apache.tez.common.TezEngineTaskContext; import org.apache.tez.engine.common.task.local.output.TezTaskOutput; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - public class LocalOnFileSorterOutput extends OnFileSortedOutput { private static final Log LOG = LogFactory.getLog(LocalOnFileSorterOutput.class); - @Inject - public LocalOnFileSorterOutput( - @Assisted TezEngineTaskContext task - ) throws IOException { + public LocalOnFileSorterOutput(TezEngineTaskContext task) throws IOException { super(task); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-engine/src/main/java/org/apache/tez/engine/lib/output/OnFileSortedOutput.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/lib/output/OnFileSortedOutput.java b/tez-engine/src/main/java/org/apache/tez/engine/lib/output/OnFileSortedOutput.java index fa644c5..79787b7 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/lib/output/OnFileSortedOutput.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/lib/output/OnFileSortedOutput.java @@ -29,9 +29,6 @@ import org.apache.tez.engine.common.sort.impl.ExternalSorter; import org.apache.tez.engine.common.sort.impl.dflt.DefaultSorter; import org.apache.tez.engine.records.OutputContext; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - /** * {@link OnFileSortedOutput} is an {@link Output} which sorts key/value pairs * written to it and persists it to a file. @@ -40,10 +37,7 @@ public class OnFileSortedOutput implements SortingOutput { protected ExternalSorter sorter; - @Inject - public OnFileSortedOutput( - @Assisted TezEngineTaskContext task - ) throws IOException { + public OnFileSortedOutput(TezEngineTaskContext task) throws IOException { sorter = new DefaultSorter(task); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/tez-mapreduce/pom.xml b/tez-mapreduce/pom.xml index 0147ee9..2a1ca15 100644 --- a/tez-mapreduce/pom.xml +++ b/tez-mapreduce/pom.xml @@ -26,10 +26,6 @@ <dependencies> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-engine</artifactId> </dependency> @@ -54,10 +50,6 @@ <artifactId>hadoop-mapreduce-client-common</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assistedinject</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/SimpleInput.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/SimpleInput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/SimpleInput.java index b5d5599..eb16212 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/SimpleInput.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/SimpleInput.java @@ -48,9 +48,6 @@ import org.apache.tez.engine.api.Master; import org.apache.tez.mapreduce.processor.MRTask; import org.apache.tez.mapreduce.processor.MRTaskReporter; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - /** * {@link SimpleInput} is an {@link Input} which provides key/values pairs * for the consumer. @@ -85,10 +82,7 @@ public class SimpleInput implements Input { private List<Statistics> fsStats; private MRTaskReporter reporter; - @Inject - public SimpleInput( - @Assisted TezEngineTaskContext task - ) + public SimpleInput(TezEngineTaskContext task) {} public void setTask(MRTask task) { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/SimpleOutput.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/SimpleOutput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/SimpleOutput.java index 0769b01..060e28c 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/SimpleOutput.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/SimpleOutput.java @@ -33,9 +33,6 @@ import org.apache.tez.engine.records.OutputContext; import org.apache.tez.mapreduce.processor.MRTask; import org.apache.tez.mapreduce.processor.MRTaskReporter; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - /** * {@link SimpleOutput} is an {@link Output} which persists key/value pairs * written to it. @@ -63,11 +60,8 @@ public class SimpleOutput implements Output { private List<Statistics> fsStats; private MRTaskReporter reporter; - @Inject - public SimpleOutput( - @Assisted TezEngineTaskContext task - ) { - } + public SimpleOutput(TezEngineTaskContext task) + {} public void setTask(MRTask task) { this.task = task; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java index ac643b6..a6ab986 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java @@ -52,9 +52,6 @@ import org.apache.tez.mapreduce.output.SimpleOutput; import org.apache.tez.mapreduce.processor.MRTask; import org.apache.tez.mapreduce.processor.MRTaskReporter; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; - @SuppressWarnings({ "unchecked", "rawtypes" }) public class MapProcessor extends MRTask implements Processor { @@ -62,10 +59,7 @@ public class MapProcessor extends MRTask implements Processor { private Progress mapPhase; - @Inject - public MapProcessor( - @Assisted TezEngineTaskContext context - ) throws IOException { + public MapProcessor(TezEngineTaskContext context) throws IOException { super(context); } http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/9f7a21d3/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java index 3423e01..b74f952 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java @@ -54,8 +54,6 @@ import org.apache.tez.mapreduce.processor.MRTask; import org.apache.tez.mapreduce.processor.MRTaskReporter; import com.google.common.base.Preconditions; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; @SuppressWarnings({ "unchecked", "rawtypes" }) public class ReduceProcessor @@ -71,10 +69,7 @@ implements Processor { private Counter reduceInputValueCounter; private int numMapTasks; - @Inject - public ReduceProcessor( - @Assisted TezEngineTaskContext context - ) { + public ReduceProcessor(TezEngineTaskContext context) { super(context); TezEngineTaskContext tezEngineContext = (TezEngineTaskContext) context; Preconditions.checkNotNull(tezEngineContext.getInputSpecList(),
