You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/10/02 00:54:36 UTC
[2/3] git commit: STORM-428: fixed TridentKafkaTest
STORM-428: fixed TridentKafkaTest
* added changelog entry
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9553b148
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9553b148
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9553b148
Branch: refs/heads/master
Commit: 9553b1486b35b35d5895ded1cc892096aadf3055
Parents: d2ca0b3
Author: wurstmeister <wu...@users.noreply.github.com>
Authored: Thu Sep 25 23:13:58 2014 +0100
Committer: wurstmeister <wu...@users.noreply.github.com>
Committed: Thu Sep 25 23:26:35 2014 +0100
----------------------------------------------------------------------
CHANGELOG.md | 1 +
.../storm-kafka/src/test/storm/kafka/TridentKafkaTest.java | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9553b148/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01d7be9..605a7da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@
* STORM-501: Missing StormSubmitter API
* STORM-493: Workers inherit storm.conf.file/storm.options properties of their supervisor
* STORM-498: make ZK connection timeout configurable in Kafka spout
+ * STORM-428: extracted ITuple interface
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
http://git-wip-us.apache.org/repos/asf/storm/blob/9553b148/external/storm-kafka/src/test/storm/kafka/TridentKafkaTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/TridentKafkaTest.java b/external/storm-kafka/src/test/storm/kafka/TridentKafkaTest.java
index 064d598..d8a5e24 100644
--- a/external/storm-kafka/src/test/storm/kafka/TridentKafkaTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/TridentKafkaTest.java
@@ -18,7 +18,7 @@
package storm.kafka;
import backtype.storm.Config;
-import com.google.common.collect.Lists;
+import backtype.storm.tuple.Fields;
import kafka.javaapi.consumer.SimpleConsumer;
import org.junit.After;
import org.junit.Before;
@@ -28,8 +28,8 @@ import storm.kafka.trident.mapper.FieldNameBasedTupleToKafkaMapper;
import storm.kafka.trident.mapper.TridentTupleToKafkaMapper;
import storm.kafka.trident.selector.DefaultTopicSelector;
import storm.kafka.trident.selector.KafkaTopicSelector;
-import storm.trident.testing.MockTridentTuple;
import storm.trident.tuple.TridentTuple;
+import storm.trident.tuple.TridentTupleView;
import java.util.ArrayList;
import java.util.List;
@@ -38,7 +38,6 @@ public class TridentKafkaTest {
private KafkaTestBroker broker;
private TridentKafkaState state;
private Config config;
- private KafkaConfig kafkaConfig;
private SimpleConsumer simpleConsumer;
private TridentTupleToKafkaMapper mapper;
private KafkaTopicSelector topicSelector;
@@ -73,10 +72,8 @@ public class TridentKafkaTest {
private List<TridentTuple> generateTupleBatch(String key, String message, int batchsize) {
List<TridentTuple> batch = new ArrayList<TridentTuple>();
- List<String> values = Lists.newArrayList(key, message);
- List<String> fields = Lists.newArrayList("key", "message");
for(int i =0 ; i < batchsize; i++) {
- batch.add(new MockTridentTuple(fields, values));
+ batch.add(TridentTupleView.createFreshTuple(new Fields("key", "message"), key, message));
}
return batch;
}