From d8af19cc835e50e6a6302a0ac99e2348a16e7b82 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 12 Jan 2024 17:37:29 +0300 Subject: [PATCH] [#114] datagen: Remove calcHash parameter in GenPayload() Hash calculation is now done on-demand with a method call. Signed-off-by: Evgenii Stratonikov --- internal/datagen/generator.go | 2 +- scenarios/grpc.js | 2 +- scenarios/grpc_car.js | 2 +- scenarios/http.js | 2 +- scenarios/local.js | 2 +- scenarios/s3.js | 2 +- scenarios/s3_car.js | 2 +- scenarios/s3_multipart.js | 2 +- scenarios/s3local.js | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/datagen/generator.go b/internal/datagen/generator.go index 0617ddc..845d7fd 100644 --- a/internal/datagen/generator.go +++ b/internal/datagen/generator.go @@ -88,7 +88,7 @@ func (g *Generator) fillBuffer() { } } -func (g *Generator) GenPayload(calcHash bool) Payload { +func (g *Generator) GenPayload() Payload { if g.streaming { return NewStreamPayload(g.size, g.seed.Add(1), g.typ) } diff --git a/scenarios/grpc.js b/scenarios/grpc.js index a4329b4..6f675cd 100644 --- a/scenarios/grpc.js +++ b/scenarios/grpc.js @@ -149,7 +149,7 @@ export function obj_write() { }; const container = container_list[Math.floor(Math.random() * container_list.length)]; - const payload = generator.genPayload(registry_enabled); + const payload = generator.genPayload(); const resp = grpc_client.put(container, headers, payload, write_grpc_chunk_size); if (!resp.success) { log.withField("cid", container).error(resp.error); diff --git a/scenarios/grpc_car.js b/scenarios/grpc_car.js index b8236e2..19ceaf9 100644 --- a/scenarios/grpc_car.js +++ b/scenarios/grpc_car.js @@ -174,7 +174,7 @@ export function obj_write() { }; const container = container_list[Math.floor(Math.random() * container_list.length)]; - const payload = generator.genPayload(registry_enabled); + const payload = generator.genPayload(); const resp = grpc_client.put(container, headers, payload, write_grpc_chunk_size); if (!resp.success) { log.withField("cid", container).error(resp.error); diff --git a/scenarios/http.js b/scenarios/http.js index 1e31a4a..81215e6 100644 --- a/scenarios/http.js +++ b/scenarios/http.js @@ -97,7 +97,7 @@ export function obj_write() { const container = container_list[Math.floor(Math.random() * container_list.length)]; - const payload = generator.genPayload(registry_enabled); + const payload = generator.genPayload(); const data = { field: uuidv4(), // Because we use `file` wrapping and it is not straightforward to use streams here, diff --git a/scenarios/local.js b/scenarios/local.js index 50f9c7e..c90610c 100644 --- a/scenarios/local.js +++ b/scenarios/local.js @@ -128,7 +128,7 @@ export function obj_write() { }; const container = container_list[Math.floor(Math.random() * container_list.length)]; - const payload = generator.genPayload(registry_enabled); + const payload = generator.genPayload(); const resp = local_client.put(container, headers, payload); if (!resp.success) { if (resp.abort) { diff --git a/scenarios/s3.js b/scenarios/s3.js index 517721e..814f073 100644 --- a/scenarios/s3.js +++ b/scenarios/s3.js @@ -145,7 +145,7 @@ export function obj_write() { const key = __ENV.OBJ_NAME || uuidv4(); const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)]; - const payload = generator.genPayload(registry_enabled); + const payload = generator.genPayload(); const resp = s3_client.put(bucket, key, payload); if (!resp.success) { log.withFields({bucket: bucket, key: key}).error(resp.error); diff --git a/scenarios/s3_car.js b/scenarios/s3_car.js index ceda927..6eb94c6 100644 --- a/scenarios/s3_car.js +++ b/scenarios/s3_car.js @@ -172,7 +172,7 @@ export function obj_write() { const key = __ENV.OBJ_NAME || uuidv4(); const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)]; - const payload = generator.genPayload(registry_enabled); + const payload = generator.genPayload(); const resp = s3_client.put(bucket, key, payload); if (!resp.success) { log.withFields({bucket: bucket, key: key}).error(resp.error); diff --git a/scenarios/s3_multipart.js b/scenarios/s3_multipart.js index e9e1297..43e0607 100644 --- a/scenarios/s3_multipart.js +++ b/scenarios/s3_multipart.js @@ -92,7 +92,7 @@ export function obj_write_multipart() { const key = __ENV.OBJ_NAME || uuidv4(); const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)]; - const payload = generator.genPayload(registry_enabled); + const payload = generator.genPayload(); const resp = s3_client.multipart(bucket, key, write_multipart_part_size, write_multipart_vu_count, payload); if (!resp.success) { log.withFields({bucket: bucket, key: key}).error(resp.error); diff --git a/scenarios/s3local.js b/scenarios/s3local.js index 0d08733..fe31ed0 100644 --- a/scenarios/s3local.js +++ b/scenarios/s3local.js @@ -124,7 +124,7 @@ export function obj_write() { const key = __ENV.OBJ_NAME || uuidv4(); const bucket = bucket_list[Math.floor(Math.random() * bucket_list.length)]; - const payload = generator.genPayload(registry_enabled); + const payload = generator.genPayload(); const resp = s3_client.put(bucket, key, payload); if (!resp.success) { if (resp.abort) {