github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-06-27 17:08:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix reverseDepthFirst(Vertex) to search backward, not forward

Browse source 
This was an untested portion of code, and it accidentally invoked a
forward depth-first search instead of a reverse one.

Fixes #7485
This commit is contained in:
Andrew Cholakian 2017-06-16 17:56:57 -05:00
parent c325264ba8
commit 55dcd8303e
2 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/DepthFirst.java
View file

@ -24,7 +24,7 @@ public class DepthFirst {
}
public static Stream<Vertex> reverseDepthFirst(Vertex v) {
return depthFirst(Collections.singleton(v));
return reverseDepthFirst(Collections.singleton(v));
}
public static Stream<Vertex> depthFirst(Collection<Vertex> v) {

38
logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/DepthFirstTest.java
View file

@ -1,5 +1,6 @@
package org.logstash.config.ir.graph.algorithms;
import org.junit.Before;
import org.junit.Test;
import org.logstash.config.ir.IRHelpers;
import org.logstash.config.ir.InvalidIRException;
@ -16,13 +17,40 @@ import static junit.framework.TestCase.assertEquals;
* Created by andrewvc on 1/5/17.
*/
public class DepthFirstTest {
Graph g = Graph.empty();
final AtomicInteger visitCount = new AtomicInteger();
final List<Vertex> visited = new ArrayList<>();
@Before
public void setup() throws InvalidIRException {
g.chainVertices(
IRHelpers.createTestVertex(),
IRHelpers.createTestVertex(),
IRHelpers.createTestVertex()
);
}
@Test
public void testDFSBasic() throws InvalidIRException {
Graph g = Graph.empty();
g.chainVertices(IRHelpers.createTestVertex(), IRHelpers.createTestVertex(), IRHelpers.createTestVertex());
final AtomicInteger visitCount = new AtomicInteger();
final List<Vertex> visited = new ArrayList<>();
public void testDFSBasic() {
DepthFirst.depthFirst(g).forEach(v -> visitCount.incrementAndGet());
assertEquals("It should visit each node once", visitCount.get(), 3);
}
@Test
public void testDFSReverse() {
DepthFirst.reverseDepthFirst(g).forEach(v -> visitCount.incrementAndGet());
assertEquals("It should visit each node once", visitCount.get(), 3);
}
@Test
public void testDFSVertex() {
DepthFirst.depthFirst(g.getRoots()).forEach(v -> visitCount.incrementAndGet());
assertEquals("It should visit each node once", visitCount.get(), 3);
}
@Test
public void testReverseDFSVertex() {
DepthFirst.reverseDepthFirst(g.getLeaves()).forEach(v -> visitCount.incrementAndGet());
assertEquals("It should visit each node once", visitCount.get(), 3);
}
}