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 2016/08/09 11:52:05 UTC
[3/3] tinkerpop git commit: updated CHANGELOG and renamed a class
field name to be consistent with method argument name.
updated CHANGELOG and renamed a class field name to be consistent with method argument name.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fc79de81
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fc79de81
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fc79de81
Branch: refs/heads/master
Commit: fc79de813c788ee141175bbf1ea6d0cdefa94a0f
Parents: bce9669
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Aug 9 05:51:57 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Aug 9 05:51:57 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
.../traversal/strategy/decoration/SubgraphStrategy.java | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc79de81/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c5850ba..84b7ca4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,8 @@ TinkerPop 3.2.2 (NOT OFFICIALLY RELEASED YET)
* Added new recipe for "Traversal Induced Values".
* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
* Added class registrations for `Map.Entry` implementations to `GryoMapper`.
+* Fixed a severe bug in `SubgraphStrategy`.
+* Deprecated `SubgraphStrategy.Builder.vertexCriterion()/edgeCriterion()` in favor of `vertices()/edges()`.
[[release-3-2-1]]
TinkerPop 3.2.1 (Release Date: July 18, 2016)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc79de81/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 82fffaa..967a19b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -176,19 +176,19 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
public final static class Builder {
- private Traversal<Vertex, ?> vertexCriterion = null;
- private Traversal<Edge, ?> edgeCriterion = null;
+ private Traversal<Vertex, ?> vertexPredicate = null;
+ private Traversal<Edge, ?> edgePredicate = null;
private Builder() {
}
public Builder vertices(final Traversal<Vertex, ?> vertexPredicate) {
- this.vertexCriterion = vertexPredicate;
+ this.vertexPredicate = vertexPredicate;
return this;
}
public Builder edges(final Traversal<Edge, ?> edgePredicate) {
- this.edgeCriterion = edgePredicate;
+ this.edgePredicate = edgePredicate;
return this;
}
@@ -209,9 +209,9 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
public SubgraphStrategy create() {
- if (null == this.edgeCriterion && null == this.vertexCriterion)
+ if (null == this.edgePredicate && null == this.vertexPredicate)
throw new IllegalStateException("A subgraph must be filtered by an edge or vertex criterion");
- return new SubgraphStrategy(this.vertexCriterion, this.edgeCriterion);
+ return new SubgraphStrategy(this.vertexPredicate, this.edgePredicate);
}
}
}
\ No newline at end of file