Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update performance test with nested field #1488

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Update performance test with nested field #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions benchmarks/perf-tool/add-parent-doc-id-to-dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/perf-tool/okpt/test/steps/steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."""

Expand Down
3 changes: 3 additions & 0 deletions benchmarks/perf-tool/release-configs/faiss-hnsw/nested/simple/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
}
},
"mappings": {
"_source": {
"excludes": ["nested_field"]
},
"properties": {
"nested_field": {
"type": "nested",
Expand Down
3 changes: 3 additions & 0 deletions benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
}
},
"mappings": {
"_source": {
"excludes": ["nested_field"]
},
"properties": {
"nested_field": {
"type": "nested",
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/perf-tool/release-configs/lucene-hnsw/nested/simple/simple-nested-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we're changing faiss to lucene here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was a bug introduced before. This is test spec for lucene.

- name: ingest_nested_field
index_name: target_index
field_name: target_field
Expand Down
2 changes: 2 additions & 0 deletions benchmarks/perf-tool/release-configs/run_all_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand Down
Loading