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 2017/07/24 15:57:59 UTC
[1/3] tinkerpop git commit: fixes for neo4j upgrade to 3.2.2
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1692 [created] a692960c6
fixes for neo4j upgrade to 3.2.2
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71d772e0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71d772e0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71d772e0
Branch: refs/heads/TINKERPOP-1692
Commit: 71d772e06a53fc1ada24d6db433ce2bbace5a6b0
Parents: 6251966
Author: Michael Hunger <gi...@jexp.de>
Authored: Thu Jul 13 02:19:57 2017 +0200
Committer: Michael Hunger <gi...@jexp.de>
Committed: Thu Jul 13 02:40:28 2017 +0200
----------------------------------------------------------------------
neo4j-gremlin/pom.xml | 40 ++++++++++++++++----
.../neo4j/process/NativeNeo4jCypherCheck.java | 4 +-
.../structure/NativeNeo4jStructureCheck.java | 22 +++++------
3 files changed, 45 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71d772e0/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index c3a8a76..37bbad2 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -89,7 +89,7 @@ limitations under the License.
<configuration>
<archive>
<manifestEntries>
- <Gremlin-Plugin-Dependencies>org.neo4j:neo4j-tinkerpop-api-impl:0.3-2.3.3
+ <Gremlin-Plugin-Dependencies>org.neo4j:neo4j-tinkerpop-api-impl:0.6-3.2.2
</Gremlin-Plugin-Dependencies>
</manifestEntries>
</archive>
@@ -117,18 +117,30 @@ limitations under the License.
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-tinkerpop-api-impl</artifactId>
- <version>0.3-2.3.3</version>
+ <version>0.6-3.2.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
- <artifactId>concurrentlinkedhashmap-lru</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.neo4j</groupId>
+ <artifactId>neo4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -137,13 +149,25 @@ limitations under the License.
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.11.6</version>
+ <version>2.11.8</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
- <artifactId>concurrentlinkedhashmap-lru</artifactId>
- <version>1.4.2</version>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ <version>2.11.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ <version>2.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.neo4j</groupId>
+ <artifactId>neo4j</artifactId>
+ <version>3.2.2</version>
<scope>test</scope>
</dependency>
<!-- *** WARNING *** -->
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71d772e0/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherCheck.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherCheck.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherCheck.java
index 7ac3d89..78448cd 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherCheck.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherCheck.java
@@ -111,7 +111,7 @@ public class NativeNeo4jCypherCheck extends AbstractNeo4jGremlinTest {
this.graph.addVertex("name", "marko", "age", 30, "color", "orange");
this.graph.tx().commit();
- final List<Object> result = this.getGraph().cypher("MATCH n WHERE id(n) IN [1,2] RETURN n").select("n").id().toList();
+ final List<Object> result = this.getGraph().cypher("MATCH (n) WHERE id(n) IN [1,2] RETURN n").select("n").id().toList();
assertNotNull(result);
assertEquals(2, result.size());
assertTrue(result.contains(1l));
@@ -129,7 +129,7 @@ public class NativeNeo4jCypherCheck extends AbstractNeo4jGremlinTest {
final List<Object> ids = Arrays.asList(v1.id(), v2.id());
final Map<String, Object> m = new HashMap<>();
m.put("ids", ids);
- final List<Object> result = this.getGraph().cypher("MATCH n WHERE id(n) IN {ids} RETURN n", m).select("n").id().toList();
+ final List<Object> result = this.getGraph().cypher("MATCH (n) WHERE id(n) IN {ids} RETURN n", m).select("n").id().toList();
assertNotNull(result);
assertEquals(2, result.size());
assertTrue(result.contains(v1.id()));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71d772e0/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NativeNeo4jStructureCheck.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NativeNeo4jStructureCheck.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NativeNeo4jStructureCheck.java
index b2f245f..8215ad3 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NativeNeo4jStructureCheck.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NativeNeo4jStructureCheck.java
@@ -197,7 +197,7 @@ public class NativeNeo4jStructureCheck extends AbstractNeo4jGremlinTest {
// assertEquals(1, b.properties("location").count().next().intValue());
assertEquals(0, g.E().count().next().intValue());
- assertEquals(4l, this.getBaseGraph().execute("MATCH n RETURN COUNT(n)", null).next().get("COUNT(n)"));
+ assertEquals(4l, this.getBaseGraph().execute("MATCH (n) RETURN COUNT(n)", null).next().get("COUNT(n)"));
assertEquals(2l, this.getBaseGraph().execute("MATCH (n)-[r]->(m) RETURN COUNT(r)", null).next().get("COUNT(r)"));
assertEquals(2l, this.getBaseGraph().execute("MATCH (a)-[r]->() WHERE id(a) = " + a.id() + " RETURN COUNT(r)", null).next().get("COUNT(r)"));
final AtomicInteger counter = new AtomicInteger(0);
@@ -206,8 +206,8 @@ public class NativeNeo4jStructureCheck extends AbstractNeo4jGremlinTest {
counter.incrementAndGet();
});
assertEquals(2, counter.getAndSet(0));
- this.getBaseGraph().execute("MATCH (a)-[]->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)", null).forEachRemaining(results -> {
- assertEquals(VertexProperty.DEFAULT_LABEL, ((List<String>) results.get("labels(m)")).get(0));
+ this.getBaseGraph().execute("MATCH (a)-->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)", null).forEachRemaining(results -> {
+ assertEquals(true, ((List<String>) results.get("labels(m)")).contains(VertexProperty.DEFAULT_LABEL));
counter.incrementAndGet();
});
assertEquals(2, counter.getAndSet(0));
@@ -234,7 +234,7 @@ public class NativeNeo4jStructureCheck extends AbstractNeo4jGremlinTest {
// assertEquals(1, b.properties("name").count().next().intValue());
// assertEquals(1, b.properties("location").count().next().intValue());
assertEquals(0, g.E().count().next().intValue());
- assertEquals(2l, this.getBaseGraph().execute("MATCH n RETURN COUNT(n)", null).next().get("COUNT(n)"));
+ assertEquals(2l, this.getBaseGraph().execute("MATCH (n) RETURN COUNT(n)", null).next().get("COUNT(n)"));
assertEquals(0l, this.getBaseGraph().execute("MATCH (n)-[r]->(m) RETURN COUNT(r)", null).next().get("COUNT(r)"));
assertEquals(1, IteratorUtils.count(a.getBaseVertex().getKeys()));
@@ -250,7 +250,7 @@ public class NativeNeo4jStructureCheck extends AbstractNeo4jGremlinTest {
// assertEquals(0, a.properties().count().next().intValue());
// assertEquals(2, b.properties().count().next().intValue());
assertEquals(0, g.E().count().next().intValue());
- assertEquals(2l, this.getBaseGraph().execute("MATCH n RETURN COUNT(n)", null).next().get("COUNT(n)"));
+ assertEquals(2l, this.getBaseGraph().execute("MATCH (n) RETURN COUNT(n)", null).next().get("COUNT(n)"));
assertEquals(0l, this.getBaseGraph().execute("MATCH (n)-[r]->(m) RETURN COUNT(r)", null).next().get("COUNT(r)"));
assertEquals(0, IteratorUtils.count(a.getBaseVertex().getKeys()));
assertEquals(2, IteratorUtils.count(b.getBaseVertex().getKeys()));
@@ -265,7 +265,7 @@ public class NativeNeo4jStructureCheck extends AbstractNeo4jGremlinTest {
// assertEquals(1, b.properties("location").count().next().intValue());
assertEquals(0, g.E().count().next().intValue());
- assertEquals(3l, this.getBaseGraph().execute("MATCH n RETURN COUNT(n)", null).next().get("COUNT(n)"));
+ assertEquals(3l, this.getBaseGraph().execute("MATCH (n) RETURN COUNT(n)", null).next().get("COUNT(n)"));
assertEquals(1l, this.getBaseGraph().execute("MATCH (n)-[r]->(m) RETURN COUNT(r)", null).next().get("COUNT(r)"));
assertEquals(1l, this.getBaseGraph().execute("MATCH (a)-[r]->() WHERE id(a) = " + a.id() + " RETURN COUNT(r)", null).next().get("COUNT(r)"));
final AtomicInteger counter = new AtomicInteger(0);
@@ -274,8 +274,8 @@ public class NativeNeo4jStructureCheck extends AbstractNeo4jGremlinTest {
counter.incrementAndGet();
});
assertEquals(1, counter.getAndSet(0));
- this.getBaseGraph().execute("MATCH (a)-[]->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)", null).forEachRemaining(results -> {
- assertEquals(VertexProperty.DEFAULT_LABEL, ((List<String>) results.get("labels(m)")).get(0));
+ this.getBaseGraph().execute("MATCH (a)-->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)", null).forEachRemaining(results -> {
+ assertEquals(true, ((List<String>) results.get("labels(m)")).contains(VertexProperty.DEFAULT_LABEL));
counter.incrementAndGet();
});
assertEquals(1, counter.getAndSet(0));
@@ -309,7 +309,7 @@ public class NativeNeo4jStructureCheck extends AbstractNeo4jGremlinTest {
//assertEquals(1, b.properties("location").count().next().intValue());
assertEquals(0, g.E().count().next().intValue());
- assertEquals(3l, this.getBaseGraph().execute("MATCH n RETURN COUNT(n)", null).next().get("COUNT(n)"));
+ assertEquals(3l, this.getBaseGraph().execute("MATCH (n) RETURN COUNT(n)", null).next().get("COUNT(n)"));
assertEquals(1l, this.getBaseGraph().execute("MATCH (n)-[r]->(m) RETURN COUNT(r)", null).next().get("COUNT(r)"));
assertEquals(1l, this.getBaseGraph().execute("MATCH (a)-[r]->() WHERE id(a) = " + a.id() + " RETURN COUNT(r)", null).next().get("COUNT(r)"));
final AtomicInteger counter = new AtomicInteger(0);
@@ -318,8 +318,8 @@ public class NativeNeo4jStructureCheck extends AbstractNeo4jGremlinTest {
counter.incrementAndGet();
});
assertEquals(1, counter.getAndSet(0));
- this.getBaseGraph().execute("MATCH (a)-[]->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)", null).forEachRemaining(results -> {
- assertEquals(VertexProperty.DEFAULT_LABEL, ((List<String>) results.get("labels(m)")).get(0));
+ this.getBaseGraph().execute("MATCH (a)-->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)", null).forEachRemaining(results -> {
+ assertEquals(true, ((List<String>) results.get("labels(m)")).contains(VertexProperty.DEFAULT_LABEL));
counter.incrementAndGet();
});
assertEquals(1, counter.getAndSet(0));
[3/3] tinkerpop git commit: TINKERPOP-1692 Cleaned up enforcer for
neo4j
Posted by sp...@apache.org.
TINKERPOP-1692 Cleaned up enforcer for neo4j
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a692960c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a692960c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a692960c
Branch: refs/heads/TINKERPOP-1692
Commit: a692960c687c393e3089a5d66c829e91290d2b2f
Parents: a348a05
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jul 24 11:56:56 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jul 24 11:56:56 2017 -0400
----------------------------------------------------------------------
neo4j-gremlin/pom.xml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a692960c/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 37bbad2..3a7012d 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -121,6 +121,10 @@ limitations under the License.
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.neo4j</groupId>
+ <artifactId>neo4j-kernel</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
@@ -129,10 +133,6 @@ limitations under the License.
<artifactId>caffeine</artifactId>
</exclusion>
<exclusion>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
@@ -164,9 +164,10 @@ limitations under the License.
<version>2.3.1</version>
<scope>test</scope>
</dependency>
+ <!-- self-conflict with neo4j-graph-matching -->
<dependency>
<groupId>org.neo4j</groupId>
- <artifactId>neo4j</artifactId>
+ <artifactId>neo4j-kernel</artifactId>
<version>3.2.2</version>
<scope>test</scope>
</dependency>
[2/3] tinkerpop git commit: Merge branch 'pr-674' into TINKERPOP-1692
Posted by sp...@apache.org.
Merge branch 'pr-674' into TINKERPOP-1692
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a348a05b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a348a05b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a348a05b
Branch: refs/heads/TINKERPOP-1692
Commit: a348a05b1d3e13396ff0a539c90b227bde3d0360
Parents: 36d3dee 71d772e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jul 24 11:28:05 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jul 24 11:28:05 2017 -0400
----------------------------------------------------------------------
neo4j-gremlin/pom.xml | 40 ++++++++++++++++----
.../neo4j/process/NativeNeo4jCypherCheck.java | 4 +-
.../structure/NativeNeo4jStructureCheck.java | 22 +++++------
3 files changed, 45 insertions(+), 21 deletions(-)
----------------------------------------------------------------------