jstorm-runner: fix compilation error and remove obsolete method.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/78a5076a Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/78a5076a Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/78a5076a Branch: refs/heads/jstorm-runner Commit: 78a5076a6951a697922aceaabc1e32dd20c8de36 Parents: 4ff42cb Author: basti.lj <[email protected]> Authored: Fri Jul 14 10:29:00 2017 +0800 Committer: Pei He <[email protected]> Committed: Sat Aug 19 12:02:56 2017 +0800 ---------------------------------------------------------------------- .../beam/runners/jstorm/JStormRunner.java | 4 ++-- .../serialization/ImmutableListSerializer.java | 21 -------------------- 2 files changed, 2 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/78a5076a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunner.java ---------------------------------------------------------------------- diff --git a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunner.java b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunner.java index 5fdbe4d..5375d6e 100644 --- a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunner.java +++ b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/JStormRunner.java @@ -38,7 +38,7 @@ import org.apache.beam.runners.jstorm.serialization.KvStoreIterableSerializer; import org.apache.beam.runners.jstorm.serialization.SdkRepackImmuListSerializer; import org.apache.beam.runners.jstorm.serialization.SdkRepackImmuSetSerializer; import org.apache.beam.runners.jstorm.serialization.UnmodifiableCollectionsSerializer; -import org.apache.beam.runners.jstorm.translation.StormPipelineTranslator; +import org.apache.beam.runners.jstorm.translation.JStormPipelineTranslator; import org.apache.beam.runners.jstorm.translation.TranslationContext; import org.apache.beam.runners.jstorm.translation.runtime.AbstractComponent; import org.apache.beam.runners.jstorm.translation.runtime.AdaptorBasicBolt; @@ -114,7 +114,7 @@ public class JStormRunner extends PipelineRunner<JStormRunnerResult> { public JStormRunnerResult run(Pipeline pipeline) { LOG.info("Running pipeline..."); TranslationContext context = new TranslationContext(this.options); - StormPipelineTranslator transformer = new StormPipelineTranslator(context); + JStormPipelineTranslator transformer = new JStormPipelineTranslator(context); transformer.translate(pipeline); LOG.info("UserGraphContext=\n{}", context.getUserGraphContext()); LOG.info("ExecutionGraphContext=\n{}", context.getExecutionGraphContext()); http://git-wip-us.apache.org/repos/asf/beam/blob/78a5076a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/serialization/ImmutableListSerializer.java ---------------------------------------------------------------------- diff --git a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/serialization/ImmutableListSerializer.java b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/serialization/ImmutableListSerializer.java index fa4eeb6..c479f26 100644 --- a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/serialization/ImmutableListSerializer.java +++ b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/serialization/ImmutableListSerializer.java @@ -60,49 +60,28 @@ public class ImmutableListSerializer extends Serializer<ImmutableList<Object>> { // Used by return value of #values() when there are multiple cells config.registerSerialization(ImmutableList.class, ImmutableListSerializer.class); - config.registerSerialization( - RunnerUtils.getBeamSdkRepackClass(ImmutableList.class), ImmutableListSerializer.class); // Note: // Only registering above is good enough for serializing/deserializing. // but if using Kryo#copy, following is required. config.registerSerialization(ImmutableList.of().getClass(), ImmutableListSerializer.class); - config.registerSerialization( - RunnerUtils.getBeamSdkRepackClass(ImmutableList.of().getClass()), - ImmutableListSerializer.class); config.registerSerialization(ImmutableList.of(1).getClass(), ImmutableListSerializer.class); config.registerSerialization( - RunnerUtils.getBeamSdkRepackClass(ImmutableList.of(1).getClass()), - ImmutableListSerializer.class); - config.registerSerialization( ImmutableList.of(1, 2, 3).subList(1, 2).getClass(), ImmutableListSerializer.class); config.registerSerialization( - RunnerUtils.getBeamSdkRepackClass(ImmutableList.of(1, 2, 3).subList(1, 2).getClass()), - ImmutableListSerializer.class); - config.registerSerialization( ImmutableList.of().reverse().getClass(), ImmutableListSerializer.class); - config.registerSerialization( - RunnerUtils.getBeamSdkRepackClass(ImmutableList.of().reverse().getClass()), - ImmutableListSerializer.class); config.registerSerialization( Lists.charactersOf("KryoRocks").getClass(), ImmutableListSerializer.class); - config.registerSerialization( - RunnerUtils.getBeamSdkRepackClass(Lists.charactersOf("KryoRocks").getClass()), - ImmutableListSerializer.class); Table<Integer, Integer, Integer> baseTable = HashBasedTable.create(); baseTable.put(1, 2, 3); baseTable.put(4, 5, 6); Table<Integer, Integer, Integer> table = ImmutableTable.copyOf(baseTable); config.registerSerialization(table.values().getClass(), ImmutableListSerializer.class); - config.registerSerialization( - RunnerUtils.getBeamSdkRepackClass(table.values().getClass()), - ImmutableListSerializer.class); - } }
