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

Commit0766f1c

Browse files
committed
TDM-9415 fixes
1 parent3cc30bb commit0766f1c

File tree

7 files changed

+49
-17
lines changed

7 files changed

+49
-17
lines changed

‎uncoder-core/app/translator/platforms/base/aql/parsers/aql.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"""
1818

1919
importre
20-
fromtypingimportUnion
20+
fromtypingimportOptional,Union
2121

2222
fromapp.translator.core.exceptions.parserimportTokenizerGeneralException
2323
fromapp.translator.core.models.functions.baseimportParsedFunctions
@@ -105,8 +105,8 @@ def __parse_log_sources(self, query: str) -> tuple[dict[str, Union[list[str], li
105105

106106
returnlog_sources,query
107107

108-
def_parse_query(self,text:str)->tuple[str,dict[str,Union[list[str],list[int]]],ParsedFunctions]:
109-
query=self.__clean_query(text)
108+
def_parse_query(self,query:str)->tuple[str,dict[str,Union[list[str],list[int]]],Optional[ParsedFunctions]]:
109+
query=self.__clean_query(query)
110110
self.__check_table(query)
111111
query,functions=self.platform_functions.parse(query)
112112
log_sources,query=self.__parse_log_sources(query)
@@ -118,7 +118,11 @@ def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContain
118118
query_field_tokens,function_field_tokens,function_field_tokens_map=self.get_field_tokens(
119119
query_tokens,functions.functions
120120
)
121-
source_mappings=self.get_source_mappings(query_field_tokens+function_field_tokens,log_sources)
121+
source_mappings=self.get_source_mappings(
122+
field_tokens=query_field_tokens+function_field_tokens,
123+
log_sources=log_sources,
124+
alt_mapping=raw_query_container.meta_info.source_alt_mapping,
125+
)
122126
meta_info=raw_query_container.meta_info
123127
meta_info.query_fields=query_field_tokens
124128
meta_info.function_fields=function_field_tokens

‎uncoder-core/app/translator/platforms/base/lucene/parsers/lucene.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
"""
1818

1919
importre
20+
fromtypingimportOptional,Union
2021

22+
fromapp.translator.core.models.functions.baseimportParsedFunctions
2123
fromapp.translator.core.models.query_containerimportRawQueryContainer,TokenizedQueryContainer
2224
fromapp.translator.core.parserimportPlatformQueryParser
2325
fromapp.translator.platforms.base.lucene.tokenizerimportLuceneTokenizer
@@ -31,7 +33,7 @@ class LuceneQueryParser(PlatformQueryParser):
3133

3234
wrapped_with_comment_pattern=r"^\s*//.*(?:\n|$)"
3335

34-
def_parse_query(self,query:str)->tuple[str,dict[str,list[str]]]:
36+
def_parse_query(self,query:str)->tuple[str,dict[str,Union[list[str],list[int]]],Optional[ParsedFunctions]]:
3537
log_sources= {}
3638
forsource_typeinself.log_source_key_types:
3739
pattern=self.log_source_pattern.replace("___source_type___",source_type)
@@ -43,13 +45,17 @@ def _parse_query(self, query: str) -> tuple[str, dict[str, list[str]]]:
4345
pos_end=search.end()
4446
query=query[:pos_start]+query[pos_end:]
4547

46-
returnquery,log_sources
48+
returnquery,log_sources,None
4749

4850
defparse(self,raw_query_container:RawQueryContainer)->TokenizedQueryContainer:
49-
query,log_sources=self._parse_query(raw_query_container.query)
51+
query,log_sources,_=self._parse_query(raw_query_container.query)
5052
query_tokens=self.get_query_tokens(query)
5153
query_field_tokens,_,_=self.get_field_tokens(query_tokens)
52-
source_mappings=self.get_source_mappings(query_field_tokens,log_sources)
54+
source_mappings=self.get_source_mappings(
55+
field_tokens=query_field_tokens,
56+
log_sources=log_sources,
57+
alt_mapping=raw_query_container.meta_info.source_alt_mapping,
58+
)
5359
meta_info=raw_query_container.meta_info
5460
meta_info.query_fields=query_field_tokens
5561
meta_info.source_mapping_ids= [source_mapping.source_idforsource_mappinginsource_mappings]

‎uncoder-core/app/translator/platforms/base/spl/parsers/spl.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,11 @@ def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContain
7575
query_field_tokens,function_field_tokens,function_field_tokens_map=self.get_field_tokens(
7676
query_tokens,functions.functions
7777
)
78-
source_mappings=self.get_source_mappings(query_field_tokens+function_field_tokens,log_sources)
78+
source_mappings=self.get_source_mappings(
79+
field_tokens=query_field_tokens+function_field_tokens,
80+
log_sources=log_sources,
81+
alt_mapping=raw_query_container.meta_info.source_alt_mapping,
82+
)
7983
meta_info=raw_query_container.meta_info
8084
meta_info.query_fields=query_field_tokens
8185
meta_info.function_fields=function_field_tokens

