You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crunch.apache.org by jw...@apache.org on 2015/06/25 10:10:47 UTC
[1/2] crunch git commit: CRUNCH-531: Fix split graph rendering typo.
Repository: crunch
Updated Branches:
refs/heads/master 484545a58 -> d176778cf
CRUNCH-531: Fix split graph rendering typo.
Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/d4da5299
Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/d4da5299
Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/d4da5299
Branch: refs/heads/master
Commit: d4da529985593ecf84c057938baf706a144e9024
Parents: 484545a
Author: Josh Wills <jw...@apache.org>
Authored: Thu Jun 4 09:30:42 2015 -0700
Committer: Josh Wills <jw...@apache.org>
Committed: Thu Jun 25 08:55:21 2015 +0100
----------------------------------------------------------------------
.../org/apache/crunch/impl/mr/plan/DotfileUtills.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/crunch/blob/d4da5299/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/DotfileUtills.java
----------------------------------------------------------------------
diff --git a/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/DotfileUtills.java b/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/DotfileUtills.java
index 7b401cb..7dea255 100644
--- a/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/DotfileUtills.java
+++ b/crunch-core/src/main/java/org/apache/crunch/impl/mr/plan/DotfileUtills.java
@@ -58,7 +58,6 @@ public class DotfileUtills {
* Builds a lineage dotfile only if the dotfile-debug mode is enabled.
*/
void buildLineageDotfile(Map<PCollectionImpl<?>, Set<Target>> outputs) {
-
if (isDebugDotfilesEnabled(conf)) {
try {
pcollectionLineageDotfile = new DotfileWriterPCollectionLineage(outputs)
@@ -73,7 +72,6 @@ public class DotfileUtills {
* Builds the base graph dotfile only if the dotfile-debug mode is enabled.
*/
void buildBaseGraphDotfile(Map<PCollectionImpl<?>, Set<Target>> outputs, Graph graph) {
-
if (isDebugDotfilesEnabled(conf)) {
try {
basePlanGraphDotfile = new DotfileWriterGraph(graph, outputs, null).buildDiagram("Base Graph ("
@@ -85,15 +83,13 @@ public class DotfileUtills {
}
/**
- * Builds a splitted graph dotfile only if the dotfile-debug mode is enabled.
+ * Builds a split graph dotfile only if the dotfile-debug mode is enabled.
*/
void buildSplitGraphDotfile(Map<PCollectionImpl<?>, Set<Target>> outputs, Graph graph, List<List<Vertex>> components) {
-
if (isDebugDotfilesEnabled(conf)) {
try {
- splitGraphPlanDotfile = new DotfileWriterGraph(graph, outputs, null).buildDiagram("Graph With Components ("
- + jarClass.getSimpleName() + ")");
-
+ splitGraphPlanDotfile = new DotfileWriterGraph(graph, outputs, components)
+ .buildDiagram("Graph With Components (" + jarClass.getSimpleName() + ")");
} catch (Exception ex) {
LOG.error("Problem creating debug dotfile:", ex);
}
[2/2] crunch git commit: CRUNCH-529: Prep changes for cross-compiling
support for Scala 2.11.
Posted by jw...@apache.org.
CRUNCH-529: Prep changes for cross-compiling support for Scala 2.11.
Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/d176778c
Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/d176778c
Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/d176778c
Branch: refs/heads/master
Commit: d176778cf803374506cb7743069a05e28e07e2cf
Parents: d4da529
Author: Josh Wills <jw...@apache.org>
Authored: Fri May 29 21:11:47 2015 -0400
Committer: Josh Wills <jw...@apache.org>
Committed: Thu Jun 25 09:10:06 2015 +0100
----------------------------------------------------------------------
.../crunch/scrunch/interpreter/InterpreterRunner.scala | 5 ++---
pom.xml | 13 +++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/crunch/blob/d176778c/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala
----------------------------------------------------------------------
diff --git a/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala b/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala
index 9443f68..0d84381 100644
--- a/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala
+++ b/crunch-scrunch/src/main/scala/org/apache/crunch/scrunch/interpreter/InterpreterRunner.scala
@@ -31,7 +31,6 @@ import scala.tools.nsc.ScriptRunner
import scala.tools.nsc.interpreter.ILoop
import scala.tools.nsc.io.Jar
import scala.tools.nsc.io.VirtualDirectory
-
import com.google.common.io.Files
import org.apache.hadoop.conf.Configuration
@@ -127,7 +126,7 @@ object InterpreterRunner extends MainGenericRunner {
ScriptRunner.runCommand(settings, combinedCode, thingToRun +: command.arguments)
}
else runTarget() match {
- case Left(ex) => errorFn(ex)
+ case Left(ex) => errorFn(ex.toString())
case Right(b) => b
}
}
@@ -146,7 +145,7 @@ object InterpreterRunner extends MainGenericRunner {
def createReplCodeJar(): File = {
var jarStream: JarOutputStream = null
try {
- val virtualDirectory = repl.virtualDirectory
+ val virtualDirectory = repl.intp.virtualDirectory.asInstanceOf[VirtualDirectory]
val tempDir = Files.createTempDir()
val tempJar = new File(tempDir, "replJar.jar")
jarStream = new JarOutputStream(new FileOutputStream(tempJar))
http://git-wip-us.apache.org/repos/asf/crunch/blob/d176778c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 38e9955..3c43f42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,8 +59,8 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.source.version>1.6</java.source.version>
- <java.target.version>1.6</java.target.version>
+ <java.source.version>1.7</java.source.version>
+ <java.target.version>1.7</java.target.version>
<!--
NOTE: Please don't change any dependency versions here without
checking first that they match those on Hadoop's runtime
@@ -82,7 +82,7 @@ under the License.
<libthrift.version>0.8.0</libthrift.version>
<slf4j.version>1.6.1</slf4j.version>
<log4j.version>1.2.15</log4j.version>
- <algebird.version>0.6.0</algebird.version>
+ <algebird.version>0.9.0</algebird.version>
<junit.version>4.10</junit.version>
<hamcrest.version>1.1</hamcrest.version>
<mockito.version>1.9.0</mockito.version>
@@ -95,8 +95,9 @@ under the License.
<scala.base.version>2.10</scala.base.version>
<scala.version>2.10.4</scala.version>
- <scalatest.version>1.9.1</scalatest.version>
- <spark.version>1.2.0</spark.version>
+ <scalatest.version>2.2.4</scalatest.version>
+ <spark.version>1.3.1</spark.version>
+ <jline.version>2.10.4</jline.version>
<jsr305.version>1.3.9</jsr305.version>
</properties>
@@ -427,7 +428,7 @@ under the License.
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>jline</artifactId>
- <version>${scala.version}</version>
+ <version>${jline.version}</version>
</dependency>
<dependency>