From 7e350b6f2a87a7bf2356edbdd7bf74be31fbf590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Sun, 27 Nov 2022 14:13:51 +0100
Subject: [PATCH] ALign configurations
---
.../theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java | 3 +--
.../src/main/resources/META-INF/application.properties | 4 +---
.../src/main/resources/META-INF/application.properties | 4 ++--
.../src/main/resources/META-INF/application.properties | 5 ++---
.../theodolite/benchmarks/uc4/beam/PipelineFactory.java | 3 ++-
.../theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java | 5 +++--
.../src/main/resources/META-INF/application.properties | 5 +++--
7 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java
index ca59d3d2f..09bc8a26b 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java
@@ -11,8 +11,7 @@ public final class Uc3ConfigurationKeys {
public static final String AGGREGATION_ADVANCE_DAYS = "aggregation.advance.days";
- public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval";
- // public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds";
+ public static final String TRIGGER_INTERVAL_SECONDS = "aggregation.trigger.interval.seconds";
private Uc3ConfigurationKeys() {}
diff --git a/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
index f4511d5f1..54af67893 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
@@ -9,9 +9,7 @@ schema.registry.url=http://localhost:8081
aggregation.duration.days=30
aggregation.advance.days=1
-
-# in seconds
-trigger.interval=15
+aggregation.trigger.interval.seconds=15
specific.avro.reader=true
diff --git a/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
index 24fb0b0b7..1d91a3b49 100644
--- a/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
@@ -5,11 +5,11 @@ kafka.bootstrap.servers=localhost:9092
kafka.input.topic=input
kafka.output.topic=output
schema.registry.url=http://localhost:8081
+
+time.zone=Europe/Paris
aggregation.duration.days=30
aggregation.advance.days=1
aggregation.trigger.interval.seconds=15
-time.zone=Europe/Paris
-
# Flink configuration
checkpointing.interval.ms=1000
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-hazelcastjet/src/main/resources/META-INF/application.properties
index 53e559dc3..7b28bf5c4 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/resources/META-INF/application.properties
@@ -4,9 +4,8 @@ application.version=0.0.1
kafka.bootstrap.servers=localhost:9092
kafka.input.topic=input
kafka.output.topic=output
+schema.registry.url=http://localhost:8081
+
aggregation.duration.days=30
aggregation.advance.days=1
aggregation.emit.period.seconds=15
-
-schema.registry.url=http://localhost:8081
-
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
index 2bba46d9b..200e0da60 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
@@ -74,9 +74,10 @@ public class PipelineFactory extends AbstractPipelineFactory {
final Duration duration = Duration.millis(
this.config.getInt(Uc4ConfigurationKeys.EMIT_PERIOD_MS));
+ // final boolean enableTrigger = this.config.getBoolean(Uc4ConfigurationKeys.TRIGGER_ENABLE);
final Duration triggerDelay = Duration.standardSeconds(
this.config.getInt(Uc4ConfigurationKeys.TRIGGER_INTERVAL_SECONDS));
- final Duration gracePeriod = Duration.standardSeconds(// TODO this is wrong
+ final Duration gracePeriod = Duration.millis(
this.config.getInt(Uc4ConfigurationKeys.GRACE_PERIOD_MS));
// Read from Kafka
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java
index 860e8c9da..0f314f149 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java
@@ -15,8 +15,9 @@ public final class Uc4ConfigurationKeys {
public static final String GRACE_PERIOD_MS = "grace.period.ms";
- public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval";
- // public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds";
+ // public static final String TRIGGER_ENABLE = "trigger.enable";
+
+ public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds";
private Uc4ConfigurationKeys() {}
diff --git a/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
index a5dc4cfac..654d7d94b 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
@@ -10,8 +10,9 @@ kafka.feedback.topic=aggregation-feedback
schema.registry.url=http://localhost:8081
emit.period.ms=5000
-trigger.interval=15
-grace.period.ms=270
+#trigger.enable=true
+trigger.interval.seconds=15
+grace.period.ms=270000
specific.avro.reader=true
--
GitLab