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/03/19 16:01:50 UTC

incubator-tinkerpop git commit: publish-docs works on Mac (thanks @dkuppitz). Found a bug with indexing in TinkerGraph that caused the docs to break. Need more test cases on TinkerGraph indices.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 5ca0c5030 -> aa9438a1d


publish-docs works on Mac (thanks @dkuppitz). Found a bug with indexing in TinkerGraph that caused the docs to break. Need more test cases on TinkerGraph indices.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/aa9438a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/aa9438a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/aa9438a1

Branch: refs/heads/master
Commit: aa9438a1dca4a07b3c97dd0685ff36785ded7b8b
Parents: 5ca0c50
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Mar 19 09:01:32 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Mar 19 09:01:44 2015 -0600

----------------------------------------------------------------------
 bin/publish-docs.sh                                          | 2 +-
 docs/src/the-traversal.asciidoc                              | 2 +-
 .../gremlin/tinkergraph/structure/TinkerHelper.java          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aa9438a1/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index e56927d..c113bb1 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -28,7 +28,7 @@ if [ "${USERNAME}" == "" ]; then
 fi
 
 SVN_CMD="svn --no-auth-cache --username=${USERNAME}"
-VERSION=$(cat pom.xml | grep -a1 '<artifactId>tinkerpop</artifactId>' | grep '<version>' | grep -Po '(?<=>).*(?=<)')
+VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep '<version>' | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
 
 rm -rf target
 mkdir -p target/svn

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aa9438a1/docs/src/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-traversal.asciidoc b/docs/src/the-traversal.asciidoc
index c2857b0..720b0ed 100644
--- a/docs/src/the-traversal.asciidoc
+++ b/docs/src/the-traversal.asciidoc
@@ -124,7 +124,7 @@ link:http://en.wikipedia.org/wiki/Automated_reasoning[Reasoning] is the process
 g.V(1).as('a').out('created')
 g.V(1).as('a').out('created').in('created')
 g.V(1).as('a').out('created').in('created').except('a') <1>
-g.V(1).as('a').out('created').in('created').except('a').addBothE('co-developer','a')
+g.V(1).as('a').out('created').in('created').except('a').addInE('co-developer','a')
 g.V(1).out('co-developer').values('name')
 g.V(1).out('co-developer').in('co-developer')
 ----

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aa9438a1/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
index 33e5c01..c84d37c 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
@@ -113,16 +113,16 @@ public final class TinkerHelper {
         return null == vertex.properties ? Collections.emptyMap() : vertex.properties;
     }
 
-    public static void autoUpdateIndex(final TinkerEdge edge, final String key, final Object oldValue, final Object value) {
+    public static void autoUpdateIndex(final TinkerEdge edge, final String key, final Object newValue, final Object oldValue) {
         final TinkerGraph graph = (TinkerGraph) edge.graph();
         if (graph.edgeIndex != null)
-            graph.edgeIndex.autoUpdate(key, value, oldValue, edge);
+            graph.edgeIndex.autoUpdate(key, newValue, oldValue, edge);
     }
 
-    public static void autoUpdateIndex(final TinkerVertex vertex, final String key, final Object oldValue, final Object value) {
+    public static void autoUpdateIndex(final TinkerVertex vertex, final String key, final Object newValue, final Object oldValue) {
         final TinkerGraph graph = (TinkerGraph) vertex.graph();
         if (graph.vertexIndex != null)
-            graph.vertexIndex.autoUpdate(key, value, oldValue, vertex);
+            graph.vertexIndex.autoUpdate(key, newValue, oldValue, vertex);
     }
 
     public static void removeElementIndex(final TinkerVertex vertex) {