[4/4] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/86b1be53 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/86b1be53 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/86b1be53 Branch: refs/heads/tp33 Commit: 86b1be53538def07deb337025467ee4b5e04dd37 Parents: 5b9b81f ca034f1 Author: Stephen Mallette Authored: Thu Oct 4 16:47:46 2018 -0400 Committer: Stephen Mallette Committed: Thu Oct 4 16:47:46 2018 -0400 -- .../apache/tinkerpop/gremlin/process/computer/GraphFilter.java | 5 +++-- .../traversal/strategy/optimization/GraphFilterStrategy.java| 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) --
[4/4] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/650f31f1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/650f31f1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/650f31f1 Branch: refs/heads/tp33 Commit: 650f31f1b8bee2ddfcda56afd41612a2e3d36b6a Parents: c10bde3 76c9aba Author: Stephen Mallette Authored: Wed Oct 3 06:12:56 2018 -0400 Committer: Stephen Mallette Committed: Wed Oct 3 06:12:56 2018 -0400 -- .../traversal/dsl/graph/GraphTraversal.java | 48 .../step/sideEffect/SideEffectCapStep.java | 4 +- 2 files changed, 30 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/650f31f1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java --
[4/4] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bf79a49a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bf79a49a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bf79a49a Branch: refs/heads/tp33 Commit: bf79a49a06c6af836d989a81f847408debc3473b Parents: 84777d4 0426797 Author: Stephen Mallette Authored: Fri Sep 21 15:37:55 2018 -0400 Committer: Stephen Mallette Committed: Fri Sep 21 15:37:55 2018 -0400 -- CHANGELOG.asciidoc | 1 + .../Gremlin.Net/Driver/WebSocketConnection.cs| 19 --- 2 files changed, 17 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf79a49a/CHANGELOG.asciidoc --
[4/4] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b34515a9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b34515a9 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b34515a9 Branch: refs/heads/tp33 Commit: b34515a91b2055bef3c4561da65b2a1c5f8617ae Parents: b46c295 ca3a343 Author: Robert Dale Authored: Wed Aug 22 12:42:46 2018 -0400 Committer: Robert Dale Committed: Wed Aug 22 12:42:46 2018 -0400 -- .../jsr223/AbstractGremlinScriptEngineFactory.java | 6 +++--- .../process/traversal/dsl/GremlinDslProcessor.java | 12 +++- .../traversal/util/DefaultTraversalMetrics.java | 16 +--- 3 files changed, 19 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b34515a9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b34515a9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java -- diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java index ae0bd8e,055e3ab..bfcfacc --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java @@@ -286,10 -188,121 +287,11 @@@ public final class DefaultTraversalMetr private static String padLeft(final String text, final int amountToPad) { // not sure why this method needed to exist. stupid string format stuff and commons utilities wouldn't // work for some reason in the context this method was used above. - String newText = text; + final StringBuilder newText = new StringBuilder(); for (int ix = 0; ix < amountToPad; ix++) { - newText = " " + newText; + newText.append(" "); } - return newText; + newText.append(text); + return newText.toString(); } - -private void computeTotals() { -// Create temp list of ordered metrics -final List tempMetrics = new ArrayList<>(this.metrics.size()); -for (final String label : this.indexToLabelMap.values()) { -// The indexToLabelMap is sorted by index (key) -tempMetrics.add(this.metrics.get(label).clone()); -} - -// Calculate total duration -this.totalStepDuration = 0; -tempMetrics.forEach(metric -> this.totalStepDuration += metric.getDuration(MutableMetrics.SOURCE_UNIT)); - -// Assign %'s -tempMetrics.forEach(m -> { -final double dur = m.getDuration(TimeUnit.NANOSECONDS) * 100.d / this.totalStepDuration; -m.setAnnotation(PERCENT_DURATION_KEY, dur); -}); - -// Store immutable instances of the calculated metrics -this.computedMetrics = new LinkedHashMap<>(this.metrics.size()); -tempMetrics.forEach(it -> this.computedMetrics.put(it.getId(), it.getImmutableClone())); -} - -public static DefaultTraversalMetrics merge(final Iterator toMerge) { -final DefaultTraversalMetrics newTraversalMetrics = new DefaultTraversalMetrics(); - -// iterate the incoming TraversalMetrics -toMerge.forEachRemaining(inTraversalMetrics -> { -// aggregate the internal Metrics -inTraversalMetrics.metrics.forEach((metricsId, toAggregate) -> { - -MutableMetrics aggregateMetrics = newTraversalMetrics.metrics.get(metricsId); -if (null == aggregateMetrics) { -// need to create a Metrics to aggregate into -aggregateMetrics = new MutableMetrics(toAggregate.getId(), toAggregate.getName()); - -newTraversalMetrics.metrics.put(metricsId, aggregateMetrics); -// Set the index of the Metrics -for (final Map.Entry entry : inTraversalMetrics.indexToLabelMap.entrySet()) { -if (metricsId.equals(entry.getValue())) { - newTraversalMetrics.indexToLabelMap.put(entry.getKey(), metricsId); -break; -} -} -} -aggregateMetrics.aggregate(toAggregate); -}); -}); -return newTraversalMetrics; -} - -public void setMetrics(final Traversal.Admin traversal,
[4/4] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bf07f13b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bf07f13b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bf07f13b Branch: refs/heads/tp33 Commit: bf07f13b50ad9ac49d6815bebc5ab82ed4b2e8a7 Parents: 1f15781 b0c836b Author: Jorge Bay Gondra Authored: Thu Jul 12 11:52:54 2018 +0200 Committer: Jorge Bay Gondra Committed: Thu Jul 12 11:52:54 2018 +0200 -- CHANGELOG.asciidoc | 1 + .../lib/driver/driver-remote-connection.js | 20 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf07f13b/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf07f13b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js --
[4/4] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Conflicts: gremlin-javascript/src/main/javascript/gremlin-javascript/package.json Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46be1351 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46be1351 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46be1351 Branch: refs/heads/tp33 Commit: 46be13518fd32a58118f1fa09a52e794114fb765 Parents: 39c3365 df7870a Author: Stephen MalletteAuthored: Mon Apr 9 11:31:25 2018 -0400 Committer: Stephen Mallette Committed: Mon Apr 9 11:31:25 2018 -0400 -- docs/src/dev/developer/release.asciidoc | 5 + gremlin-javascript/glv/PackageJson.template | 2 +- gremlin-javascript/pom.xml| 10 +- .../src/main/javascript/gremlin-javascript/README.md | 2 +- .../src/main/javascript/gremlin-javascript/package.json | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/docs/src/dev/developer/release.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/gremlin-javascript/pom.xml -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json -- diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json index 004f307,9a6197c..76a2dd6 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json @@@ -1,6 -1,6 +1,6 @@@ { - "name": "gremlin-javascript", + "name": "gremlin", - "version": "3.2.9-alpha1", + "version": "3.3.3-alpha1", "description": "JavaScript Gremlin Language Variant", "author": "Apache TinkerPop team", "keywords": [