You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/12/27 08:25:42 UTC
[1/3] storm git commit: STORM-2256. storm-pmml breaks on java 1.7.
Repository: storm
Updated Branches:
refs/heads/1.x-branch a2fe4e496 -> 2aed0f6c7
STORM-2256. storm-pmml breaks on java 1.7.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f8b986b5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f8b986b5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f8b986b5
Branch: refs/heads/1.x-branch
Commit: f8b986b5719278084e09f949a9ac77e89077367c
Parents: a2fe4e4
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Dec 25 23:16:29 2016 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Dec 25 23:16:29 2016 -0800
----------------------------------------------------------------------
.../org/apache/storm/pmml/runner/jpmml/JPmmlModelRunner.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f8b986b5/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JPmmlModelRunner.java
----------------------------------------------------------------------
diff --git a/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JPmmlModelRunner.java b/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JPmmlModelRunner.java
index 7431e36..ef98683 100644
--- a/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JPmmlModelRunner.java
+++ b/external/storm-pmml/src/main/java/org/apache/storm/pmml/runner/jpmml/JPmmlModelRunner.java
@@ -82,7 +82,9 @@ public class JPmmlModelRunner implements PmmlModelRunner<Tuple,
LOG.debug("Pre processing raw inputs: = [{}]", rawInputs);
final Map<FieldName, FieldValue> preProcInputs = new LinkedHashMap<>();
for (Map.Entry<FieldName, Object> rawEntry : rawInputs.entrySet()) {
- preProcInputs.putIfAbsent(rawEntry.getKey(), EvaluatorUtil.prepare(eval, rawEntry.getKey(), rawEntry.getValue()));
+ if (!preProcInputs.containsKey(rawEntry.getKey())) {
+ preProcInputs.put(rawEntry.getKey(), EvaluatorUtil.prepare(eval, rawEntry.getKey(), rawEntry.getValue()));
+ }
}
LOG.debug("Pre processed inputs = [{}]", preProcInputs);
return preProcInputs;
[3/3] storm git commit: STORM-2256: CHANGELOG
Posted by ka...@apache.org.
STORM-2256: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2aed0f6c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2aed0f6c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2aed0f6c
Branch: refs/heads/1.x-branch
Commit: 2aed0f6c71ebaf32708f9292dd6e3f08f4fc28e8
Parents: a5101b5
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Dec 27 17:25:24 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Dec 27 17:25:24 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2aed0f6c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d06692f..a9e5305 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.1.0
+ * STORM-2256: storm-pmml breaks on java 1.7
* STORM-2223: PMML Bolt.
* STORM-2222: Repeated NPEs thrown in nimbus if rebalance fails
* STORM-2190: reduce contention between submission and scheduling
[2/3] storm git commit: Merge branch 'STORM-2256' of
https://github.com/harshach/incubator-storm into STORM-2256-1.x
Posted by ka...@apache.org.
Merge branch 'STORM-2256' of https://github.com/harshach/incubator-storm into STORM-2256-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a5101b51
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a5101b51
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a5101b51
Branch: refs/heads/1.x-branch
Commit: a5101b51dbe76ca620dfbce29648d3ea62a2ee7b
Parents: a2fe4e4 f8b986b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Dec 26 18:33:27 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Dec 26 18:33:27 2016 +0900
----------------------------------------------------------------------
.../org/apache/storm/pmml/runner/jpmml/JPmmlModelRunner.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------