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/03 22:28:56 UTC
[1/5] incubator-tinkerpop git commit: Update NOTICE given bump in
groovy version.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-962 097e09a39 -> 001a13dec
Update NOTICE given bump in groovy version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/93234dfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/93234dfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/93234dfc
Branch: refs/heads/TINKERPOP-962
Commit: 93234dfc8ac90b579f005575ed88165e5a59c27f
Parents: b50bb3f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Feb 2 07:31:47 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 2 07:31:47 2016 -0500
----------------------------------------------------------------------
gremlin-console/src/main/NOTICE | 12 ++++++++++--
gremlin-server/src/main/NOTICE | 12 ++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/93234dfc/gremlin-console/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/NOTICE b/gremlin-console/src/main/NOTICE
index 4fa0fdf..856d8fd 100644
--- a/gremlin-console/src/main/NOTICE
+++ b/gremlin-console/src/main/NOTICE
@@ -34,8 +34,16 @@ under the Apache License 2.0 (see: StringUtils.containsWhitespace())
------------------------------------------------------------------------
Apache Groovy (AL ASF)
------------------------------------------------------------------------
-This product includes software developed by
-The Groovy community (http://groovy.codehaus.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes/uses ANTLR (http://www.antlr2.org/)
+developed by Terence Parr 1989-2006
+
+This product bundles icons from the famfamfam.com silk icons set
+http://www.famfamfam.com/lab/icons/silk/
+Licensed under the Creative Commons Attribution Licence v2.5
+http://creativecommons.org/licenses/by/2.5/
------------------------------------------------------------------------
Apache Http Components Core (AL ASF)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/93234dfc/gremlin-server/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/NOTICE b/gremlin-server/src/main/NOTICE
index 0929ae8..8147661 100644
--- a/gremlin-server/src/main/NOTICE
+++ b/gremlin-server/src/main/NOTICE
@@ -27,8 +27,16 @@ under the Apache License 2.0 (see: StringUtils.containsWhitespace())
------------------------------------------------------------------------
Apache Groovy (AL ASF)
------------------------------------------------------------------------
-This product includes software developed by
-The Groovy community (http://groovy.codehaus.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes/uses ANTLR (http://www.antlr2.org/)
+developed by Terence Parr 1989-2006
+
+This product bundles icons from the famfamfam.com silk icons set
+http://www.famfamfam.com/lab/icons/silk/
+Licensed under the Creative Commons Attribution Licence v2.5
+http://creativecommons.org/licenses/by/2.5/
------------------------------------------------------------------------
Apache Ivy (AL ASF)
[5/5] 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/001a13de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/001a13de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/001a13de
Branch: refs/heads/TINKERPOP-962
Commit: 001a13dec5d3bb7ffa269fa2e392947d5c600a5e
Parents: 097e09a d6e22ff
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Feb 3 14:28:59 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Feb 3 14:28:59 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/dev/developer/contributing.asciidoc | 11 ++++++-----
gremlin-console/src/main/NOTICE | 12 ++++++++++--
.../traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java | 3 +++
gremlin-server/src/main/NOTICE | 12 ++++++++++--
.../gremlin/spark/structure/io/InputFormatRDD.java | 6 +-----
6 files changed, 31 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[2/5] incubator-tinkerpop git commit: Minor adjustments to
license/notice dev docs.
Posted by ok...@apache.org.
Minor adjustments to license/notice dev docs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/94ca0741
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/94ca0741
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/94ca0741
Branch: refs/heads/TINKERPOP-962
Commit: 94ca07411293d6d23afaebc86a183fa2868f329a
Parents: 93234df
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Feb 2 07:40:07 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 2 07:40:07 2016 -0500
----------------------------------------------------------------------
docs/src/dev/developer/contributing.asciidoc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/94ca0741/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index 3b1f949..8e65ed5 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -398,13 +398,14 @@ distributions, either:
* target/apache-gremlin-server-x.y.z-distribution.zip
Apache licensed software does not need to be included in LICENSE, but if the new dependency is an Apache-approved
-license then it should be added in the pattern already defined.
+license (e.g. BSD, MIT) then it should be added in the pattern already defined.
-To determine if changes are required to the NOTICE, first check if the bundled jar has a NOTICE file in it.
+To determine if changes are required to the NOTICE, first check if the bundled jar has a NOTICE file in it (typically
+found in `/META-INF` directory of the jar).
-* If the bundled file does not have a NOTICE then no changes to TinkerPop's NOTICE are required.
-* If the NOTICE of the file being bundled is NOT Apache licensed then there is no change to TinkerPop's NOTICE.
-* If the NOTICE of the file being bundled is Apache licensed then include the copyright notification in TinkerPop's
+* If the bundled file does not have a NOTICE, then no changes to TinkerPop's NOTICE are required.
+* If the NOTICE of the file being bundled is NOT Apache licensed, then there is no change to TinkerPop's NOTICE.
+* If the NOTICE of the file being bundled is Apache licensed, then include the copyright notification in TinkerPop's
NOTICE.
* If the NOTICE of the file being bundled is Apache licensed AND is an Apache Software Foundation project, then
ONLY include the portion of that NOTICE in TinkerPop's NOTICE that is unrelated to the Apache boilerplate NOTICE.
[3/5] incubator-tinkerpop git commit: Added a protected constructor()
to LP_O_OB_S_SE_SL_Traverser and thus,
enable it to be serialized. Fixed a configuration check issue in
InputFormatRDD. TINKERPOP-1119 and TINKERPOP-1117.
Posted by ok...@apache.org.
Added a protected constructor() to LP_O_OB_S_SE_SL_Traverser and thus, enable it to be serialized. Fixed a configuration check issue in InputFormatRDD. TINKERPOP-1119 and TINKERPOP-1117.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/580c683a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/580c683a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/580c683a
Branch: refs/heads/TINKERPOP-962
Commit: 580c683a3d3d5e67b8321ae436cb4e806f682c0e
Parents: 94ca074
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Feb 3 14:00:23 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Feb 3 14:00:23 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java | 3 +++
.../tinkerpop/gremlin/spark/structure/io/InputFormatRDD.java | 6 +-----
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/580c683a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a61153e..eea65c1 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)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* 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`.
* Bumped to Neo4j 2.3.2.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/580c683a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
index 9781f84..8ec5de5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java
@@ -35,6 +35,9 @@ public class LP_O_OB_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> {
protected Path path;
+ protected LP_O_OB_S_SE_SL_Traverser() {
+ }
+
public LP_O_OB_S_SE_SL_Traverser(final T t, final Step<T, ?> step) {
super(t, step);
this.path = ImmutablePath.make();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/580c683a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/InputFormatRDD.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/InputFormatRDD.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/InputFormatRDD.java
index 57d7080..a7bfbc1 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/InputFormatRDD.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/InputFormatRDD.java
@@ -26,7 +26,6 @@ import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat;
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.tinkerpop.gremlin.hadoop.Constants;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.FileSystemStorage;
import org.apache.tinkerpop.gremlin.hadoop.structure.io.ObjectWritable;
import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil;
@@ -40,7 +39,6 @@ public final class InputFormatRDD implements InputRDD {
@Override
public JavaPairRDD<Object, VertexWritable> readGraphRDD(final Configuration configuration, final JavaSparkContext sparkContext) {
final org.apache.hadoop.conf.Configuration hadoopConfiguration = ConfUtil.makeHadoopConfiguration(configuration);
- hadoopConfiguration.set(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION), Constants.getSearchGraphLocation(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION), FileSystemStorage.open(hadoopConfiguration)).get());
return sparkContext.newAPIHadoopRDD(hadoopConfiguration,
(Class<InputFormat<NullWritable, VertexWritable>>) hadoopConfiguration.getClass(Constants.GREMLIN_HADOOP_GRAPH_INPUT_FORMAT, InputFormat.class),
NullWritable.class,
@@ -50,9 +48,7 @@ public final class InputFormatRDD implements InputRDD {
@Override
public <K, V> JavaPairRDD<K, V> readMemoryRDD(final Configuration configuration, final String memoryKey, final JavaSparkContext sparkContext) {
- final org.apache.hadoop.conf.Configuration hadoopConfiguration = ConfUtil.makeHadoopConfiguration(configuration);
- hadoopConfiguration.set(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION), Constants.getMemoryLocation(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION), memoryKey));
- return sparkContext.newAPIHadoopRDD(hadoopConfiguration,
+ return sparkContext.newAPIHadoopRDD(ConfUtil.makeHadoopConfiguration(configuration),
SequenceFileInputFormat.class,
ObjectWritable.class,
ObjectWritable.class)
[4/5] 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/d6e22ff9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/d6e22ff9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/d6e22ff9
Branch: refs/heads/TINKERPOP-962
Commit: d6e22ff901f2941ecb9e28a018a4686dc3588433
Parents: ffbecdb 580c683
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Feb 3 14:28:19 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Feb 3 14:28:19 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/dev/developer/contributing.asciidoc | 11 ++++++-----
gremlin-console/src/main/NOTICE | 12 ++++++++++--
.../traversal/traverser/LP_O_OB_S_SE_SL_Traverser.java | 3 +++
gremlin-server/src/main/NOTICE | 12 ++++++++++--
.../gremlin/spark/structure/io/InputFormatRDD.java | 6 +-----
6 files changed, 31 insertions(+), 14 deletions(-)
----------------------------------------------------------------------