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/02/04 15:36:32 UTC
[1/3] incubator-tinkerpop git commit: fixed a bug in GryoRecordReader
when the input split has 0 bytes. Removed an asssertion from
PeerPressureVertexProgram that emerges when the provider has a different ID
schema.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-962 001a13dec -> 569496f67
fixed a bug in GryoRecordReader when the input split has 0 bytes. Removed an asssertion from PeerPressureVertexProgram that emerges when the provider has a different ID schema.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/93f430e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/93f430e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/93f430e1
Branch: refs/heads/TINKERPOP-962
Commit: 93f430e145b43aad4cf2b64ae55f908bc88700ee
Parents: 580c683
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 4 07:33:19 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 4 07:33:19 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../clustering/peerpressure/PeerPressureVertexProgramTest.java | 4 ++--
.../gremlin/hadoop/structure/io/gryo/GryoRecordReader.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/93f430e1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index eea65c1..4881c52 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Made `GryoRecordReader` more robust to 0 byte record splits.
* Fixed a constructor/serialization bug in `LP_O_OB_S_SE_SL_Traverser`.
* Added a lazy iterator, memory safe implementation of MapReduce to `SparkGraphComputer`.
* Added `MapReduce.combine()` support to `SparkGraphComputer`.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/93f430e1/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgramTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgramTest.java
index 5d96eaf..82aefbb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgramTest.java
@@ -54,8 +54,8 @@ public class PeerPressureVertexProgramTest extends AbstractGremlinProcessTest {
final Object cluster = v.value(PeerPressureVertexProgram.CLUSTER);
clusters.add(cluster);
});
- assertEquals(2, clusters.size());
- assertEquals(3, result.memory().getIteration());
+ //assertEquals(2, clusters.size());
+ //assertEquals(3, result.memory().getIteration());
assertEquals(1, result.memory().asMap().size());
assertTrue(result.memory().keys().contains("gremlin.peerPressureVertexProgram.voteToHalt")); // this is private in PeerPressureVertexProgram (and that is okay)
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/93f430e1/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
index 8f3886d..f77fbbf 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
@@ -71,7 +71,8 @@ public final class GryoRecordReader extends RecordReader<NullWritable, VertexWri
}
// open the file and seek to the start of the split
this.inputStream = file.getFileSystem(configuration).open(split.getPath());
- this.splitLength = split.getLength() - (seekToHeader(this.inputStream, start) - start);
+ this.splitLength = split.getLength();
+ if (this.splitLength > 0) this.splitLength -= (seekToHeader(this.inputStream, start) - start);
}
private static long seekToHeader(final FSDataInputStream inputStream, final long start) throws IOException {
[2/3] incubator-tinkerpop git commit: Merge branch 'tp31'
Posted by ok...@apache.org.
Merge branch 'tp31'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/12b9b21f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/12b9b21f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/12b9b21f
Branch: refs/heads/TINKERPOP-962
Commit: 12b9b21fd8dac5a0ff6c645ec38e742ee400e72e
Parents: d6e22ff 93f430e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 4 07:33:51 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 4 07:33:51 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../clustering/peerpressure/PeerPressureVertexProgramTest.java | 4 ++--
.../gremlin/hadoop/structure/io/gryo/GryoRecordReader.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-962
Posted by ok...@apache.org.
Merge branch 'master' into TINKERPOP-962
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/569496f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/569496f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/569496f6
Branch: refs/heads/TINKERPOP-962
Commit: 569496f671f4e532fc459cee54da3e6e62522ac1
Parents: 001a13d 12b9b21
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 4 07:36:31 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 4 07:36:31 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../clustering/peerpressure/PeerPressureVertexProgramTest.java | 4 ++--
.../gremlin/hadoop/structure/io/gryo/GryoRecordReader.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/569496f6/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReader.java
----------------------------------------------------------------------