Skip to content
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

Jump to bottom

Check for overflows when calling jpy getIntValue #3839

Merged
merged 2 commits into from
May 16, 2023
Merged

Check for overflows when calling jpy getIntValue #3839

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc5756
Check for overflows when calling jpy getIntValue
jmao-denver May 16, 2023
0c41ad4
Use the canonical way for checking overflow
jmao-denver May 16, 2023
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
20 changes: 16 additions & 4 deletions Integrations/src/main/java/io/deephaven/integrations/python/PythonValueGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,33 @@ static int getInt(PyObject valueIn) {
if (valueIn == null) {
return QueryConstants.NULL_INT;
}
return valueIn.getIntValue();
long ll = valueIn.getLongValue();
if ((int) ll != ll) {
throw new ArithmeticException("The PyObject value is outside Integer range.");
}
return (int) ll;
}

static short getShort(PyObject valueIn) {
if (valueIn == null) {
return QueryConstants.NULL_SHORT;
return QueryConstants.NULL_SHORT; // NB: should there be a getShortValue() in jpy?
jmao-denver marked this conversation as resolved.
Show resolved Hide resolved
}
long ll = valueIn.getLongValue();
if ((short) ll != ll) {
throw new ArithmeticException("The PyObject value is outside Short range.");
}
return (short) valueIn.getIntValue(); // NB: should there be a getShortValue() in jpy?
return (short) ll;
}

static byte getByte(PyObject valueIn) {
if (valueIn == null) {
return QueryConstants.NULL_BYTE; // NB: should there be a getByteValue() in jpy?
}
return (byte) valueIn.getIntValue();
long ll = valueIn.getLongValue();
if ((byte) ll != ll) {
throw new ArithmeticException("The PyObject value is outside Byte range.");
}
return (byte) ll;
}

static Boolean getBoolean(PyObject valueIn) {
Expand Down