You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ar...@apache.org on 2015/12/16 07:25:51 UTC
[1/3] storm git commit: STORM-1389 Removed creation of projection
tuples as they are already available.
Repository: storm
Updated Branches:
refs/heads/master 8b3c20846 -> aca41df15
STORM-1389 Removed creation of projection tuples as they are already available.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f3d1c088
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f3d1c088
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f3d1c088
Branch: refs/heads/master
Commit: f3d1c0888dbebb2b91f144b34443ecc0cd1a6069
Parents: 6d7b968
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Mon Dec 14 11:49:42 2015 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Mon Dec 14 11:49:42 2015 +0530
----------------------------------------------------------------------
.../storm/trident/planner/processor/StateQueryProcessor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f3d1c088/storm-core/src/jvm/storm/trident/planner/processor/StateQueryProcessor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/planner/processor/StateQueryProcessor.java b/storm-core/src/jvm/storm/trident/planner/processor/StateQueryProcessor.java
index 367ba5d..ee883c0 100644
--- a/storm-core/src/jvm/storm/trident/planner/processor/StateQueryProcessor.java
+++ b/storm-core/src/jvm/storm/trident/planner/processor/StateQueryProcessor.java
@@ -20,6 +20,7 @@ package storm.trident.planner.processor;
import backtype.storm.task.TopologyContext;
import backtype.storm.tuple.Fields;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import storm.trident.operation.TridentOperationContext;
@@ -81,7 +82,7 @@ public class StateQueryProcessor implements TridentProcessor {
public void finishBatch(ProcessorContext processorContext) {
BatchState state = (BatchState) processorContext.state[_context.getStateIndex()];
if(!state.tuples.isEmpty()) {
- List<Object> results = _function.batchRetrieve(_state, state.args);
+ List<Object> results = _function.batchRetrieve(_state, Collections.unmodifiableList(state.args));
if(results.size()!=state.tuples.size()) {
throw new RuntimeException("Results size is different than argument size: " + results.size() + " vs " + state.tuples.size());
}
@@ -89,7 +90,7 @@ public class StateQueryProcessor implements TridentProcessor {
TridentTuple tuple = state.tuples.get(i);
Object result = results.get(i);
_collector.setContext(processorContext, tuple);
- _function.execute(_projection.create(tuple), result, _collector);
+ _function.execute(state.args.get(i), result, _collector);
}
}
}
[3/3] storm git commit: Added STORM-1389 to Changelog.
Posted by ar...@apache.org.
Added STORM-1389 to Changelog.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aca41df1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aca41df1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aca41df1
Branch: refs/heads/master
Commit: aca41df15f295beff8d149705ef5935e80bb211b
Parents: 9a9ab30
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Wed Dec 16 11:41:38 2015 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Wed Dec 16 11:41:38 2015 +0530
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/aca41df1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d95010b..c1917e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1389: Removed creation of projection tuples as they are already available
* STORM-1179: Create Maven Profiles for Integration Tests.
* STORM-1387: workers-artifacts directory configurable, and default to be under storm.log.dir.
* STORM-1211: Add trident state and query support for cassandra connector
[2/3] storm git commit: Merge branch 'STORM-1389' of
https://github.com/satishd/storm into STORM-1389
Posted by ar...@apache.org.
Merge branch 'STORM-1389' of https://github.com/satishd/storm into STORM-1389
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9a9ab302
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9a9ab302
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9a9ab302
Branch: refs/heads/master
Commit: 9a9ab302e7ce055b64c7c85fbc9fbced19b0c8dc
Parents: 8b3c208 f3d1c08
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Wed Dec 16 11:25:01 2015 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Wed Dec 16 11:25:01 2015 +0530
----------------------------------------------------------------------
.../storm/trident/planner/processor/StateQueryProcessor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------