-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-18294][CORE] Implement commit protocol to support mapred package's committer
#15861
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ac7ca2a
commit protocol support mapred API
jiangxb1987 3d64595
refactor.
jiangxb1987 4dffc34
clean code.
jiangxb1987 6d68b4f
bugfix - should update JobConf on JobContext/TaskContext creation.
jiangxb1987 7134e55
create SparkHadoopWriterConfig directly in PairRDDFunctions.
jiangxb1987 bedcd10
rename SparkHadoopWriterConfig to HadoopWriteConfigUtil
jiangxb1987 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
160 changes: 0 additions & 160 deletions
160
core/src/main/scala/org/apache/spark/SparkHadoopWriter.scala
This file was deleted.
Oops, something went wrong.
36 changes: 36 additions & 0 deletions
36
core/src/main/scala/org/apache/spark/internal/io/HadoopMapRedCommitProtocol.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * 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.spark.internal.io | ||
|
|
||
| import org.apache.hadoop.mapred._ | ||
| import org.apache.hadoop.mapreduce.{TaskAttemptContext => NewTaskAttemptContext} | ||
|
|
||
| /** | ||
| * An [[FileCommitProtocol]] implementation backed by an underlying Hadoop OutputCommitter | ||
| * (from the old mapred API). | ||
| * | ||
| * Unlike Hadoop's OutputCommitter, this implementation is serializable. | ||
| */ | ||
| class HadoopMapRedCommitProtocol(jobId: String, path: String) | ||
| extends HadoopMapReduceCommitProtocol(jobId, path) { | ||
|
|
||
| override def setupCommitter(context: NewTaskAttemptContext): OutputCommitter = { | ||
| val config = context.getConfiguration.asInstanceOf[JobConf] | ||
| config.getOutputCommitter | ||
|
||
| } | ||
| } | ||
84 changes: 84 additions & 0 deletions
84
core/src/main/scala/org/apache/spark/internal/io/HadoopWriteConfigUtil.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * 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.spark.internal.io | ||
|
|
||
| import scala.reflect.ClassTag | ||
|
|
||
| import org.apache.hadoop.conf.Configuration | ||
| import org.apache.hadoop.mapred.JobConf | ||
| import org.apache.hadoop.mapreduce._ | ||
|
|
||
| import org.apache.spark.util.{SerializableConfiguration, SerializableJobConf, Utils} | ||
|
|
||
| /** | ||
| * Interface for create output format/committer/writer used during saving an RDD using a Hadoop | ||
| * OutputFormat (both from the old mapred API and the new mapreduce API) | ||
| * | ||
| * Notes: | ||
| * 1. Implementations should throw [[IllegalArgumentException]] when wrong hadoop API is | ||
| * referenced; | ||
| * 2. Implementations must be serializable, as the instance instantiated on the driver | ||
| * will be used for tasks on executors; | ||
| * 3. Implementations should have a constructor with exactly one argument: | ||
| * (conf: SerializableConfiguration) or (conf: SerializableJobConf). | ||
| */ | ||
| abstract class HadoopWriteConfigUtil[K, V: ClassTag] extends Serializable { | ||
|
|
||
| // -------------------------------------------------------------------------- | ||
| // Create JobContext/TaskAttemptContext | ||
| // -------------------------------------------------------------------------- | ||
|
|
||
| def createJobContext(jobTrackerId: String, jobId: Int): JobContext | ||
|
|
||
| def createTaskAttemptContext( | ||
| jobTrackerId: String, | ||
| jobId: Int, | ||
| splitId: Int, | ||
| taskAttemptId: Int): TaskAttemptContext | ||
|
|
||
| // -------------------------------------------------------------------------- | ||
| // Create committer | ||
| // -------------------------------------------------------------------------- | ||
|
|
||
| def createCommitter(jobId: Int): HadoopMapReduceCommitProtocol | ||
|
|
||
| // -------------------------------------------------------------------------- | ||
| // Create writer | ||
| // -------------------------------------------------------------------------- | ||
|
|
||
| def initWriter(taskContext: TaskAttemptContext, splitId: Int): Unit | ||
|
|
||
| def write(pair: (K, V)): Unit | ||
|
|
||
| def closeWriter(taskContext: TaskAttemptContext): Unit | ||
|
|
||
| // -------------------------------------------------------------------------- | ||
| // Create OutputFormat | ||
| // -------------------------------------------------------------------------- | ||
|
|
||
| def initOutputFormat(jobContext: JobContext): Unit | ||
|
|
||
| // -------------------------------------------------------------------------- | ||
| // Verify hadoop config | ||
| // -------------------------------------------------------------------------- | ||
|
|
||
| def assertConf(): Unit | ||
|
|
||
| def checkOutputSpecs(jobContext: JobContext): Unit | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since most of the classes in
mapredextend frommapreduce, we only have to overridesetupCommitterto make it support theOutputCommitterfrommapredAPI. But theSparkHadoopWriterrequires extensive refactoring.