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/03/18 00:25:35 UTC
[1/3] incubator-tinkerpop git commit: If the HadoopPool hasn't been
initlized,
then initialize it with a default configuration. This ensures that this WARN
happens once and only once. The more troubling issue,
is why is the HadoopPool isn't getting initl
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 9f6df78f0 -> 034081afe
If the HadoopPool hasn't been initlized, then initialize it with a default configuration. This ensures that this WARN happens once and only once. The more troubling issue, is why is the HadoopPool isn't getting initlized for @rspitzer in Spark, but that is another ticket.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/035dc36f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/035dc36f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/035dc36f
Branch: refs/heads/master
Commit: 035dc36f4c0f077963949b5222650ee7b4497533
Parents: 636dc2b
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 11 07:43:43 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 11 07:43:43 2016 -0700
----------------------------------------------------------------------
.../tinkerpop/gremlin/hadoop/structure/io/HadoopPools.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/035dc36f/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/HadoopPools.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/HadoopPools.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/HadoopPools.java
index 49263ef..f09f703 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/HadoopPools.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/HadoopPools.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.hadoop.structure.io;
+import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil;
@@ -51,8 +52,10 @@ public final class HadoopPools {
}
public static GryoPool getGryoPool() {
- if (!INITIALIZED)
+ if (!INITIALIZED) {
HadoopGraph.LOGGER.warn("The " + HadoopPools.class.getSimpleName() + " has not been initialized, using the default pool"); // TODO: this is necessary because we can't get the pool intialized in the Merger code of the Hadoop process.
+ initialize(new BaseConfiguration());
+ }
return GRYO_POOL;
}
}
[3/3] incubator-tinkerpop git commit: updated CHANGELOG.
Posted by ok...@apache.org.
updated CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/034081af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/034081af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/034081af
Branch: refs/heads/master
Commit: 034081afe1aa055eaa82e2daeb17c1884d9b8f86
Parents: 8ae188f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Mar 17 17:25:28 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Mar 17 17:25:28 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/034081af/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a5aea3b..2077f9c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ TinkerPop 3.2.0 (XXX)
TinkerPop 3.2.0 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* If no configuration is provided to `HadoopPools` it uses the default configuration to create a pool once and only once per JVM.
* Added `GraphStep.addIds()` which is useful for `HasContainer` "fold ins."
* Added a static `GraphStep.processHashContainerIds()` helper for handling id-based `HasContainers`.
* `GraphStep` implementations should have `g.V().hasId(x)` and `g.V(x)` compile equivalently. (*breaking*)
[2/3] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-1217'
Posted by ok...@apache.org.
Merge branch 'TINKERPOP-1217'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8ae188fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8ae188fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8ae188fe
Branch: refs/heads/master
Commit: 8ae188fe0f0e2de6af0efe7c3efccf7ec19f072e
Parents: 9f6df78 035dc36
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Mar 17 17:24:23 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Mar 17 17:24:23 2016 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/hadoop/structure/io/HadoopPools.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------