Skip to content

fix elasticsearch and opensearch parsers to omit null bool clauses #294

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

Open
Goodnight77 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix elasticsearch and opensearch parsers to omit null bool clauses #294

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
14 changes: 8 additions & 6 deletions engine/clients/elasticsearch/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ class ElasticConditionParser(BaseConditionParser):
def build_condition(
self, and_subfilters: Optional[List[Any]], or_subfilters: Optional[List[Any]]
) -> Optional[Any]:
return {
"bool": {
"must": and_subfilters,
"should": or_subfilters,
}
}
bool_clause = {}
if and_subfilters:
bool_clause["must"] = and_subfilters
if or_subfilters:
bool_clause["should"] = or_subfilters
if not bool_clause:
return None
return {"bool": bool_clause}

def build_exact_match_filter(self, field_name: str, value: FieldValue) -> Any:
return {"match": {field_name: value}}
Expand Down
14 changes: 8 additions & 6 deletions engine/clients/opensearch/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ class OpenSearchConditionParser(BaseConditionParser):
def build_condition(
self, and_subfilters: Optional[List[Any]], or_subfilters: Optional[List[Any]]
) -> Optional[Any]:
return {
"bool": {
"must": and_subfilters,
"should": or_subfilters,
}
}
bool_clause = {}
if and_subfilters:
bool_clause["must"] = and_subfilters
if or_subfilters:
bool_clause["should"] = or_subfilters
if not bool_clause:
return None
return {"bool": bool_clause}

def build_exact_match_filter(self, field_name: str, value: FieldValue) -> Any:
return {"match": {field_name: value}}
Expand Down