Repository: oozie Updated Branches: refs/heads/branch-5.1 647f3518f -> a74e4bd1b
OOZIE-3369 [core] Upgrade guru.nidi:graphviz-java to 0.7.0 (andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/a74e4bd1 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/a74e4bd1 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/a74e4bd1 Branch: refs/heads/branch-5.1 Commit: a74e4bd1b2f16730d7ab6e2470ac27c666536178 Parents: 647f351 Author: Andras Piros <andras.pi...@cloudera.com> Authored: Tue Oct 16 11:57:44 2018 +0200 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Tue Oct 16 12:00:10 2018 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/oozie/util/graph/GraphvizRenderer.java | 5 ++--- .../java/org/apache/oozie/fluentjob/api/GraphVisualization.java | 4 ++-- pom.xml | 2 +- release-log.txt | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/a74e4bd1/core/src/main/java/org/apache/oozie/util/graph/GraphvizRenderer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/graph/GraphvizRenderer.java b/core/src/main/java/org/apache/oozie/util/graph/GraphvizRenderer.java index 2651457..0f69f00 100644 --- a/core/src/main/java/org/apache/oozie/util/graph/GraphvizRenderer.java +++ b/core/src/main/java/org/apache/oozie/util/graph/GraphvizRenderer.java @@ -58,10 +58,9 @@ public class GraphvizRenderer implements GraphRenderer { private static final ExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadExecutor(); private static final long GRAPHVIZ_TIMEOUT_SECONDS = ConfigurationService.getLong("oozie.graphviz.timeout.seconds"); - private Graph graphvizGraph = Factory.graph().generalAttr().with(RankDir.TOP_TO_BOTTOM).directed(); + private Graph graphvizGraph = Factory.graph().graphAttr().with(RankDir.TOP_TO_BOTTOM).directed(); private final Map<String, Node> graphvizNodes = new LinkedHashMap<>(); private final Multimap<String, String> edges = ArrayListMultimap.create(); - ; private int arcCount = 0; @Override @@ -234,8 +233,8 @@ public class GraphvizRenderer implements GraphRenderer { } private Graphviz newGraphviz() { + // Defaults to Rasterizer#BATIK return Graphviz.fromGraph(graphvizGraph) - .rasterizer(Rasterizer.BATIK) .engine(Engine.DOT) .height(calculateHeight(arcCount)); } http://git-wip-us.apache.org/repos/asf/oozie/blob/a74e4bd1/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/GraphVisualization.java ---------------------------------------------------------------------- diff --git a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/GraphVisualization.java b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/GraphVisualization.java index 4ad0ad7..aceed68 100644 --- a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/GraphVisualization.java +++ b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/GraphVisualization.java @@ -100,7 +100,7 @@ public class GraphVisualization { public static void graphToPng(final Graph graph, final String fileName) throws IOException { final MutableGraph mg = Parser.read(graphToDot(graph)); - mg.setLabel(fileName); + mg.setName(fileName); Graphviz.fromGraph(mg) .width(PNG_WIDTH) @@ -110,7 +110,7 @@ public class GraphVisualization { public static void workflowToPng(final Workflow workflow, final String fileName) throws IOException { final MutableGraph mg = Parser.read(workflowToDot(workflow)); - mg.setLabel(fileName); + mg.setName(fileName); Graphviz.fromGraph(mg) .width(PNG_WIDTH) http://git-wip-us.apache.org/repos/asf/oozie/blob/a74e4bd1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 838c8bd..9fd7ff5 100644 --- a/pom.xml +++ b/pom.xml @@ -1549,7 +1549,7 @@ <dependency> <groupId>guru.nidi</groupId> <artifactId>graphviz-java</artifactId> - <version>0.2.2</version> + <version>0.7.0</version> </dependency> <!-- Fluent Job API conversion to XML --> http://git-wip-us.apache.org/repos/asf/oozie/blob/a74e4bd1/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 2ec2d8e..15d46a3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release +OOZIE-3369 [core] Upgrade guru.nidi:graphviz-java to 0.7.0 (andras.piros) OOZIE-3358 [docs] Check and fix differences between help and command line documentation for Fluent Job API (kmarton via andras.piros) OOZIE-3348 amend [Hive action] Remove dependency hive-contrib (kmarton via andras.piros) OOZIE-3160 amend PriorityDelayQueue put()/take() can cause significant CPU load due to busy waiting (andras.piros)
