From 4902f1e63bdfcba70b2ee5d27866c3c7067ffed3 Mon Sep 17 00:00:00 2001 From: Louis Dureuil Date: Tue, 7 May 2024 14:03:14 +0200 Subject: [PATCH] Modify existing workload files to use precommands --- workloads/hackernews.json | 8 +++--- workloads/movies-nothreads.json | 8 +++--- workloads/movies-subset-hf-embeddings.json | 6 +++-- workloads/settings-add-embeddings.json | 6 +++-- workloads/settings-add-remove-filters.json | 6 +++-- workloads/settings-proximity-precision.json | 6 +++-- .../settings-remove-add-swap-searchable.json | 6 +++-- workloads/settings-typo.json | 27 ++++++++++++++++--- 8 files changed, 53 insertions(+), 20 deletions(-) diff --git a/workloads/hackernews.json b/workloads/hackernews.json index 0a99b69ff..5762a7309 100644 --- a/workloads/hackernews.json +++ b/workloads/hackernews.json @@ -54,7 +54,7 @@ "sha256": "27e25efd0b68b159b8b21350d9af76938710cb29ce0393fa71b41c4f3c630ffe" } }, - "commands": [ + "precommands": [ { "route": "indexes/movies/settings", "method": "PATCH", @@ -78,8 +78,10 @@ ] } }, - "synchronous": "DontWait" - }, + "synchronous": "WaitForTask" + } + ], + "commands": [ { "route": "indexes/movies/documents", "method": "POST", diff --git a/workloads/movies-nothreads.json b/workloads/movies-nothreads.json index 175daacf9..d3dd006fa 100644 --- a/workloads/movies-nothreads.json +++ b/workloads/movies-nothreads.json @@ -11,7 +11,7 @@ "sha256": "5b6e4cb660bc20327776e8a33ea197b43d9ec84856710ead1cc87ab24df77de1" } }, - "commands": [ + "precommands": [ { "route": "indexes/movies/settings", "method": "PATCH", @@ -30,8 +30,10 @@ ] } }, - "synchronous": "DontWait" - }, + "synchronous": "WaitForTask" + } + ], + "commands": [ { "route": "indexes/movies/documents", "method": "POST", diff --git a/workloads/movies-subset-hf-embeddings.json b/workloads/movies-subset-hf-embeddings.json index d24bc752c..d7672cf73 100644 --- a/workloads/movies-subset-hf-embeddings.json +++ b/workloads/movies-subset-hf-embeddings.json @@ -11,7 +11,7 @@ "sha256": "d215e395e4240f12f03b8f1f68901eac82d9e7ded5b462cbf4a6b8efde76c6c6" } }, - "commands": [ + "precommands": [ { "route": "experimental-features", "method": "PATCH", @@ -55,7 +55,9 @@ } }, "synchronous": "WaitForTask" - }, + } + ], + "commands": [ { "route": "indexes/movies/documents", "method": "POST", diff --git a/workloads/settings-add-embeddings.json b/workloads/settings-add-embeddings.json index f87286943..6ad50769a 100644 --- a/workloads/settings-add-embeddings.json +++ b/workloads/settings-add-embeddings.json @@ -11,7 +11,7 @@ "sha256": "d215e395e4240f12f03b8f1f68901eac82d9e7ded5b462cbf4a6b8efde76c6c6" } }, - "commands": [ + "precommands": [ { "route": "experimental-features", "method": "PATCH", @@ -49,7 +49,9 @@ "asset": "movies-100.json" }, "synchronous": "WaitForTask" - }, + } + ], + "commands": [ { "route": "indexes/movies/settings", "method": "PATCH", diff --git a/workloads/settings-add-remove-filters.json b/workloads/settings-add-remove-filters.json index 12493a8fc..f017ed960 100644 --- a/workloads/settings-add-remove-filters.json +++ b/workloads/settings-add-remove-filters.json @@ -11,7 +11,7 @@ "sha256": "28c359a0956958af0ba204ec11bad3045a0864a10b4838914fea25a01724f84b" } }, - "commands": [ + "precommands": [ { "route": "indexes/peoples/settings", "method": "PATCH", @@ -59,7 +59,9 @@ "asset": "150k-people.json" }, "synchronous": "WaitForTask" - }, + } + ], + "commands": [ { "route": "indexes/peoples/settings", "method": "PATCH", diff --git a/workloads/settings-proximity-precision.json b/workloads/settings-proximity-precision.json index 384f99e37..ac6d98da0 100644 --- a/workloads/settings-proximity-precision.json +++ b/workloads/settings-proximity-precision.json @@ -11,7 +11,7 @@ "sha256": "28c359a0956958af0ba204ec11bad3045a0864a10b4838914fea25a01724f84b" } }, - "commands": [ + "precommands": [ { "route": "indexes/peoples/settings", "method": "PATCH", @@ -61,7 +61,9 @@ "asset": "150k-people.json" }, "synchronous": "WaitForTask" - }, + } + ], + "commands": [ { "route": "indexes/peoples/settings", "method": "PATCH", diff --git a/workloads/settings-remove-add-swap-searchable.json b/workloads/settings-remove-add-swap-searchable.json index 61db8822e..7f70d1ce8 100644 --- a/workloads/settings-remove-add-swap-searchable.json +++ b/workloads/settings-remove-add-swap-searchable.json @@ -11,7 +11,7 @@ "sha256": "28c359a0956958af0ba204ec11bad3045a0864a10b4838914fea25a01724f84b" } }, - "commands": [ + "precommands": [ { "route": "indexes/peoples/settings", "method": "PATCH", @@ -61,7 +61,9 @@ "asset": "150k-people.json" }, "synchronous": "WaitForTask" - }, + } + ], + "commands": [ { "route": "indexes/peoples/settings", "method": "PATCH", diff --git a/workloads/settings-typo.json b/workloads/settings-typo.json index 45163bc98..e04135877 100644 --- a/workloads/settings-typo.json +++ b/workloads/settings-typo.json @@ -11,7 +11,7 @@ "sha256": "28c359a0956958af0ba204ec11bad3045a0864a10b4838914fea25a01724f84b" } }, - "commands": [ + "precommands": [ { "route": "indexes/peoples/settings", "method": "PATCH", @@ -62,14 +62,18 @@ "asset": "150k-people.json" }, "synchronous": "WaitForTask" - }, + } + ], + "commands": [ { "route": "indexes/peoples/settings", "method": "PATCH", "body": { "inline": { "typoTolerance": { - "disableOnAttributes": ["featured_job_organization_name"] + "disableOnAttributes": [ + "featured_job_organization_name" + ] } } }, @@ -93,7 +97,22 @@ "body": { "inline": { "typoTolerance": { - "disableOnWords": ["Ben","Elowitz","Kevin","Flaherty", "Ron", "Dustin", "Owen", "Chris", "Mark", "Matt", "Peter", "Van", "Head", "of"] + "disableOnWords": [ + "Ben", + "Elowitz", + "Kevin", + "Flaherty", + "Ron", + "Dustin", + "Owen", + "Chris", + "Mark", + "Matt", + "Peter", + "Van", + "Head", + "of" + ] } } },