Skip to content

query parts join method #155

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.

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
merged 2 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions uncoder-core/app/translator/core/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ class PlatformQueryRender(QueryRender):
not_token = "not"

group_token = "(%s)"
query_parts_delimiter = " "

field_value_map = BaseQueryFieldValue(or_token=or_token)

Expand Down Expand Up @@ -284,6 +285,10 @@ def wrap_query_with_meta_info(self, meta_info: MetaInfoContainer, query: str) ->
def _finalize_search_query(query: str) -> str:
return query

def _join_query_parts(self, prefix: str, query: str, functions: str) -> str:
parts = filter(lambda s: bool(s), map(str.strip, [prefix, self._finalize_search_query(query), functions]))
return self.query_parts_delimiter.join(parts)

def finalize_query(
self,
prefix: str,
Expand All @@ -295,8 +300,7 @@ def finalize_query(
*args, # noqa: ARG002
**kwargs, # noqa: ARG002
) -> str:
parts = filter(lambda s: bool(s), map(str.strip, [prefix, self._finalize_search_query(query), functions]))
query = " ".join(parts)
query = self._join_query_parts(prefix, query, functions)
query = self.wrap_query_with_meta_info(meta_info=meta_info, query=query)
if not_supported_functions:
rendered_not_supported = self.render_not_supported_functions(not_supported_functions)
Expand Down Expand Up @@ -383,7 +387,7 @@ def _generate_from_tokenized_query_container(self, query_container: TokenizedQue
defined_raw_log_fields = self.generate_raw_log_fields(
fields=query_container.meta_info.query_fields, source_mapping=source_mapping
)
prefix += f"\n{defined_raw_log_fields}\n"
prefix += f"\n{defined_raw_log_fields}"
result = self.generate_query(tokens=query_container.tokens, source_mapping=source_mapping)
except StrictPlatformException as err:
errors.append(err)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ class CortexXQLQueryRender(PlatformQueryRender):
or_token = "or"
and_token = "and"
not_token = "not"
query_parts_delimiter = "\n"

field_value_map = CortexXQLFieldValue(or_token=or_token)
comment_symbol = "//"
Expand Down
Loading