Skip to content

[SPARK-1198] Allow pipes tasks to run in different sub-directories #128

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.

Sign up for GitHub

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
tgravescs wants to merge 6 commits into from
Closed

[SPARK-1198] Allow pipes tasks to run in different sub-directories #128

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ab49ca
Add support for running pipe tasks is separate directories
tgravescs Mar 12, 2014
6b783bd
style fixes
tgravescs Mar 12, 2014
61be271
Fix file name filter
tgravescs Mar 12, 2014
da4b221
Merge branch 'master' of https://github.com/tgravescs/spark into SPAR…
tgravescs Apr 4, 2014
ba23fc0
Add support for symlink on windows, remove commons-io usage
tgravescs Apr 4, 2014
abc1289
remove extra tag in pom file
tgravescs Apr 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/tgravescs/spark into SPAR… 
…K1198
  • Loading branch information
@tgravescs
tgravescs committed Apr 4, 2014
commit da4b2213214cfca48f7fe048dffba0965810a2d4
3 changes: 0 additions & 3 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,6 @@
<artifactId>metrics-graphite</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
Copy link
Contributor

@mateiz mateiz Mar 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change related to the PR?

Copy link
Contributor Author

@tgravescs tgravescs Mar 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the diff is just a messy. I made commons-io available outside of the test scope since I use FileUtils.delete and moved it up a couple lines. derby didn't change.

Expand Down
22 changes: 22 additions & 0 deletions core/src/main/scala/org/apache/spark/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,4 +918,26 @@ private[spark] object Utils extends Logging {
}


/** Return the class name of the given object, removing all dollar signs */
def getFormattedClassName(obj: AnyRef) = {
obj.getClass.getSimpleName.replace("$", "")
}

/** Return an option that translates JNothing to None */
def jsonOption(json: JValue): Option[JValue] = {
json match {
case JNothing => None
case value: JValue => Some(value)
}
}

/** Return an empty JSON object */
def emptyJson = JObject(List[JField]())

/**
* Return a Hadoop FileSystem with the scheme encoded in the given path.
*/
def getHadoopFileSystem(path: URI): FileSystem = {
FileSystem.get(path, SparkHadoopUtil.get.newConfiguration())
}
}
3 changes: 1 addition & 2 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,7 @@ object SparkBuild extends Build {
"org.eclipse.jetty" % "jetty-plus" % "8.1.14.v20131031",
"org.eclipse.jetty" % "jetty-security" % "8.1.14.v20131031",
/** Workaround for SPARK-959. Dependency used by org.eclipse.jetty. Fixed in ivy 2.3.0. */
"org.eclipse.jetty.orbit" % "javax.servlet" % "2.5.0.v201103041518" artifacts Artifact("javax.servlet", "jar", "jar"),
"commons-io" % "commons-io" % "2.4",
"org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" artifacts Artifact("javax.servlet", "jar", "jar"),
"org.scalatest" %% "scalatest" % "1.9.1" % "test",
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.