Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitfaf6a1b

Browse files
authored
Merge pull request#213 from UncoderIO/gis-8882
gis-8882 fix elastic eql regex modifier
2 parents0e5e0ca +70f1371 commitfaf6a1b

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

‎uncoder-core/app/translator/platforms/elasticsearch/renders/elasticsearch_eql.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ def regex_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
105105
ifisinstance(value,list):
106106
returnf"({self.or_token.join(self.regex_modifier(field=field,value=v)forvinvalue)})"
107107
value=self._pre_process_value(field,value,value_type=ValueType.regex_value,wrap_int=True)
108-
returnf'{self.apply_field(field)} regex~ "{value}[^z].?"'
108+
109+
returnf'{self.apply_field(field)} regex~ "{value}.?"'
109110

110111
defkeywords(self,field:str,value:DEFAULT_VALUE_TYPE)->str:
111112
ifisinstance(value,list):
@@ -139,14 +140,18 @@ def _generate_from_tokenized_query_container_by_source_mapping(
139140
self,query_container:TokenizedQueryContainer,source_mapping:SourceMapping
140141
)->str:
141142
unmapped_fields=self.mappings.check_fields_mapping_existence(
142-
query_container.meta_info.query_fields,source_mapping
143+
query_container.meta_info.query_fields,
144+
query_container.meta_info.function_fields_map,
145+
self.platform_functions.manager.supported_render_names,
146+
source_mapping,
143147
)
144148
rendered_functions=self.generate_functions(query_container.functions.functions,source_mapping)
145149
prefix=self.generate_prefix(source_mapping.log_source_signature,rendered_functions.rendered_prefix)
146150

147151
ifsource_mapping.raw_log_fields:
148152
defined_raw_log_fields=self.generate_raw_log_fields(
149-
fields=query_container.meta_info.query_fields,source_mapping=source_mapping
153+
fields=query_container.meta_info.query_fields+query_container.meta_info.function_fields,
154+
source_mapping=source_mapping,
150155
)
151156
prefix+=f"\n{defined_raw_log_fields}"
152157
ifsource_mapping.conditions:

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp