Skip to content

OS change to use internal field _id instead of id field #436

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

Merged
alwayslove2013 merged 4 commits into from
Jan 8, 2025
Merged

OS change to use internal field _id instead of id field #436

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afe4a31
Removed the Filter Path from Search, so we can get the full response
Jan 7, 2025
92d979f
Merge remote-tracking branch 'origin/os-search-issue' into os-search-…
Jan 7, 2025
88fa19c
updated the opensearch to use column id instead of _id
Jan 7, 2025
8f80c6e
Modified the code to use internal column _id instead of id.
Jan 7, 2025
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
7 changes: 3 additions & 4 deletions vectordb_bench/backend/clients/aws_opensearch/aws_opensearch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def __init__(
db_config: dict,
db_case_config: AWSOpenSearchIndexConfig,
index_name: str = "vdb_bench_index", # must be lowercase
id_col_name: str = "id",
id_col_name: str = "_id",
vector_col_name: str = "embedding",
drop_old: bool = False,
**kwargs,
Expand Down Expand Up @@ -61,7 +61,6 @@ def _create_index(self, client: OpenSearch):
}
mappings = {
"properties": {
self.id_col_name: {"type": "integer"},
**{
categoryCol: {"type": "keyword"}
for categoryCol in self.category_col_names
Expand Down Expand Up @@ -102,7 +101,7 @@ def insert_embeddings(

insert_data = []
for i in range(len(embeddings)):
insert_data.append({"index": {"_index": self.index_name, "_id": metadata[i]}})
insert_data.append({"index": {"_index": self.index_name, self.id_col_name: metadata[i]}})
insert_data.append({self.vector_col_name: embeddings[i]})
try:
resp = self.client.bulk(insert_data)
Expand Down Expand Up @@ -143,7 +142,7 @@ def search_embedding(
log.info(f'Search took: {resp["took"]}')
log.info(f'Search shards: {resp["_shards"]}')
log.info(f'Search hits total: {resp["hits"]["total"]}')
result = [h["fields"][self.id_col_name][0] for h in resp["hits"]["hits"]]
result = [int(h["fields"][self.id_col_name][0]) for h in resp["hits"]["hits"]]
#result = [int(d["_id"]) for d in resp["hits"]["hits"]]
# log.info(f'success! length={len(res)}')

Expand Down
Loading