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 2017/09/19 22:56:25 UTC
[1/2] storm git commit: STORM-2712: accept arbitrary number of rows
per tuple in storm-cassandra
Repository: storm
Updated Branches:
refs/heads/1.1.x-branch 3d6727a57 -> 7f627729c
STORM-2712: accept arbitrary number of rows per tuple in storm-cassandra
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4449b3cf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4449b3cf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4449b3cf
Branch: refs/heads/1.1.x-branch
Commit: 4449b3cf28d398cb42f8e16c8bfc375dd20484bc
Parents: 3d6727a
Author: morokosi <mo...@gmail.com>
Authored: Mon Aug 28 22:59:14 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Sep 20 07:55:11 2017 +0900
----------------------------------------------------------------------
.../cassandra/trident/state/TridentResultSetValuesMapper.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4449b3cf/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java
index 9e41413..69cd6f8 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java
@@ -44,6 +44,8 @@ public class TridentResultSetValuesMapper implements CQLResultSetValuesMapper {
@Override
public List<List<Values>> map(Session session, Statement statement, ITuple tuple) {
List<List<Values>> list = new ArrayList<>();
+ List<Values> innerList = new LinkedList<>();
+ list.add(innerList);
ResultSet resultSet = session.execute(statement);
for (Row row : resultSet) {
final Values values = new Values();
@@ -54,9 +56,7 @@ public class TridentResultSetValuesMapper implements CQLResultSetValuesMapper {
values.add(row.getObject(field));
}
}
- list.add(new LinkedList<Values>() {{
- add(values);
- }});
+ innerList.add(values);
}
return list;
}
[2/2] storm git commit: Merge branch 'STORM-2712-1.1.x-merge' into
1.1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2712-1.1.x-merge' into 1.1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7f627729
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7f627729
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7f627729
Branch: refs/heads/1.1.x-branch
Commit: 7f627729cfe0bc2c137a3cbd170d29c1e9107527
Parents: 3d6727a 4449b3c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Sep 20 07:55:19 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Sep 20 07:55:19 2017 +0900
----------------------------------------------------------------------
.../cassandra/trident/state/TridentResultSetValuesMapper.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------