You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/06/17 21:25:35 UTC
[tinkerpop] branch TINKERPOP-2238 updated (05143f4 -> d89bb78)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch TINKERPOP-2238
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 05143f4 TINKERPOP-2238 Fixed iterator leak in subgraph() step
new 32ee56f TINKERPOP-2238 Fixed iterator leak in SubgraphStrategy test
new 8eb734d TINKERPOP-2238 Fixed iterator leaks in BLVP test
new d89bb78 TINKERPOP-2238 Fixed GraphComputerTest iterator leak
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../tinkerpop/gremlin/process/computer/GraphComputerTest.java | 7 ++++++-
.../computer/bulkloading/BulkLoaderVertexProgramTest.java | 9 ++++++---
.../strategy/decoration/SubgraphStrategyProcessTest.java | 4 ++--
3 files changed, 14 insertions(+), 6 deletions(-)
[tinkerpop] 03/03: TINKERPOP-2238 Fixed GraphComputerTest iterator
leak
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2238
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit d89bb7861008245a9608967df9d018c54efcf062
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jun 17 17:24:27 2019 -0400
TINKERPOP-2238 Fixed GraphComputerTest iterator leak
---
.../tinkerpop/gremlin/process/computer/GraphComputerTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index b277894..4d4d4d2 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -47,6 +47,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.javatuples.Pair;
@@ -2224,7 +2225,11 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
assertEquals(6l, result.graph().traversal().V().properties("v3").count().next().longValue());
assertEquals(6l, result.graph().traversal().V().<String>values("name").dedup().count().next().longValue());
assertEquals(1l, result.graph().traversal().V().<String>values("v3").dedup().count().next().longValue());
- assertEquals("shouldExist", result.graph().traversal().V().<String>values("v3").dedup().next());
+
+ final Traversal<Vertex,String> t = result.graph().traversal().V().<String>values("v3").dedup();
+ assertEquals("shouldExist", t.next());
+ CloseableIterator.closeIterator(t);
+
///
assertFalse(result.memory().exists("m1"));
assertFalse(result.memory().exists("m2"));
[tinkerpop] 01/03: TINKERPOP-2238 Fixed iterator leak in
SubgraphStrategy test
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2238
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 32ee56f8cfcbb0f3458789c7da5222e55446b1ae
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jun 17 16:50:55 2019 -0400
TINKERPOP-2238 Fixed iterator leak in SubgraphStrategy test
---
.../traversal/strategy/decoration/SubgraphStrategyProcessTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 0e77966..c7b9f36 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
import org.apache.commons.configuration.MapConfiguration;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.IgnoreIteratorLeak;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
@@ -38,6 +37,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
import org.hamcrest.Matchers;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -62,7 +62,6 @@ import static org.junit.Assume.assumeThat;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@RunWith(GremlinProcessRunner.class)
-@IgnoreIteratorLeak
public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
@Test
@@ -164,6 +163,7 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
final Traversal t = sg.V();
t.hasNext();
printTraversalForm(t);
+ CloseableIterator.closeIterator(t);
assertEquals(6, sg.V().count().next().longValue());
// only the given edges are included
[tinkerpop] 02/03: TINKERPOP-2238 Fixed iterator leaks in BLVP test
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2238
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 8eb734d63b745baf52a3d479d82846ed79bd1a3e
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jun 17 17:13:27 2019 -0400
TINKERPOP-2238 Fixed iterator leaks in BLVP test
---
.../computer/bulkloading/BulkLoaderVertexProgramTest.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgramTest.java
index dca88b7..4bdb386 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgramTest.java
@@ -21,7 +21,6 @@ package org.apache.tinkerpop.gremlin.process.computer.bulkloading;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.IgnoreIteratorLeak;
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
@@ -33,6 +32,7 @@ import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.After;
@@ -52,7 +52,6 @@ import static org.junit.Assert.assertTrue;
/**
* @author Daniel Kuppitz (http://gremlin.guru)
*/
-@IgnoreIteratorLeak
public class BulkLoaderVertexProgramTest extends AbstractGremlinProcessTest {
final static String TINKERGRAPH_LOCATION = TestHelper.makeTestDataDirectory(BulkLoaderVertexProgramTest.class) + "tinkertest.kryo";
@@ -176,7 +175,7 @@ public class BulkLoaderVertexProgramTest extends AbstractGremlinProcessTest {
private static void assertGraphEquality(final Graph source, final Graph target, final Function<Vertex, Object> idAccessor) {
final GraphTraversalSource tg = target.traversal();
assertEquals(IteratorUtils.count(source.vertices()), IteratorUtils.count(target.vertices()));
- assertEquals(IteratorUtils.count(target.edges()), IteratorUtils.count(target.edges()));
+ assertEquals(IteratorUtils.count(source.edges()), IteratorUtils.count(target.edges()));
source.vertices().forEachRemaining(originalVertex -> {
Vertex tmpVertex = null;
final Iterator<Vertex> vertexIterator = target.vertices();
@@ -187,6 +186,9 @@ public class BulkLoaderVertexProgramTest extends AbstractGremlinProcessTest {
break;
}
}
+
+ CloseableIterator.closeIterator(vertexIterator);
+
assertNotNull(tmpVertex);
final Vertex clonedVertex = tmpVertex;
assertEquals(IteratorUtils.count(originalVertex.edges(Direction.IN)), IteratorUtils.count(clonedVertex.edges(Direction.IN)));
@@ -210,6 +212,7 @@ public class BulkLoaderVertexProgramTest extends AbstractGremlinProcessTest {
GraphTraversal t = tg.V(clonedVertex).outE(originalEdge.label());
originalEdge.properties().forEachRemaining(p -> t.has(p.key(), p.value()));
assertTrue(t.hasNext());
+ CloseableIterator.closeIterator(t);
});
});
}