You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/07/27 16:12:42 UTC
[1/5] tinkerpop git commit: bumped to support Giraph 1.2.0. [Forced
Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1736-master c0af6eec8 -> e363a5e1c (forced update)
bumped to support Giraph 1.2.0.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f1d628f3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f1d628f3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f1d628f3
Branch: refs/heads/TINKERPOP-1736-master
Commit: f1d628f3fceec24dfc5e2c559fbd2bea214a68a0
Parents: fcd623c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jul 25 14:21:36 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jul 25 14:21:36 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
giraph-gremlin/pom.xml | 2 +-
.../gremlin/giraph/process/computer/GiraphMessageCombiner.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1d628f3/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 393fe44..14069fb 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bumped to support Giraph 1.2.0.
* Bumped to support Spark 2.2.0.
* Detected if type checking was required in `GremlinGroovyScriptEngine` and disabled related infrastructure if not.
* Removed previously deprecated `GraphTraversal.selectV3d0()` step.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1d628f3/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index e954bf6..1a1ebfe 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -64,7 +64,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.giraph</groupId>
<artifactId>giraph-core</artifactId>
- <version>1.1.0-hadoop2</version>
+ <version>1.2.0-hadoop2</version>
<exclusions>
<!-- self conflicts -->
<exclusion>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1d628f3/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
----------------------------------------------------------------------
diff --git a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
index 4d725b2..4c2a12e 100644
--- a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
+++ b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
@@ -30,7 +30,7 @@ import org.apache.tinkerpop.gremlin.process.computer.VertexProgram;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class GiraphMessageCombiner extends org.apache.giraph.combiner.MessageCombiner<ObjectWritable, ObjectWritable> implements ImmutableClassesGiraphConfigurable {
+public final class GiraphMessageCombiner implements org.apache.giraph.combiner.MessageCombiner<ObjectWritable, ObjectWritable>, ImmutableClassesGiraphConfigurable {
private MessageCombiner messageCombiner;
private ImmutableClassesGiraphConfiguration configuration;
[4/5] tinkerpop git commit: Merge branch 'TINKERPOP-1736' into
TINKERPOP-1736-tp32
Posted by dk...@apache.org.
Merge branch 'TINKERPOP-1736' into TINKERPOP-1736-tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/76709da1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76709da1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76709da1
Branch: refs/heads/TINKERPOP-1736-master
Commit: 76709da19ee61ff1a25acd49760fa69adc9d0ab5
Parents: d92dd5d 3d8c03b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jul 27 18:10:15 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jul 27 18:10:15 2017 +0200
----------------------------------------------------------------------
.../traversal/step/sideEffect/GroovySackTest.groovy | 2 +-
.../process/traversal/step/sideEffect/SackTest.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76709da1/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76709da1/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 3bde60d,7903b07..7012478
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@@ -69,11 -67,9 +69,11 @@@ public abstract class SackTest extends
public abstract Traversal<Vertex, Integer> get_g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack();
+ public abstract Traversal<Vertex, Double> get_g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack(final Object v1Id);
+
public abstract Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack();
- public abstract Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+ public abstract Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack();
@Test
@LoadGraphWith(MODERN)
[2/5] tinkerpop git commit: Merge branch 'TINKERPOP-1535'
Posted by dk...@apache.org.
Merge branch 'TINKERPOP-1535'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9bc2d46a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9bc2d46a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9bc2d46a
Branch: refs/heads/TINKERPOP-1736-master
Commit: 9bc2d46a9e147210242d9fe8cc66ab2cf25262f2
Parents: 3a4406a f1d628f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jul 26 10:08:36 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jul 26 10:08:36 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
giraph-gremlin/pom.xml | 2 +-
.../gremlin/giraph/process/computer/GiraphMessageCombiner.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bc2d46a/CHANGELOG.asciidoc
----------------------------------------------------------------------
[5/5] tinkerpop git commit: Merge branch 'TINKERPOP-1736-tp32' into
TINKERPOP-1736-master
Posted by dk...@apache.org.
Merge branch 'TINKERPOP-1736-tp32' into TINKERPOP-1736-master
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e363a5e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e363a5e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e363a5e1
Branch: refs/heads/TINKERPOP-1736-master
Commit: e363a5e1c800ef7c3b730d9811c8c4d2aae596c9
Parents: 9bc2d46 76709da
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jul 27 18:11:57 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jul 27 18:11:57 2017 +0200
----------------------------------------------------------------------
.../process/traversal/step/sideEffect/SackTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e363a5e1/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
[3/5] tinkerpop git commit: Fixed test case that ultimately failed in
`master/` (coerced `BigDecimal` to `Double`).
Posted by dk...@apache.org.
Fixed test case that ultimately failed in `master/` (coerced `BigDecimal` to `Double`).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3d8c03bb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3d8c03bb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3d8c03bb
Branch: refs/heads/TINKERPOP-1736-master
Commit: 3d8c03bb2c3cdd09a44e8b163d62db6d18773490
Parents: a612f5f
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jul 27 18:07:25 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jul 27 18:07:25 2017 +0200
----------------------------------------------------------------------
.../traversal/step/sideEffect/GroovySackTest.groovy | 2 +-
.../process/traversal/step/sideEffect/SackTest.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d8c03bb/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
index d1681cb..725e03e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
@@ -76,7 +76,7 @@ public abstract class GroovySackTest {
}
@Override
- Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
+ Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack() {
TraversalScriptHelper.compute("g.withSack(2).V.sack(div).by(constant(3.0)).sack", g)
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d8c03bb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 63f3649..7903b07 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@ -69,7 +69,7 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack();
- public abstract Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+ public abstract Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack();
@Test
@LoadGraphWith(MODERN)
@@ -161,13 +161,13 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
- final Traversal<Vertex, BigDecimal> traversal = get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+ public void g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack() {
+ final Traversal<Vertex, Double> traversal = get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack();
printTraversalForm(traversal);
final double expected = 2.0 / 3.0;
for (int i = 0; i < 6; i++) {
assertTrue(traversal.hasNext());
- assertEquals(expected, traversal.next().doubleValue(), 0.0001);
+ assertEquals(expected, ((Number) traversal.next()).doubleValue(), 0.0001);
}
assertFalse(traversal.hasNext());
}
@@ -223,8 +223,8 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
- return g.withSack(2).V().sack(Operator.div).by(constant(BigDecimal.valueOf(3))).sack();
+ public Traversal<Vertex, Double> get_g_withSackX2X_V_sackXdivX_byXconstantX3_0XX_sack() {
+ return g.withSack(2).V().sack(Operator.div).by(constant(3.0)).sack();
}
}
-}
\ No newline at end of file
+}