You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/11/01 20:22:18 UTC
[1/3] incubator-tinkerpop git commit: bumped to support Neo4j 2.3.0
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 6169fffd2 -> 19b7ae0fc
bumped to support Neo4j 2.3.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4c6ba90f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4c6ba90f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4c6ba90f
Branch: refs/heads/master
Commit: 4c6ba90fc34d64379af8e0f9e0574167e57f78ab
Parents: 9300485
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Sat Oct 31 10:54:52 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Sat Oct 31 10:54:52 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 ++-
neo4j-gremlin/pom.xml | 28 +++++++++++++++++++++++++++-
2 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c6ba90f/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8bd6e51..06d0db4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,10 +25,11 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.0 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bumped to Neo4j 2.3.0.
* Renamed the `public static String` configuration variable names of TinkerGraph (deprecated old variables).
* Added `GraphComputer.config(key,value)` to allow engine-specific configurations.
* `GraphStep` is no longer in the `sideEffect`-package and is now in `map`-package (breaking change).
-* Added suppport for mid-traversal `V()`-steps (`GraphStep` semantics updated).
+* Added support for mid-traversal `V()`-steps (`GraphStep` semantics updated).
* Fixed `Number` handling in `Operator` enums. Prior this change a lot of operations on mixed `Number` types returned a wrong result (wrong data type).
* Fixed a bug in Gremlin Server/Driver serializer where empty buffers were getting returned in certain cases.
* Renamed `ConjunctionX` to `ConnectiveX` because "conjunction" is assumed "and" (disjunction "or"), where "connective" is the parent concept.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4c6ba90f/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 8661064..eca07d1 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -136,7 +136,33 @@ limitations under the License.
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-tinkerpop-api-impl</artifactId>
- <version>0.1-2.2</version>
+ <version>0.3-2.3.0</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+ <artifactId>concurrentlinkedhashmap-lru</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.11.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+ <artifactId>concurrentlinkedhashmap-lru</artifactId>
+ <version>1.4.2</version>
<scope>test</scope>
</dependency>
<!-- *** WARNING *** -->
[2/3] incubator-tinkerpop git commit: Tweaks to Neo4jHelper as
NotFoundException should be checked as the reason for isNotFound() catch.
Also, static String construction for cost savings.
Posted by ok...@apache.org.
Tweaks to Neo4jHelper as NotFoundException should be checked as the reason for isNotFound() catch. Also, static String construction for cost savings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1a31b78c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1a31b78c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1a31b78c
Branch: refs/heads/master
Commit: 1a31b78c4a158f7fcdbbf01f09d9d2801a12ab11
Parents: 4c6ba90
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Sat Oct 31 11:25:00 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Sat Oct 31 11:25:00 2015 -0600
----------------------------------------------------------------------
.../gremlin/neo4j/structure/Neo4jHelper.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1a31b78c/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java
index 7c8c0d0..b205019 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java
@@ -19,16 +19,15 @@
package org.apache.tinkerpop.gremlin.neo4j.structure;
import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.neo4j.tinkerpop.api.Neo4jNode;
-import org.neo4j.tinkerpop.api.Neo4jRelationship;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public final class Neo4jHelper {
+ private static final String NOT_FOUND_EXCEPTION = "NotFoundException";
+
private Neo4jHelper() {
}
@@ -45,13 +44,16 @@ public final class Neo4jHelper {
try {
node.getKeys();
return false;
- } catch (final IllegalStateException e) {
- return true;
+ } catch (final RuntimeException e) {
+ if (isNotFound(e))
+ return true;
+ else
+ throw e;
}
}
- public static boolean isNotFound(RuntimeException ex) {
- return ex.getClass().getSimpleName().equals("NotFoundException");
+ public static boolean isNotFound(final RuntimeException ex) {
+ return ex.getClass().getSimpleName().equals(NOT_FOUND_EXCEPTION);
}
public static Neo4jNode getVertexPropertyNode(final Neo4jVertexProperty vertexProperty) {
[3/3] incubator-tinkerpop git commit: Merge branch 'TINKERPOP3-899'
of https://github.com/apache/incubator-tinkerpop
Posted by ok...@apache.org.
Merge branch 'TINKERPOP3-899' of https://github.com/apache/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/19b7ae0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/19b7ae0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/19b7ae0f
Branch: refs/heads/master
Commit: 19b7ae0fc2018375ac148481c247b5ccf88e1d29
Parents: 6169fff 1a31b78
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Sun Nov 1 12:22:04 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Sun Nov 1 12:22:04 2015 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 ++-
neo4j-gremlin/pom.xml | 28 +++++++++++++++++++-
.../gremlin/neo4j/structure/Neo4jHelper.java | 16 ++++++-----
3 files changed, 38 insertions(+), 9 deletions(-)
----------------------------------------------------------------------