You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ec...@apache.org on 2018/11/12 08:39:13 UTC
[beam] 01/01: Merge pull request #6955 from
echauchot/BEAM-5961-fixups
This is an automated email from the ASF dual-hosted git repository.
echauchot pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
commit eba2c88cfbd824b142a0c8c1dfef35e3675bf1f2
Merge: 1b7a7a1 b4bde8f
Author: Etienne Chauchot <ec...@apache.org>
AuthorDate: Mon Nov 12 09:39:02 2018 +0100
Merge pull request #6955 from echauchot/BEAM-5961-fixups
Merge pull request #6955: [BEAM-5817] Fix javadoc for BoundedSideInputJoinModel.Simulator and NexmarkUtilsTest
.../org/apache/beam/sdk/nexmark/queries/BoundedSideInputJoinModel.java | 2 +-
.../src/test/java/org/apache/beam/sdk/nexmark/NexmarkUtilsTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --cc sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/BoundedSideInputJoinModel.java
index e1555ee,613517e..f36fee9
--- a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/BoundedSideInputJoinModel.java
+++ b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/BoundedSideInputJoinModel.java
@@@ -26,9 -26,9 +26,9 @@@ import org.apache.beam.sdk.nexmark.mode
import org.apache.beam.sdk.values.TimestampedValue;
/** A direct implementation of {@link BoundedSideInputJoin}. */
-public class BoundedSideInputJoinModel extends NexmarkQueryModel {
+public class BoundedSideInputJoinModel extends NexmarkQueryModel<Bid> {
- /** Simulator for query 0. */
+ /** Simulator for BOUNDED_SIDE_INPUT_JOIN query. */
private static class Simulator extends AbstractSimulator<Event, Bid> {
private final NexmarkConfiguration configuration;