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 2017/01/14 16:09:37 UTC
[1/2] tinkerpop git commit: Finalized some variables. CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master b0d2a277a -> 671bdbe49
Finalized some variables. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ed634267
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ed634267
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ed634267
Branch: refs/heads/master
Commit: ed63426770bc6dbfee863a7506cb4c9e11a72d05
Parents: c66424d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Jan 14 11:08:45 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Jan 14 11:08:45 2017 -0500
----------------------------------------------------------------------
.../process/traversal/util/ImmutableMetrics.java | 2 +-
.../process/traversal/util/MutableMetrics.java | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed634267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
index b02c26d..a563bbd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
@@ -59,7 +59,7 @@ public class ImmutableMetrics implements Metrics, Serializable {
@Override
public Map<String, Long> getCounts() {
- Map<String, Long> ret = new HashMap<>();
+ final Map<String, Long> ret = new HashMap<>();
for (Map.Entry<String, AtomicLong> count : counts.entrySet()) {
ret.put(count.getKey(), count.getValue().get());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed634267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
index 19e2069..47decf1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
@@ -54,7 +54,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
other.getNested().forEach(nested -> this.addNested(new MutableMetrics(nested)));
}
- public void addNested(MutableMetrics metrics) {
+ public void addNested(final MutableMetrics metrics) {
this.nested.put(metrics.getId(), metrics);
}
@@ -72,7 +72,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
this.tempTime = -1;
}
- public void incrementCount(String key, final long incr) {
+ public void incrementCount(final String key, final long incr) {
AtomicLong count = this.counts.get(key);
if (count == null) {
count = new AtomicLong();
@@ -81,15 +81,15 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
count.addAndGet(incr);
}
- public void setDuration(long dur, TimeUnit unit) {
+ public void setDuration(final long dur, final TimeUnit unit) {
this.durationNs = TimeUnit.NANOSECONDS.convert(dur, unit);
}
- public void setCount(String key, final long val) {
+ public void setCount(final String key, final long val) {
this.counts.put(key, new AtomicLong(val));
}
- public void aggregate(MutableMetrics other) {
+ public void aggregate(final MutableMetrics other) {
this.durationNs += other.durationNs;
for (Map.Entry<String, AtomicLong> otherCount : other.counts.entrySet()) {
AtomicLong thisCount = this.counts.get(otherCount.getKey());
@@ -149,7 +149,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
* @param key
* @param value
*/
- public void setAnnotation(String key, Object value) {
+ public void setAnnotation(final String key, final Object value) {
if (!(value instanceof String) && !(value instanceof Number)) {
throw new IllegalArgumentException("Metrics annotations only support String and Number values.");
}
@@ -157,7 +157,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
}
@Override
- public MutableMetrics getNested(String metricsId) {
+ public MutableMetrics getNested(final String metricsId) {
return (MutableMetrics) nested.get(metricsId);
}
@@ -189,7 +189,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
return clone;
}
- public void finish(long bulk) {
+ public void finish(final long bulk) {
stop();
incrementCount(TraversalMetrics.TRAVERSER_COUNT_ID, 1);
incrementCount(TraversalMetrics.ELEMENT_COUNT_ID, bulk);
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/671bdbe4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/671bdbe4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/671bdbe4
Branch: refs/heads/master
Commit: 671bdbe49c86926745546f580e4afe43b8c7ed2c
Parents: b0d2a27 ed63426
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Jan 14 11:09:22 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Jan 14 11:09:22 2017 -0500
----------------------------------------------------------------------
.../process/traversal/util/ImmutableMetrics.java | 2 +-
.../process/traversal/util/MutableMetrics.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------