From bbeb165d6b0911ac002afa2d3bf99f056a29a487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Sun, 20 Feb 2022 14:18:39 +0100
Subject: [PATCH] Prevent unecessary objects creation
---
.../workloadgeneration/EnvVarLoadGeneratorFactory.java | 4 ++--
.../theodolite/commons/workloadgeneration/LoadGenerator.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java
index d6f6707df..3ced27377 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java
@@ -13,7 +13,7 @@ class EnvVarLoadGeneratorFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(EnvVarLoadGeneratorFactory.class);
- public LoadGenerator create() {
+ public LoadGenerator create(final LoadGenerator loadGeneratorTemplate) {
final int numSensors = Integer.parseInt(Objects.requireNonNullElse(
System.getenv(ConfigurationKeys.NUM_SENSORS),
Integer.toString(LoadGenerator.NUMBER_OF_KEYS_DEFAULT)));
@@ -27,7 +27,7 @@ class EnvVarLoadGeneratorFactory {
System.getenv(ConfigurationKeys.THREADS),
Integer.toString(LoadGenerator.THREADS_DEFAULT)));
- return LoadGenerator.fromDefaults()
+ return loadGeneratorTemplate
.setClusterConfig(this.buildClusterConfig())
.setLoadDefinition(new WorkloadDefinition(
new KeySpace(LoadGenerator.SENSOR_PREFIX_DEFAULT, numSensors),
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
index 64a3e763c..1f02a0e0c 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
@@ -102,7 +102,7 @@ public final class LoadGenerator {
* Create a basic {@link LoadGenerator} from environment variables.
*/
public static LoadGenerator fromEnvironment() {
- return new EnvVarLoadGeneratorFactory().create();
+ return new EnvVarLoadGeneratorFactory().create(new LoadGenerator());
}
}
--
GitLab