-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
Split out JSON Date Converters #31057
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| // Conversion routines that are useful for serialization, | ||
| // but which don't interact with JSON objects directly | ||
|
|
||
| #include "date_conversions.h" | ||
| #include <../../../tslibs/src/datetime/np_datetime.h> | ||
| #include <../../../tslibs/src/datetime/np_datetime_strings.h> | ||
|
|
||
| /* | ||
| * Function: scaleNanosecToUnit | ||
| * ----------------------------- | ||
| * | ||
| * Scales an integer value representing time in nanoseconds to provided unit. | ||
| * | ||
| * Mutates the provided value directly. Returns 0 on success, non-zero on error. | ||
| */ | ||
| int scaleNanosecToUnit(npy_int64 *value, NPY_DATETIMEUNIT unit) { | ||
| switch (unit) { | ||
| case NPY_FR_ns: | ||
| break; | ||
| case NPY_FR_us: | ||
| *value /= 1000LL; | ||
| break; | ||
| case NPY_FR_ms: | ||
| *value /= 1000000LL; | ||
| break; | ||
| case NPY_FR_s: | ||
| *value /= 1000000000LL; | ||
| break; | ||
| default: | ||
| return -1; | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| /* Converts the int64_t representation of a datetime to ISO; mutates len */ | ||
| char *int64ToIso(int64_t value, NPY_DATETIMEUNIT base, size_t *len) { | ||
| npy_datetimestruct dts; | ||
| int ret_code; | ||
|
|
||
| pandas_datetime_to_datetimestruct(value, NPY_FR_ns, &dts); | ||
|
|
||
| *len = (size_t)get_datetime_iso_8601_strlen(0, base); | ||
| char *result = PyObject_Malloc(*len); | ||
|
|
||
| if (result == NULL) { | ||
| PyErr_NoMemory(); | ||
| return NULL; | ||
| } | ||
|
|
||
| ret_code = make_iso_8601_datetime(&dts, result, *len, base); | ||
| if (ret_code != 0) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "Could not convert datetime value to string"); | ||
| PyObject_Free(result); | ||
| } | ||
|
|
||
| // Note that get_datetime_iso_8601_strlen just gives a generic size | ||
| // for ISO string conversion, not the actual size used | ||
| *len = strlen(result); | ||
| return result; | ||
| } | ||
|
|
||
| npy_datetime NpyDateTimeToEpoch(npy_datetime dt, NPY_DATETIMEUNIT base) { | ||
| scaleNanosecToUnit(&dt, base); | ||
| return dt; | ||
| } | ||
|
|
||
| /* Convert PyDatetime To ISO C-string. mutates len */ | ||
| char *PyDateTimeToIso(PyDateTime_Date *obj, NPY_DATETIMEUNIT base, | ||
| size_t *len) { | ||
| npy_datetimestruct dts; | ||
| int ret; | ||
|
|
||
| ret = convert_pydatetime_to_datetimestruct(obj, &dts); | ||
| if (ret != 0) { | ||
| if (!PyErr_Occurred()) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "Could not convert PyDateTime to numpy datetime"); | ||
| } | ||
| return NULL; | ||
| } | ||
|
|
||
| *len = (size_t)get_datetime_iso_8601_strlen(0, base); | ||
| char *result = PyObject_Malloc(*len); | ||
| ret = make_iso_8601_datetime(&dts, result, *len, base); | ||
|
|
||
| if (ret != 0) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "Could not convert datetime value to string"); | ||
| PyObject_Free(result); | ||
| return NULL; | ||
| } | ||
|
|
||
| // Note that get_datetime_iso_8601_strlen just gives a generic size | ||
| // for ISO string conversion, not the actual size used | ||
| *len = strlen(result); | ||
| return result; | ||
| } | ||
|
|
||
| npy_datetime PyDateTimeToEpoch(PyDateTime_Date *dt, NPY_DATETIMEUNIT base) { | ||
| npy_datetimestruct dts; | ||
| int ret; | ||
|
|
||
| ret = convert_pydatetime_to_datetimestruct(dt, &dts); | ||
| if (ret != 0) { | ||
| if (!PyErr_Occurred()) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "Could not convert PyDateTime to numpy datetime"); | ||
| } | ||
| // TODO: is setting errMsg required? | ||
| //((JSONObjectEncoder *)tc->encoder)->errorMsg = ""; | ||
| // return NULL; | ||
| } | ||
|
|
||
| npy_datetime npy_dt = npy_datetimestruct_to_datetime(NPY_FR_ns, &dts); | ||
| return NpyDateTimeToEpoch(npy_dt, base); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #ifndef PANDAS__LIBS_SRC_UJSON_DATE_CONVERSIONS | ||
| #define PANDAS__LIBS_SRC_UJSON_DATE_CONVERSIONS | ||
|
|
||
| #define PY_SSIZE_T_CLEAN | ||
| #include <Python.h> | ||
| #include <numpy/ndarraytypes.h> | ||
| #include "datetime.h" | ||
|
|
||
| // Scales value inplace from nanosecond resolution to unit resolution | ||
| int scaleNanosecToUnit(npy_int64 *value, NPY_DATETIMEUNIT unit); | ||
|
|
||
| // Converts an int64 object representing a date to ISO format | ||
| // up to precision `base` e.g. base="s" yields 2020-01-03T00:00:00Z | ||
| // while base="ns" yields "2020-01-01T00:00:00.000000000Z" | ||
| // len is mutated to save the length of the returned string | ||
| char *int64ToIso(int64_t value, NPY_DATETIMEUNIT base, size_t *len); | ||
|
|
||
| // TODO: this function doesn't do a lot; should augment or replace with | ||
| // scaleNanosecToUnit | ||
| npy_datetime NpyDateTimeToEpoch(npy_datetime dt, NPY_DATETIMEUNIT base); | ||
|
|
||
| // Converts a Python object representing a Date / Datetime to ISO format | ||
| // up to precision `base` e.g. base="s" yields 2020-01-03T00:00:00Z | ||
| // while base="ns" yields "2020-01-01T00:00:00.000000000Z" | ||
| // len is mutated to save the length of the returned string | ||
| char *PyDateTimeToIso(PyDateTime_Date *obj, NPY_DATETIMEUNIT base, size_t *len); | ||
|
|
||
| // Convert a Python Date/Datetime to Unix epoch with resolution base | ||
| npy_datetime PyDateTimeToEpoch(PyDateTime_Date *dt, NPY_DATETIMEUNIT base); | ||
|
|
||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As a minor detail I had to modify the signature of this which previously accepted a PyObject and perform a
PyDateTime_Checkcall. The problem with moving that into a separate file is that you need to callPyDateTime_IMPORTto set an object with static duration in this file separate from what is already inobjToJSON.cand there's not a great place to really set that.We didn't explicitly do anything with the check previously and this aligns better with
PyDateTimeToIsoso I think not a big deal