diff --git a/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml index 0e3b886e82fb91e2b7ea1c2b78252ad4d78807ee..465fcb6ee6a2b2121dfe359140c259e7a3eb763a 100644 --- a/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml +++ b/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml @@ -67,8 +67,6 @@ services: parallelism.default: 1 state.backend: rocksdb state.checkpoints.dir: file:///data/flink/checkpoints - - GRACE_PERIOD_MS=5000 - - TRIGGER_INTERVAL_SECONDS=1 depends_on: - schema-registry - kafka diff --git a/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml index 563dbf5acdb9f7b5dae3e49676de232b3afacada..51011d2d2645c8542724d7f84f29c9cdae970e8e 100644 --- a/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml +++ b/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml @@ -52,8 +52,6 @@ services: KAFKA_BOOTSTRAP_SERVERS: kafka:9092 SCHEMA_REGISTRY_URL: http://schema-registry:8081 ENABLE_METRICS: "false" - GRACE_PERIOD_MS: 5000 - TRIGGER_INTERVAL_SECONDS: 1 load-generator: image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-latest} depends_on: diff --git a/theodolite-benchmarks/docker-test/uc4-kstreams/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-kstreams/docker-compose.yml index 000214d8fda2823c6fccc9257baaa2f500cc76c5..6aaa02990841547edb6059e4e2fbf3b28b50985c 100755 --- a/theodolite-benchmarks/docker-test/uc4-kstreams/docker-compose.yml +++ b/theodolite-benchmarks/docker-test/uc4-kstreams/docker-compose.yml @@ -45,8 +45,6 @@ services: environment: KAFKA_BOOTSTRAP_SERVERS: kafka:9092 SCHEMA_REGISTRY_URL: http://schema-registry:8081 - COMMIT_INTERVAL_MS: 1000 - GRACE_PERIOD_MS: 5000 load-generator: image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-latest} depends_on: 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 200e0da601faeadd790cf1fd0deeba38e6b1a7fa..0096053911652eab4a15b0c33aa2b784606ce3a0 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 @@ -75,8 +75,8 @@ 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 triggerDelay = Duration.millis( + this.config.getInt(Uc4ConfigurationKeys.TRIGGER_INTERVAL_MS)); final Duration gracePeriod = Duration.millis( this.config.getInt(Uc4ConfigurationKeys.GRACE_PERIOD_MS)); 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 f34f7014135833aef4022ac1e07dce2271e4faf7..7f2fa2d30062d2fecd6c361d26fcb23c5106aa91 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,7 +15,7 @@ public final class Uc4ConfigurationKeys { public static final String GRACE_PERIOD_MS = "grace.period.ms"; - public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds"; + public static final String TRIGGER_INTERVAL_MS = "trigger.interval.ms"; 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 e761c26461667d09b95b579b5a6452b6c833b342..1791e4f998c84063cf0e79e43466185652301cea 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,7 +10,7 @@ kafka.feedback.topic=aggregation-feedback schema.registry.url=http://localhost:8081 emit.period.ms=5000 -trigger.interval.seconds=1 +trigger.interval.ms=1000 grace.period.ms=5000 specific.avro.reader=true diff --git a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/AggregationServiceFlinkJob.java b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/AggregationServiceFlinkJob.java index e0c2a2a0035704fd6331fb2c8d94022e5e686e8e..adfd54ab54a190048f0d065fc254c92b51ee7225 100644 --- a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/AggregationServiceFlinkJob.java +++ b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/AggregationServiceFlinkJob.java @@ -75,7 +75,7 @@ public final class AggregationServiceFlinkJob extends AbstractFlinkService { final Duration windowGrace = Duration.ofMillis(this.config.getLong(Uc4ConfigurationKeys.GRACE_PERIOD_MS)); final Time triggerDuration = - Time.seconds(this.config.getLong(Uc4ConfigurationKeys.TRIGGER_INTERVAL_SECONDS)); + Time.milliseconds(this.config.getLong(Uc4ConfigurationKeys.TRIGGER_INTERVAL_MS)); final String configurationTopic = this.config.getString(Uc4ConfigurationKeys.CONFIGURATION_KAFKA_TOPIC); final boolean checkpointing = this.config.getBoolean(ConfigurationKeys.CHECKPOINTING, true); diff --git a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/Uc4ConfigurationKeys.java b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/Uc4ConfigurationKeys.java index 49c38ae66184bf7c987e770bf08da80b5b02e5c1..772fcb1473195c557b8b520a8192846dc12d7280 100644 --- a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/Uc4ConfigurationKeys.java +++ b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/Uc4ConfigurationKeys.java @@ -19,7 +19,7 @@ public final class Uc4ConfigurationKeys { public static final String GRACE_PERIOD_MS = "grace.period.ms"; - public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds"; + public static final String TRIGGER_INTERVAL_MS = "trigger.interval.ms"; private Uc4ConfigurationKeys() {} diff --git a/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties index bb26b56fa72a896ca588376e9a98b8b0251e3ec5..1de229de989f08c34fd6a4c9cf9e66c74782dbc9 100644 --- a/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties +++ b/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties @@ -10,7 +10,7 @@ kafka.feedback.topic=aggregation-feedback schema.registry.url=http://localhost:8081 emit.period.ms=5000 -trigger.interval.seconds=1 +trigger.interval.ms=1000 grace.period.ms=5000 # Flink configuration diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java index 5790d5e3dc697d6799ff34a39227a750c77b9003..24d0a8aeb0f5de983daa027dc39445902d76ad8a 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java @@ -59,8 +59,8 @@ public class HistoryService extends HazelcastJetService { final Duration gracePeriod = Duration.ofMillis( this.config.getInt(Uc4ConfigurationKeys.GRACE_PERIOD_MS)); - final Duration triggerPeriod = Duration.ofSeconds( - this.config.getInt(Uc4ConfigurationKeys.TRIGGER_INTERVAL_SECONDS)); + final Duration triggerPeriod = Duration.ofMillis( + this.config.getInt(Uc4ConfigurationKeys.TRIGGER_INTERVAL_MS)); this.pipelineFactory = new Uc4PipelineFactory( kafkaProps, diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4ConfigurationKeys.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4ConfigurationKeys.java index 3eedfc0bc6a58130cb60b44b1aee45ad75ee6479..92e91a79b902897784d28302553ca617a2c90866 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4ConfigurationKeys.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4ConfigurationKeys.java @@ -15,6 +15,6 @@ public class Uc4ConfigurationKeys { public static final String GRACE_PERIOD_MS = "grace.period.ms"; - public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds"; + public static final String TRIGGER_INTERVAL_MS = "trigger.interval.ms"; } diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-hazelcastjet/src/main/resources/META-INF/application.properties index af55655bb773635ff0fb116e7ad7c491a770bd09..7ec1b482671158bb6cd1c4181e447691e43536cf 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/resources/META-INF/application.properties +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/resources/META-INF/application.properties @@ -10,5 +10,5 @@ kafka.feedback.topic=aggregation-feedback schema.registry.url=http://localhost:8081 emit.period.ms=5000 -trigger.interval.seconds=1 +trigger.interval.ms=1000 grace.period.ms=5000