You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/05/05 19:06:51 UTC

[1/2] incubator-tinkerpop git commit: Quick updates to javadoc.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 3c2e5faa2 -> dda39360b


Quick updates to javadoc.


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

Branch: refs/heads/master
Commit: c76fe3815fa1d4d00302adb4c75e14febae645f6
Parents: 2cb3381
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 5 13:04:13 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 5 13:04:13 2015 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/structure/io/gryo/GryoPool.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c76fe381/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
index 20e084a..bb38ca9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoPool.java
@@ -45,6 +45,11 @@ public class GryoPool {
     private Queue<GryoWriter> gryoWriters;
     private final GryoMapper mapper;
 
+    /**
+     * Create a pool of readers and writers from a {@code Configuration} object.  There are two configuration keys
+     * expected: "gremlin.io.registry" which defines a fully qualified class name of an {@link IoRegistry}
+     * implementation and the "gremlin.io.gryo.poolSize" which defines the initial size of the {@code GryoPool}.
+     */
     public GryoPool(final Configuration conf) {
         this(conf.getInt(CONFIG_IO_GRYO_POOL_SIZE, 256), Type.READER_WRITER, tryCreateIoRegistry(conf.getString(CONFIG_IO_REGISTRY, "")));
     }
@@ -53,7 +58,7 @@ public class GryoPool {
      * Create a pool of readers and writers of specified size and use the default {@link GryoMapper} (which means
      * that custom serializers from vendors will not be applied.
      *
-     * @param poolSize size of the pool.
+     * @param poolSize initial size of the pool.
      */
     public GryoPool(final int poolSize) {
         this(poolSize, Type.READER_WRITER, Optional.empty());
@@ -63,7 +68,7 @@ public class GryoPool {
      * Create a pool of a readers, writers or both of the specified size with an optional {@link IoRegistry} object
      * which would allow custom serializers to be registered to the pool.
      *
-     * @param poolSize size of the pool.
+     * @param poolSize initial size of the pool.
      * @param type the type of pool.
      * @param ioRegistry the registry to assign to each {@link GryoReader} and {@link GryoWriter} instances.
      */


[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/master'

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: dda39360baa9b540aa079ee60055e63b93c81203
Parents: c76fe38 3c2e5fa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 5 13:06:43 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 5 13:06:43 2015 -0400

----------------------------------------------------------------------
 docs/src/the-traversal.asciidoc                 | 77 ++++++++++++--------
 .../traversal/step/map/OrderLocalStep.java      |  2 +
 2 files changed, 49 insertions(+), 30 deletions(-)
----------------------------------------------------------------------