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/09/12 03:14:46 UTC
[1/3] storm git commit: STORM-2086:use DefaultTopicSelector instead
of creating a new one
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch 7f5650148 -> 870cae4f4
STORM-2086:use DefaultTopicSelector instead of creating a new one
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/687ac5a8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/687ac5a8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/687ac5a8
Branch: refs/heads/1.0.x-branch
Commit: 687ac5a8e38de365eb037eee00072f9f730b675e
Parents: 7f56501
Author: Xin Wang <be...@163.com>
Authored: Wed Sep 7 16:27:28 2016 +0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 12 12:14:15 2016 +0900
----------------------------------------------------------------------
.../storm/sql/kafka/KafkaDataSourcesProvider.java | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/687ac5a8/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java
----------------------------------------------------------------------
diff --git a/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java b/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java
index 0236948..d45d03c 100644
--- a/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java
+++ b/external/sql/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java
@@ -26,6 +26,7 @@ import org.apache.storm.kafka.trident.OpaqueTridentKafkaSpout;
import org.apache.storm.kafka.trident.TridentKafkaConfig;
import org.apache.storm.kafka.trident.TridentKafkaState;
import org.apache.storm.kafka.trident.mapper.TridentTupleToKafkaMapper;
+import org.apache.storm.kafka.trident.selector.DefaultTopicSelector;
import org.apache.storm.kafka.trident.selector.KafkaTopicSelector;
import org.apache.storm.trident.operation.BaseFunction;
import org.apache.storm.trident.operation.Function;
@@ -46,18 +47,6 @@ import java.util.*;
*/
public class KafkaDataSourcesProvider implements DataSourcesProvider {
private static final int DEFAULT_ZK_PORT = 2181;
- private static class StaticTopicSelector implements KafkaTopicSelector {
- private final String topic;
-
- private StaticTopicSelector(String topic) {
- this.topic = topic;
- }
-
- @Override
- public String getTopic(TridentTuple tuple) {
- return topic;
- }
- }
private static class SqlKafkaMapper implements TridentTupleToKafkaMapper<Object, ByteBuffer> {
private final int primaryKeyIndex;
@@ -104,7 +93,7 @@ public class KafkaDataSourcesProvider implements DataSourcesProvider {
JsonSerializer serializer = new JsonSerializer(fieldNames);
SqlKafkaMapper m = new SqlKafkaMapper(primaryKeyIndex, serializer);
state = new TridentKafkaState()
- .withKafkaTopicSelector(new StaticTopicSelector(topic))
+ .withKafkaTopicSelector(new DefaultTopicSelector(topic))
.withTridentTupleToKafkaMapper(m);
state.prepare(producerProperties);
}
[2/3] storm git commit: Merge branch 'STORM-2086-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2086-1.0.x' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cdc77566
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cdc77566
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cdc77566
Branch: refs/heads/1.0.x-branch
Commit: cdc7756669ed3fe5c732fa6d04cecd72a79e7bee
Parents: 7f56501 687ac5a
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 12 12:14:19 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 12 12:14:19 2016 +0900
----------------------------------------------------------------------
.../storm/sql/kafka/KafkaDataSourcesProvider.java | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-2086 to CHANGELOG
Posted by ka...@apache.org.
add STORM-2086 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/870cae4f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/870cae4f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/870cae4f
Branch: refs/heads/1.0.x-branch
Commit: 870cae4f488f91f8dfc40d46989cc928c0b23431
Parents: cdc7756
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 12 12:14:34 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 12 12:14:34 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/870cae4f/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d550c68..cd39303 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2086: use DefaultTopicSelector instead of creating a new one
* STORM-2079: Unneccessary readStormConfig operation
* STORM-2081: create external directory for storm-sql various data sources and move storm-sql-kafka to it
* STORM-2070: Fix sigar native binary download link