Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-2861] Fields grouping on split streams fails
This closes #1387
- Loading branch information
Showing
9 changed files
with
295 additions
and
28 deletions.
There are no files selected for viewing
72 changes: 72 additions & 0 deletions
72
...-storm-examples/src/test/java/org/apache/flink/storm/tests/StormFieldsGroupingITCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.flink.storm.tests; | ||
|
|
||
| import backtype.storm.tuple.Fields; | ||
| import backtype.storm.utils.Utils; | ||
|
|
||
| import org.apache.flink.storm.api.FlinkLocalCluster; | ||
| import org.apache.flink.storm.api.FlinkTopologyBuilder; | ||
| import org.apache.flink.storm.tests.operators.FiniteRandomSpout; | ||
| import org.apache.flink.storm.tests.operators.TaskIdBolt; | ||
| import org.apache.flink.storm.util.BoltFileSink; | ||
| import org.apache.flink.storm.util.StormTestBase; | ||
|
|
||
| public class StormFieldsGroupingITCase extends StormTestBase { | ||
|
|
||
| private final static String topologyId = "FieldsGrouping Test"; | ||
| private final static String spoutId = "spout"; | ||
| private final static String boltId = "bolt"; | ||
| private final static String sinkId = "sink"; | ||
| private String resultPath; | ||
|
|
||
| @Override | ||
| protected void preSubmit() throws Exception { | ||
| this.resultPath = this.getTempDirPath("result"); | ||
| } | ||
|
|
||
| @Override | ||
| protected void postSubmit() throws Exception { | ||
| compareResultsByLinesInMemory("4> -1930858313\n" + "4> 1431162155\n" + "4> 1654374947\n" | ||
| + "4> -65105105\n" + "3> -1155484576\n" + "3> 1033096058\n" + "3> -1557280266\n" | ||
| + "3> -1728529858\n" + "3> -518907128\n" + "3> -252332814", this.resultPath); | ||
| } | ||
|
|
||
| @Override | ||
| protected void testProgram() throws Exception { | ||
| final String[] tokens = this.resultPath.split(":"); | ||
| final String outputFile = tokens[tokens.length - 1]; | ||
|
|
||
| final FlinkTopologyBuilder builder = new FlinkTopologyBuilder(); | ||
|
|
||
| builder.setSpout(spoutId, new FiniteRandomSpout(0, 10, 2)); | ||
| builder.setBolt(boltId, new TaskIdBolt(), 2).fieldsGrouping( | ||
| spoutId, FiniteRandomSpout.STREAM_PREFIX + 0, new Fields("number")); | ||
| builder.setBolt(sinkId, new BoltFileSink(outputFile)).shuffleGrouping(boltId); | ||
|
|
||
| final FlinkLocalCluster cluster = FlinkLocalCluster.getLocalCluster(); | ||
| cluster.submitTopology(topologyId, null, builder.createTopology()); | ||
|
|
||
| Utils.sleep(10 * 1000); | ||
|
|
||
| // TODO kill does no do anything so far | ||
| cluster.killTopology(topologyId); | ||
| cluster.shutdown(); | ||
| } | ||
|
|
||
| } |
86 changes: 86 additions & 0 deletions
86
...torm-examples/src/test/java/org/apache/flink/storm/tests/operators/FiniteRandomSpout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.flink.storm.tests.operators; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Random; | ||
|
|
||
| import org.apache.flink.storm.util.FiniteSpout; | ||
|
|
||
| import backtype.storm.spout.SpoutOutputCollector; | ||
| import backtype.storm.task.TopologyContext; | ||
| import backtype.storm.topology.OutputFieldsDeclarer; | ||
| import backtype.storm.topology.base.BaseRichSpout; | ||
| import backtype.storm.tuple.Fields; | ||
| import backtype.storm.tuple.Values; | ||
| import backtype.storm.utils.Utils; | ||
|
|
||
| public class FiniteRandomSpout extends BaseRichSpout implements FiniteSpout { | ||
| private static final long serialVersionUID = 6592885571932363239L; | ||
|
|
||
| public static final String STREAM_PREFIX = "stream_"; | ||
|
|
||
| private final Random r; | ||
| private SpoutOutputCollector collector; | ||
| private int counter; | ||
| private final String[] outputStreams; | ||
|
|
||
| public FiniteRandomSpout(long seed, int counter, int numberOfOutputStreams) { | ||
| this.r = new Random(seed); | ||
| this.counter = counter; | ||
| if (numberOfOutputStreams < 1) { | ||
| this.outputStreams = new String[] { Utils.DEFAULT_STREAM_ID }; | ||
| } else { | ||
| this.outputStreams = new String[numberOfOutputStreams]; | ||
| for (int i = 0; i < this.outputStreams.length; ++i) { | ||
| this.outputStreams[i] = STREAM_PREFIX + i; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public FiniteRandomSpout(long seed, int counter) { | ||
| this(seed, counter, 1); | ||
| } | ||
|
|
||
| @SuppressWarnings("rawtypes") | ||
| @Override | ||
| public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { | ||
| this.collector = collector; | ||
| } | ||
|
|
||
| @Override | ||
| public void nextTuple() { | ||
| for (String s : this.outputStreams) { | ||
| this.collector.emit(s, new Values(this.r.nextInt())); | ||
| } | ||
| --this.counter; | ||
| } | ||
|
|
||
| @Override | ||
| public void declareOutputFields(OutputFieldsDeclarer declarer) { | ||
| for (String s : this.outputStreams) { | ||
| declarer.declareStream(s, new Fields("number")); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean reachedEnd() { | ||
| return this.counter <= 0; | ||
| } | ||
|
|
||
| } |
53 changes: 53 additions & 0 deletions
53
...flink-storm-examples/src/test/java/org/apache/flink/storm/tests/operators/TaskIdBolt.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.flink.storm.tests.operators; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import backtype.storm.task.OutputCollector; | ||
| import backtype.storm.task.TopologyContext; | ||
| import backtype.storm.topology.OutputFieldsDeclarer; | ||
| import backtype.storm.topology.base.BaseRichBolt; | ||
| import backtype.storm.tuple.Fields; | ||
| import backtype.storm.tuple.Tuple; | ||
| import backtype.storm.tuple.Values; | ||
|
|
||
| public class TaskIdBolt extends BaseRichBolt { | ||
| private static final long serialVersionUID = -7966475984592762720L; | ||
|
|
||
| private OutputCollector collector; | ||
| private int thisTaskId; | ||
|
|
||
| @SuppressWarnings("rawtypes") | ||
| @Override | ||
| public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) { | ||
| this.collector = collector; | ||
| this.thisTaskId = context.getThisTaskId(); | ||
| } | ||
|
|
||
| @Override | ||
| public void execute(Tuple input) { | ||
| this.collector.emit(new Values(this.thisTaskId + "> " + input.getValue(0))); | ||
| } | ||
|
|
||
| @Override | ||
| public void declareOutputFields(OutputFieldsDeclarer declarer) { | ||
| declarer.declare(new Fields("number")); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.