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 2015/02/19 01:16:36 UTC
incubator-tinkerpop git commit: replaced null with Double.NaN in Min-
and MaxStep
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 31d1a4cae -> a230f02fa
replaced null with Double.NaN in Min- and MaxStep
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a230f02f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a230f02f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a230f02f
Branch: refs/heads/master
Commit: a230f02fafe79a53074859eae23aab16fc3584a2
Parents: 31d1a4c
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Feb 19 01:15:11 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Feb 19 01:15:11 2015 +0100
----------------------------------------------------------------------
.../gremlin/process/graph/traversal/step/map/MaxGlobalStep.java | 2 +-
.../gremlin/process/graph/traversal/step/map/MaxLocalStep.java | 2 +-
.../gremlin/process/graph/traversal/step/map/MinGlobalStep.java | 2 +-
.../gremlin/process/graph/traversal/step/map/MinLocalStep.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a230f02f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
index e303441..1cefcf5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
@@ -123,7 +123,7 @@ public final class MaxGlobalStep<S extends Number> extends ReducingBarrierStep<S
@Override
public Number generateFinalResult(final Iterator<KeyValue<NullObject, Number>> keyValues) {
- return keyValues.hasNext() ? keyValues.next().getValue() : null;
+ return keyValues.hasNext() ? keyValues.next().getValue() : Double.NaN;
}
public static final MaxMapReduce instance() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a230f02f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java
index 3989128..dcafe1a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java
@@ -47,7 +47,7 @@ public final class MaxLocalStep<E extends Number, S extends Iterable<E>> extends
if (result.doubleValue() < curr.doubleValue()) result = curr;
}
} else {
- result = null;
+ result = Double.NaN;
}
return (E) result;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a230f02f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinGlobalStep.java
index 55be825..111fe45 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinGlobalStep.java
@@ -123,7 +123,7 @@ public final class MinGlobalStep<S extends Number> extends ReducingBarrierStep<S
@Override
public Number generateFinalResult(final Iterator<KeyValue<NullObject, Number>> keyValues) {
- return keyValues.hasNext() ? keyValues.next().getValue() : null;
+ return keyValues.hasNext() ? keyValues.next().getValue() : Double.NaN;
}
public static final MinMapReduce instance() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a230f02f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java
index 8b4840d..2dc970f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java
@@ -47,7 +47,7 @@ public final class MinLocalStep<E extends Number, S extends Iterable<E>> extends
if (result.doubleValue() > curr.doubleValue()) result = curr;
}
} else {
- result = null;
+ result = Double.NaN;
}
return (E) result;
}