diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-08-20 10:14:15 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-08-20 10:14:15 -0700 |
commit | aa2b89d98d6d195a38e36c1947d437ab7346e5c9 (patch) | |
tree | 9638d8825a43f9e8b69dcf91a653d76d6e319ec0 /core/src/hadoop2/scala/org/apache/hadoop/mapred/HadoopMapRedUtil.scala | |
parent | d61337f6403da454b9fb6cf090fe3ab61892a11b (diff) | |
parent | 6f6944c8079bffdd088ddb0a84fbf83356e294ea (diff) | |
download | spark-aa2b89d98d6d195a38e36c1947d437ab7346e5c9.tar.gz spark-aa2b89d98d6d195a38e36c1947d437ab7346e5c9.tar.bz2 spark-aa2b89d98d6d195a38e36c1947d437ab7346e5c9.zip |
Merge remote-tracking branch 'jey/hadoop-agnostic'
Conflicts:
core/src/main/scala/spark/PairRDDFunctions.scala
Diffstat (limited to 'core/src/hadoop2/scala/org/apache/hadoop/mapred/HadoopMapRedUtil.scala')
-rw-r--r-- | core/src/hadoop2/scala/org/apache/hadoop/mapred/HadoopMapRedUtil.scala | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/core/src/hadoop2/scala/org/apache/hadoop/mapred/HadoopMapRedUtil.scala b/core/src/hadoop2/scala/org/apache/hadoop/mapred/HadoopMapRedUtil.scala deleted file mode 100644 index 4b3d84670c..0000000000 --- a/core/src/hadoop2/scala/org/apache/hadoop/mapred/HadoopMapRedUtil.scala +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.mapred - -trait HadoopMapRedUtil { - def newJobContext(conf: JobConf, jobId: JobID): JobContext = new JobContextImpl(conf, jobId) - - def newTaskAttemptContext(conf: JobConf, attemptId: TaskAttemptID): TaskAttemptContext = new TaskAttemptContextImpl(conf, attemptId) - - def newTaskAttemptID(jtIdentifier: String, jobId: Int, isMap: Boolean, taskId: Int, attemptId: Int) = new TaskAttemptID(jtIdentifier, - jobId, isMap, taskId, attemptId) -} |