This is an automated email from the ASF dual-hosted git repository.
myskov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new d68ea97e02 HDDS-10503. Bump jgrapht to 1.4.0 (#6364)
d68ea97e02 is described below
commit d68ea97e02995784244f91939cceac404c689e53
Author: Ivan Zlenko <[email protected]>
AuthorDate: Tue Mar 12 00:43:14 2024 +0500
HDDS-10503. Bump jgrapht to 1.4.0 (#6364)
---
.../org/apache/ozone/graph/TestPrintableGraph.java | 84 ++++++++++++++++++++++
hadoop-ozone/dist/src/main/license/jar-report.txt | 3 +-
pom.xml | 2 +-
3 files changed, 86 insertions(+), 3 deletions(-)
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/graph/TestPrintableGraph.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/graph/TestPrintableGraph.java
new file mode 100644
index 0000000000..8031eca7b0
--- /dev/null
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/graph/TestPrintableGraph.java
@@ -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.ozone.graph;
+
+import com.google.common.graph.MutableGraph;
+import org.apache.ozone.rocksdiff.CompactionNode;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+
+/**
+ * This class is used for testing the PrintableGraph class.
+ * It contains methods to test the generation and printing of graphs with
different types.
+ */
+@ExtendWith(MockitoExtension.class)
+public class TestPrintableGraph {
+ @TempDir
+ private Path dir;
+
+ @Mock
+ private MutableGraph<CompactionNode> mutableGraph;
+
+ @ParameterizedTest
+ @EnumSource(PrintableGraph.GraphType.class)
+ void testPrintNoGraphMessage(PrintableGraph.GraphType graphType) {
+ PrintableGraph graph = new PrintableGraph(mutableGraph, graphType);
+ try {
+ graph.generateImage(dir.resolve(graphType.name()).toString());
+ } catch (IOException e) {
+ assertEquals("Graph is empty.", e.getMessage());
+ }
+ }
+
+ @ParameterizedTest
+ @EnumSource(PrintableGraph.GraphType.class)
+ void testPrintActualGraph(PrintableGraph.GraphType graphType) throws
IOException {
+ Set<CompactionNode> nodes = Stream.of(
+ new CompactionNode("fileName1",
+ 100, 100, "startKey1", "endKey1", "columnFamily1"),
+ new CompactionNode("fileName2",
+ 200, 200, "startKey2", "endKey2", null),
+ new CompactionNode("fileName3",
+ 300, 300, null, "endKey3", "columnFamily3"),
+ new CompactionNode("fileName4",
+ 400, 400, "startKey4", null, "columnFamily4")
+ ).collect(Collectors.toSet());
+ when(mutableGraph.nodes()).thenReturn(nodes);
+
+ PrintableGraph graph = new PrintableGraph(mutableGraph, graphType);
+ graph.generateImage(dir.resolve(graphType.name()).toString());
+
+ assertTrue(Files.exists(dir.resolve(graphType.name())), "Graph hasn't been
generated");
+ }
+}
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 70fecc866d..bc73aa6fe3 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -2,7 +2,6 @@ share/ozone/lib/animal-sniffer-annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/aopalliance.jar
-share/ozone/lib/antlr4-runtime.jar
share/ozone/lib/aopalliance-repackaged.jar
share/ozone/lib/aspectjrt.jar
share/ozone/lib/aspectjweaver.jar
@@ -142,10 +141,10 @@ share/ozone/lib/jetty-util-ajax.jar
share/ozone/lib/jetty-util.jar
share/ozone/lib/jetty-webapp.jar
share/ozone/lib/jetty-xml.jar
-share/ozone/lib/jgraph.jar
share/ozone/lib/jgrapht-core.jar
share/ozone/lib/jgrapht-ext.jar
share/ozone/lib/jgraphx.jar
+share/ozone/lib/jheaps.jar
share/ozone/lib/jmespath-java.jar
share/ozone/lib/jna.jar
share/ozone/lib/jna-platform.jar
diff --git a/pom.xml b/pom.xml
index 74972a2b5c..cb74250529 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,7 +295,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<aspectj.version>1.9.7</aspectj.version>
<aspectj-plugin.version>1.14.0</aspectj-plugin.version>
<restrict-imports.enforcer.version>2.5.0</restrict-imports.enforcer.version>
- <jgrapht.version>1.0.1</jgrapht.version>
+ <jgrapht.version>1.4.0</jgrapht.version>
<spring.version>5.3.27</spring.version>
<jooq.version>3.11.10</jooq.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
