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
The following commit(s) were added to refs/heads/master by this push:
new 6122341 Nexmark: fix typos and clean unused options
new 4507139 Merge pull request #13403 from
rHermes/nexmark-misc-improvements
6122341 is described below
commit 612234198071a3c2ab76dd8386529f7b53ac4efc
Author: rHermes <[email protected]>
AuthorDate: Sun Nov 22 09:40:29 2020 +0100
Nexmark: fix typos and clean unused options
This removes some unused options from launcher, fixes the
justModelResultRate mode by fixing the formatting string, uses the right
name for the SessionSideInputJoin and renames the argument in one
launcher option, just for consistency.
---
.../beam/sdk/nexmark/NexmarkConfiguration.java | 2 +-
.../apache/beam/sdk/nexmark/NexmarkLauncher.java | 4 +--
.../apache/beam/sdk/nexmark/NexmarkOptions.java | 30 +---------------------
.../sdk/nexmark/queries/SessionSideInputJoin.java | 2 +-
4 files changed, 5 insertions(+), 33 deletions(-)
diff --git
a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkConfiguration.java
b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkConfiguration.java
index db9586a..1108eb6 100644
---
a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkConfiguration.java
+++
b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkConfiguration.java
@@ -320,7 +320,7 @@ public class NexmarkConfiguration implements Serializable {
fanout = options.getFanout();
}
if (options.getMaxAuctionsWaitingTime() != null) {
- fanout = options.getMaxAuctionsWaitingTime();
+ maxAuctionsWaitingTime = options.getMaxAuctionsWaitingTime();
}
if (options.getOccasionalDelaySec() != null) {
occasionalDelaySec = options.getOccasionalDelaySec();
diff --git
a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkLauncher.java
b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkLauncher.java
index 4ddeb34..fd2044f 100644
---
a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkLauncher.java
+++
b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkLauncher.java
@@ -1101,10 +1101,10 @@ public class NexmarkLauncher<OptionT extends
NexmarkOptions> {
Collections.sort(counts);
int n = counts.size();
if (n < 5) {
- NexmarkUtils.console("Query%s: only %d samples",
model.configuration.query, n);
+ NexmarkUtils.console("Query %s: only %d samples",
model.configuration.query, n);
} else {
NexmarkUtils.console(
- "Query%d: N:%d; min:%d; 1st%%:%d; mean:%d; 3rd%%:%d; max:%d",
+ "Query %s: N:%d; min:%d; 1st%%:%d; mean:%d; 3rd%%:%d; max:%d",
model.configuration.query,
n,
counts.get(0),
diff --git
a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkOptions.java
b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkOptions.java
index 508b589..31a459e 100644
---
a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkOptions.java
+++
b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkOptions.java
@@ -349,7 +349,7 @@ public interface NexmarkOptions
@Nullable
Integer getMaxAuctionsWaitingTime();
- void setMaxAuctionsWaitingTime(Integer fanout);
+ void setMaxAuctionsWaitingTime(Integer maxAuctionsWaitingTime);
@Description("Length of occasional delay to impose on events (in seconds).")
@Nullable
@@ -414,28 +414,6 @@ public interface NexmarkOptions
void setRunningTimeMinutes(Long value);
@Description(
- "If set and --monitorJobs is true, check that the system watermark is
never more "
- + "than this far behind real time")
- @Nullable
- Long getMaxSystemLagSeconds();
-
- void setMaxSystemLagSeconds(Long value);
-
- @Description(
- "If set and --monitorJobs is true, check that the data watermark is
never more "
- + "than this far behind real time")
- @Nullable
- Long getMaxDataLagSeconds();
-
- void setMaxDataLagSeconds(Long value);
-
- @Description("Only start validating watermarks after this many seconds")
- @Nullable
- Long getWatermarkValidationDelaySeconds();
-
- void setWatermarkValidationDelaySeconds(Long value);
-
- @Description(
"Specify 'sql' to use Calcite SQL queries "
+ "or 'zetasql' to use ZetaSQL queries."
+ "Otherwise Java transforms will be used")
@@ -480,12 +458,6 @@ public interface NexmarkOptions
void setNexmarkParallel(int value);
- @Description("InfluxDB measurement to publish results to.")
- @Nullable
- String getInfluxMeasurement();
-
- void setInfluxMeasurement(@Nullable String measurement);
-
@Description("InfluxDB host.")
@Nullable
String getInfluxHost();
diff --git
a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/SessionSideInputJoin.java
b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/SessionSideInputJoin.java
index 16f379c..7335795 100644
---
a/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/SessionSideInputJoin.java
+++
b/sdks/java/testing/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/SessionSideInputJoin.java
@@ -54,7 +54,7 @@ public class SessionSideInputJoin extends
NexmarkQueryTransform<Bid> {
private final NexmarkConfiguration configuration;
public SessionSideInputJoin(NexmarkConfiguration configuration) {
- super("BoundedSideInputJoin");
+ super("SessionSideInputJoin");
this.configuration = configuration;
}
