diff --git a/benchmarks/perf-tool/add-parent-doc-id-to-dataset.py b/benchmarks/perf-tool/add-parent-doc-id-to-dataset.py index 54a40b2814..a4acafd034 100644 --- a/benchmarks/perf-tool/add-parent-doc-id-to-dataset.py +++ b/benchmarks/perf-tool/add-parent-doc-id-to-dataset.py @@ -116,8 +116,8 @@ def run(self, source_path, target_path) -> None: possible_colors = ['red', 'green', 'yellow', 'blue', None] possible_tastes = ['sweet', 'salty', 'sour', 'bitter', None] max_age = 100 - min_field_size = 1000 - max_field_size = 10001 + min_field_size = 10 + max_field_size = 10 # Copy train and test data for key in in_file.keys(): diff --git a/benchmarks/perf-tool/okpt/test/steps/steps.py b/benchmarks/perf-tool/okpt/test/steps/steps.py index c0adba62a1..99b2728dc8 100644 --- a/benchmarks/perf-tool/okpt/test/steps/steps.py +++ b/benchmarks/perf-tool/okpt/test/steps/steps.py @@ -759,9 +759,6 @@ def get_body(self, vec): } } - def get_exclude_fields(self): - return ['nested_field.' + self.field_name] - class GetStatsStep(OpenSearchStep): """See base class.""" diff --git a/benchmarks/perf-tool/release-configs/faiss-hnsw/nested/simple/index.json b/benchmarks/perf-tool/release-configs/faiss-hnsw/nested/simple/index.json index a982afc816..338ceb1f4d 100644 --- a/benchmarks/perf-tool/release-configs/faiss-hnsw/nested/simple/index.json +++ b/benchmarks/perf-tool/release-configs/faiss-hnsw/nested/simple/index.json @@ -8,6 +8,9 @@ } }, "mappings": { + "_source": { + "excludes": ["nested_field"] + }, "properties": { "nested_field": { "type": "nested", diff --git a/benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/index.json b/benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/index.json index 8dc749c39c..b41b51c77f 100644 --- a/benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/index.json +++ b/benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/index.json @@ -7,6 +7,9 @@ } }, "mappings": { + "_source": { + "excludes": ["nested_field"] + }, "properties": { "nested_field": { "type": "nested", diff --git a/benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/simple-nested-test.yml b/benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/simple-nested-test.yml index cf1e4edc40..be825487a0 100644 --- a/benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/simple-nested-test.yml +++ b/benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/simple-nested-test.yml @@ -9,7 +9,7 @@ steps: index_name: target_index - name: create_index index_name: target_index - index_spec: release-configs/faiss-hnsw/nested/simple/index.json + index_spec: release-configs/lucene-hnsw/nested/simple/index.json - name: ingest_nested_field index_name: target_index field_name: target_field diff --git a/benchmarks/perf-tool/release-configs/run_all_tests.sh b/benchmarks/perf-tool/release-configs/run_all_tests.sh index 5f684bd6f6..e65d5b5c4f 100755 --- a/benchmarks/perf-tool/release-configs/run_all_tests.sh +++ b/benchmarks/perf-tool/release-configs/run_all_tests.sh @@ -68,6 +68,7 @@ curl -X PUT "http://$ENDPOINT:$PORT/_cluster/settings?pretty" -H 'Content-Type: TESTS="./release-configs/faiss-hnsw/filtering/relaxed-filter/relaxed-filter-test.yml ./release-configs/faiss-hnsw/filtering/restrictive-filter/restrictive-filter-test.yml +./release-configs/faiss-hnsw/nested/simple/simple-nested-test.yml ./release-configs/faiss-hnsw/test.yml ./release-configs/faiss-hnswpq/test.yml ./release-configs/faiss-ivf/filtering/relaxed-filter/relaxed-filter-test.yml @@ -76,6 +77,7 @@ TESTS="./release-configs/faiss-hnsw/filtering/relaxed-filter/relaxed-filter-test ./release-configs/faiss-ivfpq/test.yml ./release-configs/lucene-hnsw/filtering/relaxed-filter/relaxed-filter-test.yml ./release-configs/lucene-hnsw/filtering/restrictive-filter/restrictive-filter-test.yml +./release-configs/lucene-hnsw/nested/simple/simple-nested-test.yml ./release-configs/lucene-hnsw/test.yml ./release-configs/nmslib-hnsw/test.yml"