Skip to content

Consolidated Nanosecond Conversions #30149

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.

Sign up for GitHub

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 1 commit into from
Dec 9, 2019
Merged

Consolidated Nanosecond Conversions #30149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 41 additions & 45 deletions pandas/_libs/src/ujson/python/objToJSON.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,34 @@ static TypeContext *createTypeContext(void) {
return pc;
}

/*
* 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.
*/
static 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;
}

static PyObject *get_values(PyObject *obj) {
PyObject *values = NULL;

Expand Down Expand Up @@ -542,25 +570,14 @@ static int NpyTypeToJSONType(PyObject *obj, JSONTypeContext *tc, int npyType,
GET_TC(tc)->PyTypeToJSON = NpyDatetime64ToJSON;
return JT_UTF8;
} else {

// TODO: consolidate uses of this switch
switch (((PyObjectEncoder *)tc->encoder)->datetimeUnit) {
case NPY_FR_ns:
break;
case NPY_FR_us:
longVal /= 1000LL;
break;
case NPY_FR_ms:
longVal /= 1000000LL;
break;
case NPY_FR_s:
longVal /= 1000000000LL;
break;
default:
break; // TODO: should raise error
NPY_DATETIMEUNIT unit =
((PyObjectEncoder *)tc->encoder)->datetimeUnit;
if (!scaleNanosecToUnit(&longVal, unit)) {
GET_TC(tc)->longValue = longVal;
return JT_LONG;
} else {
// TODO: some kind of error handling
}
GET_TC(tc)->longValue = longVal;
return JT_LONG;
}
}

Expand Down Expand Up @@ -1653,19 +1670,8 @@ char **NpyArr_encodeLabels(PyArrayObject *labels, PyObjectEncoder *enc,
}
Py_DECREF(ts);

switch (enc->datetimeUnit) {
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:
NPY_DATETIMEUNIT unit = enc->datetimeUnit;
if (scaleNanosecToUnit(&value, unit) != 0) {
Py_DECREF(item);
NpyArr_freeLabels(ret, num);
ret = 0;
Expand Down Expand Up @@ -1737,7 +1743,7 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
PyObjectEncoder *enc;
double val;
npy_int64 value;
int base;
int unit;
PRINTMARK();

tc->prv = NULL;
Expand Down Expand Up @@ -1880,19 +1886,9 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
value = total_seconds(obj) * 1000000000LL; // nanoseconds per second
}

base = ((PyObjectEncoder *)tc->encoder)->datetimeUnit;
switch (base) {
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;
unit = ((PyObjectEncoder *)tc->encoder)->datetimeUnit;
if (scaleNanosecToUnit(&value, unit) != 0) {
// TODO: Add some kind of error handling here
}

exc = PyErr_Occurred();
Expand Down