‎uncoder-core/app/translator/platforms/base/sql/parsers/sql.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
"""
1818

1919
importre
20+
fromtypingimportOptional,Union
2021

22+
fromapp.translator.core.models.functions.baseimportParsedFunctions
2123
fromapp.translator.core.models.query_containerimportRawQueryContainer,TokenizedQueryContainer
2224
fromapp.translator.core.parserimportPlatformQueryParser
2325
fromapp.translator.platforms.base.sql.tokenizerimportSqlTokenizer
@@ -30,21 +32,25 @@ class SqlQueryParser(PlatformQueryParser):
3032

3133
wrapped_with_comment_pattern=r"^\s*--.*(?:\n|$)"
3234

33-
def_parse_query(self,query:str)->tuple[str,dict[str,list[str]]]:
35+
def_parse_query(self,query:str)->tuple[str,dict[str,Union[list[str],list[int]]],Optional[ParsedFunctions]]:
3436
log_source= {"table": []}
3537
ifre.search(self.query_delimiter_pattern,query,flags=re.IGNORECASE):
3638
table_search=re.search(self.table_pattern,query)
3739
table=table_search.group("table")
3840
log_source["table"]= [table]
39-
returnre.split(self.query_delimiter_pattern,query,flags=re.IGNORECASE)[1],log_source
41+
returnre.split(self.query_delimiter_pattern,query,flags=re.IGNORECASE)[1],log_source,None
4042

41-
returnquery,log_source
43+
returnquery,log_source,None
4244

4345
defparse(self,raw_query_container:RawQueryContainer)->TokenizedQueryContainer:
44-
query,log_sources=self._parse_query(raw_query_container.query)
46+
query,log_sources,_=self._parse_query(raw_query_container.query)
4547
query_tokens=self.get_query_tokens(query)
4648
query_field_tokens,_,_=self.get_field_tokens(query_tokens)
47-
source_mappings=self.get_source_mappings(query_field_tokens,log_sources)
49+
source_mappings=self.get_source_mappings(
50+
field_tokens=query_field_tokens,
51+
log_sources=log_sources,
52+
alt_mapping=raw_query_container.meta_info.source_alt_mapping,
53+
)
4854
meta_info=raw_query_container.meta_info
4955
meta_info.query_fields=query_field_tokens
5056
meta_info.source_mapping_ids= [source_mapping.source_idforsource_mappinginsource_mappings]

‎uncoder-core/app/translator/platforms/chronicle/parsers/chronicle.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ class ChronicleQueryParser(PlatformQueryParser):
3636
defparse(self,raw_query_container:RawQueryContainer)->TokenizedQueryContainer:
3737
query_tokens=self.get_query_tokens(raw_query_container.query)
3838
query_field_tokens,_,_=self.get_field_tokens(query_tokens)
39-
source_mappings=self.get_source_mappings(query_field_tokens, {})
39+
source_mappings=self.get_source_mappings(
40+
field_tokens=query_field_tokens,
41+
log_sources={},
42+
alt_mapping=raw_query_container.meta_info.source_alt_mapping,
43+
)
4044
meta_info=raw_query_container.meta_info
4145
meta_info.query_fields=query_field_tokens
4246
meta_info.source_mapping_ids= [source_mapping.source_idforsource_mappinginsource_mappings]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContain
3030
query,log_sources=self._parse_query(raw_query_container.query)
3131
query_tokens=self.get_query_tokens(query)
3232
query_field_tokens,_,_=self.get_field_tokens(query_tokens)
33-
source_mappings=self.get_source_mappings(query_field_tokens,log_sources)
33+
source_mappings=self.get_source_mappings(
34+
field_tokens=query_field_tokens,
35+
log_sources=log_sources,
36+
alt_mapping=raw_query_container.meta_info.source_alt_mapping,
37+
)
3438
meta_info=raw_query_container.meta_info
3539
meta_info.query_fields=query_field_tokens
3640
meta_info.source_mapping_ids= [source_mapping.source_idforsource_mappinginsource_mappings]

‎uncoder-core/app/translator/platforms/logscale/parsers/logscale.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContain
4646
query_field_tokens,function_field_tokens,function_field_tokens_map=self.get_field_tokens(
4747
query_tokens,functions.functions
4848
)
49-
source_mappings=self.get_source_mappings(query_field_tokens+function_field_tokens, {})
49+
source_mappings=self.get_source_mappings(
50+
field_tokens=query_field_tokens+function_field_tokens,
51+
log_sources={},
52+
alt_mapping=raw_query_container.meta_info.source_alt_mapping,
53+
)
5054
meta_info=raw_query_container.meta_info
5155
meta_info.query_fields=query_field_tokens
5256
meta_info.function_fields=function_field_tokens

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp