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

Prepare for deprecation of is_datetime_or_timedelta_dtype in Pandas 2.0 (#592)

Browse Source
This commit is contained in:
Bart Broere 2023-10-10 20:37:13 +02:00 committed by GitHub
parent bb0c111a68
commit 48e290a927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eland/field_mappings.py
View File

@ -36,10 +36,10 @@ import pandas as pd # type: ignore
from pandas.core.dtypes.common import ( # type: ignore from pandas.core.dtypes.common import ( # type: ignore
is_bool_dtype, is_bool_dtype,
is_datetime64_any_dtype, is_datetime64_any_dtype,
is_datetime_or_timedelta_dtype,
is_float_dtype, is_float_dtype,
is_integer_dtype, is_integer_dtype,
is_string_dtype, is_string_dtype,
is_timedelta64_dtype,
) )
from pandas.core.dtypes.inference import is_list_like from pandas.core.dtypes.inference import is_list_like
@ -87,7 +87,9 @@ class Field(NamedTuple):
@property @property
def is_timestamp(self) -> bool: def is_timestamp(self) -> bool:
return is_datetime_or_timedelta_dtype(self.pd_dtype) return is_datetime64_any_dtype(self.pd_dtype) or is_timedelta64_dtype(
self.pd_dtype
)
@property @property
def is_bool(self) -> bool: def is_bool(self) -> bool:
@ -507,7 +509,7 @@ class FieldMappings:
es_dtype = "boolean" es_dtype = "boolean"
elif is_string_dtype(pd_dtype): elif is_string_dtype(pd_dtype):
es_dtype = "keyword" es_dtype = "keyword"
elif is_datetime_or_timedelta_dtype(pd_dtype): elif is_timedelta64_dtype(pd_dtype):
es_dtype = "date" es_dtype = "date"
elif is_datetime64_any_dtype(pd_dtype): elif is_datetime64_any_dtype(pd_dtype):
es_dtype = "date" es_dtype = "date"
@ -792,7 +794,9 @@ class FieldMappings:
pd_dtypes.append(np.dtype(pd_dtype)) pd_dtypes.append(np.dtype(pd_dtype))
es_field_names.append(es_field_name) es_field_names.append(es_field_name)
es_date_formats.append(es_date_format) es_date_formats.append(es_date_format)
elif include_timestamp and is_datetime_or_timedelta_dtype(pd_dtype): elif include_timestamp and (
is_datetime64_any_dtype(pd_dtype) or is_timedelta64_dtype(pd_dtype)
):
pd_dtypes.append(np.dtype(pd_dtype)) pd_dtypes.append(np.dtype(pd_dtype))
es_field_names.append(es_field_name) es_field_names.append(es_field_name)
es_date_formats.append(es_date_format) es_date_formats.append(es_date_format)