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 2016/08/29 16:48:22 UTC
[1/6] tinkerpop git commit: if property id is number,
coerce to Long else use the id. CTR.
Repository: tinkerpop
Updated Branches:
refs/heads/master c7afb5333 -> 31dda1698
if property id is number, coerce to Long else use the id. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6745b31d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6745b31d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6745b31d
Branch: refs/heads/master
Commit: 6745b31dd8f3ad65c405332289d86b98ead4090c
Parents: 5fcaeef
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Aug 22 14:36:51 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Aug 22 14:36:51 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/PropertiesTest.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6745b31d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index 95f57a6..b5b4310 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -98,12 +98,14 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
keys.add(vertexProperty.key());
values.add(vertexProperty.value());
ids.add(vertexProperty.id());
+ Object id = vertexProperty.id();
+ id = id instanceof Number ? ((Number) id).longValue() : id;
+ Object otherId = convertToVertex(graph, vertexProperty.value()).property("name").id();
+ otherId = otherId instanceof Number ? ((Number) otherId).longValue() : otherId;
+ assertEquals(otherId, id);
assertEquals("name", vertexProperty.key());
assertEquals(convertToVertex(graph, vertexProperty.value()).values("name").next(), vertexProperty.value());
assertEquals(convertToVertex(graph, vertexProperty.value()).value("name"), vertexProperty.value());
- assertEquals(convertToVertex(graph, vertexProperty.value()).properties("name").next().id(), vertexProperty.id());
- assertEquals(convertToVertex(graph, vertexProperty.value()).property("name").id(), vertexProperty.id());
- assertEquals(convertToVertexId(vertexProperty.value()), vertexProperty.element().id());
}
assertEquals(4, counter);
assertEquals(1, keys.size());
@@ -114,7 +116,6 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
assertTrue(values.contains("josh"));
assertTrue(values.contains("peter"));
assertEquals(4, ids.size());
-
}
public static class Traversals extends PropertiesTest {
[3/6] tinkerpop git commit: Throw a proper exception when no
available host
Posted by sp...@apache.org.
Throw a proper exception when no available host
When a SessionedClient is initialized and no host is available in the cluster,
A proper exception is thrown instead of an IndexOutOfBoundsException
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b45e2ab
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b45e2ab
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b45e2ab
Branch: refs/heads/master
Commit: 1b45e2ab603bbe11f2777ce94452fe452209c268
Parents: 8912f79
Author: davidclement90 <da...@laposte.net>
Authored: Mon Aug 29 11:30:49 2016 +0200
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 29 12:24:52 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1b45e2ab/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index a8b1710..4908d0e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -521,6 +521,7 @@ public abstract class Client {
final List<Host> hosts = cluster.allHosts()
.stream().filter(Host::isAvailable).collect(Collectors.toList());
Collections.shuffle(hosts);
+ if (hosts.isEmpty()) throw new IllegalStateException("No available host in the cluster");
final Host host = hosts.get(0);
connectionPool = new ConnectionPool(host, this, Optional.of(1), Optional.of(1));
}
[4/6] tinkerpop git commit: Check if hosts are empty first before
bothering to do a shuffle to choose one at random. CTR
Posted by sp...@apache.org.
Check if hosts are empty first before bothering to do a shuffle to choose one at random. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1a2d3234
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1a2d3234
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1a2d3234
Branch: refs/heads/master
Commit: 1a2d3234620b2822f417275c5eb8b525bf88a5d6
Parents: 1b45e2a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 29 12:43:38 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 29 12:43:38 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a2d3234/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index afb2a7f..8fe87a9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.1.4 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Improved the error provided by a client-side session if no hosts were available.
* Fixed a bug in `PropertiesTest` which assumed long id values.
* Fixed a bug in `StarGraph` around self-edges.
* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a2d3234/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 4908d0e..4aca9ca 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -520,8 +520,8 @@ public abstract class Client {
// chooses an available host at random
final List<Host> hosts = cluster.allHosts()
.stream().filter(Host::isAvailable).collect(Collectors.toList());
- Collections.shuffle(hosts);
if (hosts.isEmpty()) throw new IllegalStateException("No available host in the cluster");
+ Collections.shuffle(hosts);
final Host host = hosts.get(0);
connectionPool = new ConnectionPool(host, this, Optional.of(1), Optional.of(1));
}
[5/6] tinkerpop git commit: Fixed link to point at current
contributing guide. CTR
Posted by sp...@apache.org.
Fixed link to point at current contributing guide. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f0ab088b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f0ab088b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f0ab088b
Branch: refs/heads/master
Commit: f0ab088b611f487f4e8a27dfb765f81f23c0712e
Parents: 1a2d323
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 29 12:46:10 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 29 12:46:10 2016 -0400
----------------------------------------------------------------------
CONTRIBUTING.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0ab088b/CONTRIBUTING.asciidoc
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc
index f209a0e..0739c73 100644
--- a/CONTRIBUTING.asciidoc
+++ b/CONTRIBUTING.asciidoc
@@ -23,4 +23,4 @@ you agree to license the material under the project's open source license and
warrant that you have the legal authority to do so.
Please see the "Developer Documentation" for more information on
-link:http://tinkerpop.apache.org/docs/3.1.0-SNAPSHOT/developer.html#_contributing[contributing] to TinkerPop.
\ No newline at end of file
+link:http://tinkerpop.apache.org/docs/current/dev/developer/#_contributing[contributing] to TinkerPop.
\ No newline at end of file
[6/6] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31dda169
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31dda169
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31dda169
Branch: refs/heads/master
Commit: 31dda16982e798d4e05c0899b5c4bea427abe5f8
Parents: c7afb53 f0ab088
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 29 12:47:55 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 29 12:47:55 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
CONTRIBUTING.asciidoc | 2 +-
docs/src/dev/developer/release.asciidoc | 4 ++--
.../main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31dda169/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31dda169/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
----------------------------------------------------------------------
[2/6] tinkerpop git commit: Minor fix to parenthesis in release docs.
Posted by sp...@apache.org.
Minor fix to parenthesis in release docs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8912f79c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8912f79c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8912f79c
Branch: refs/heads/master
Commit: 8912f79c165b3a25989bd8546f408e8a88e68fd4
Parents: 6745b31
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 29 12:07:35 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 29 12:07:35 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8912f79c/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 70390cf..8b16e2d 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -54,8 +54,8 @@ during this period.
... All tickets categorized by having a "Component" assigned.
... All tickets are either of type "Bug" or "Enhancement".
... All tickets where work was completed are "Closed"
-.... Search for "closed the pull request" in comments for hints on possible tickets that were left open by mistake).
-.... Look for tickets marked as "Resolved" (some users might not have rights to mark as "Closed" - convert these to "Closed".
+.... Search for "closed the pull request" in comments for hints on possible tickets that were left open by mistake.
+.... Look for tickets marked as "Resolved" as some users might not have rights to mark as "Closed" - convert these to "Closed".
... All tickets not marked "Fixed", "Done", or "Implemented" for their Resolution should not have a Fix Version
assigned (use common sense when reviewing these tickets before removing the Fix Version as it is possible the incorrect
Resolution may have been assigned).