third_codes/eland
1
0
Fork 0
mirror of https://github.com/elastic/eland.git synced 2025-07-11 00:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimize FieldMappings.aggregate_field_name() method

Browse Source
This commit is contained in:
P. Sai Vinay 2021-08-06 21:57:59 +05:30 committed by GitHub
parent 54b497ed9a
commit d3f8d7b8f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eland/arithmetics.py
View File

@ -108,12 +108,6 @@ class ArithmeticSeries(ArithmeticObject):
aggregatable_field_name = query_compiler.display_name_to_aggregatable_name( aggregatable_field_name = query_compiler.display_name_to_aggregatable_name(
display_name display_name
) )
if aggregatable_field_name is None:
raise ValueError(
f"Can not perform arithmetic operations on non aggregatable fields"
f"{display_name} is not aggregatable."
)
self._value = f"doc['{aggregatable_field_name}'].value" self._value = f"doc['{aggregatable_field_name}'].value"
self._tasks = [] self._tasks = []
self._dtype = dtype self._dtype = dtype

20
eland/field_mappings.py
View File

@ -584,21 +584,19 @@ class FieldMappings:
raise KeyError if the field_name doesn't exist in the mapping, or isn't aggregatable raise KeyError if the field_name doesn't exist in the mapping, or isn't aggregatable
""" """
if display_name not in self._mappings_capabilities.index: mapping: Optional[pd.Series] = None
try:
mapping = self._mappings_capabilities.loc[display_name]
except KeyError:
raise KeyError( raise KeyError(
f"Can not get aggregatable field name for invalid display name {display_name}" f"Can not get aggregatable field name for invalid display name {display_name}"
) ) from None
if ( if mapping is not None and mapping.aggregatable_es_field_name is None:
self._mappings_capabilities.loc[display_name].aggregatable_es_field_name warnings.warn(f"Aggregations not supported for '{display_name}'")
is None
):
warnings.warn(
f"Aggregations not supported for '{display_name}' "
f"'{self._mappings_capabilities.loc[display_name].es_field_name}'"
)
return self._mappings_capabilities.loc[display_name].aggregatable_es_field_name return mapping.aggregatable_es_field_name
def aggregatable_field_names(self) -> Dict[str, str]: def aggregatable_field_names(self) -> Dict[str, str]:
""" """

8
eland/query_compiler.py
View File

@ -797,9 +797,13 @@ class QueryCompiler:
def get_arithmetic_op_fields(self) -> Optional["ArithmeticOpFieldsTask"]: def get_arithmetic_op_fields(self) -> Optional["ArithmeticOpFieldsTask"]:
return self._operations.get_arithmetic_op_fields() return self._operations.get_arithmetic_op_fields()
def display_name_to_aggregatable_name(self, display_name: str) -> Optional[str]: def display_name_to_aggregatable_name(self, display_name: str) -> str:
aggregatable_field_name = self._mappings.aggregatable_field_name(display_name) aggregatable_field_name = self._mappings.aggregatable_field_name(display_name)
if aggregatable_field_name is None:
raise ValueError(
f"Can not perform arithmetic operations on non aggregatable fields"
f"{display_name} is not aggregatable."
)
return aggregatable_field_name return aggregatable_field_name