Skip to content

WIP: add support for integer and NA values #64

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

Open
dernst wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: add support for integer and NA values #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19aa2d6
insert NA as NULL and read integer columns
dernst-stat Apr 13, 2018
c1e975a
write NaN as NULL
dernst-stat May 17, 2018
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
25 changes: 19 additions & 6 deletions R/class.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,11 +312,15 @@ setMethod("fetch", signature(res="JDBCResult", n="numeric"), def=function(res, n
cts <- rep(0L, cols)
for (i in 1:cols) {
ct <- .jcall(res@md, "I", "getColumnType", i)
if (ct == -5 | ct ==-6 | (ct >= 2 & ct <= 8)) {
if (ct == 4 | ct == 5) {
l[[i]] <- integer()
cts[i] <- 2L
} else if (ct == -5 | ct ==-6 | (ct >= 2 & ct <= 8)) {
l[[i]] <- numeric()
cts[i] <- 1L
} else
} else {
l[[i]] <- character()
}
names(l)[i] <- .jcall(res@md, "S", "getColumnLabel", i)
}
rp <- res@pull
Expand All @@ -328,13 +332,17 @@ setMethod("fetch", signature(res="JDBCResult", n="numeric"), def=function(res, n
stride <- 32768L ## start fairly small to support tiny queries and increase later
while ((nrec <- .jcall(rp, "I", "fetch", stride, block)) > 0L) {
for (i in seq.int(cols))
l[[i]] <- c(l[[i]], if (cts[i] == 1L) .jcall(rp, "[D", "getDoubles", i) else .jcall(rp, "[Ljava/lang/String;", "getStrings", i))
l[[i]] <- c(l[[i]], if (cts[i] == 1L) .jcall(rp, "[D", "getDoubles", i)
else if(cts[i] == 2L) .jcall(rp, "[I", "getIntegers", i)
else .jcall(rp, "[Ljava/lang/String;", "getStrings", i))
if (nrec < stride) break
stride <- 524288L # 512k
}
} else {
nrec <- .jcall(rp, "I", "fetch", as.integer(n), block)
for (i in seq.int(cols)) l[[i]] <- if (cts[i] == 1L) .jcall(rp, "[D", "getDoubles", i) else .jcall(rp, "[Ljava/lang/String;", "getStrings", i)
for (i in seq.int(cols)) l[[i]] <- if (cts[i] == 1L) .jcall(rp, "[D", "getDoubles", i)
else if(cts[i] == 2L) .jcall(rp, "[I", "getIntegers", i)
else .jcall(rp, "[Ljava/lang/String;", "getStrings", i)
}
# as.data.frame is expensive - create it on the fly from the list
attr(l, "row.names") <- c(NA_integer_, length(l[[1]]))
Expand All @@ -349,7 +357,10 @@ setMethod("dbClearResult", "JDBCResult",
setMethod("dbGetInfo", "JDBCResult", def=function(dbObj, ...) list(has.completed=TRUE), valueClass="list")

## this is not needed for recent DBI, but older implementations didn't provide default methods
setMethod("dbHasCompleted", "JDBCResult", def=function(res, ...) TRUE, valueClass="logical")
#setMethod("dbHasCompleted", "JDBCResult", def=function(res, ...) TRUE, valueClass="logical")
setMethod("dbHasCompleted", "JDBCResult", def=function(res, ...)
.jcall(res@jr, "Z", "isClosed"),
valueClass="logical")

setMethod("dbColumnInfo", "JDBCResult", def = function(res, ...) {
cols <- .jcall(res@md, "I", "getColumnCount")
Expand All @@ -359,7 +370,9 @@ setMethod("dbColumnInfo", "JDBCResult", def = function(res, ...) {
l$name[i] <- .jcall(res@md, "S", "getColumnLabel", i)
l$field.type[i] <- .jcall(res@md, "S", "getColumnTypeName", i)
ct <- .jcall(res@md, "I", "getColumnType", i)
l$data.type[i] <- if (ct == -5 | ct ==-6 | (ct >= 2 & ct <= 8)) "numeric" else "character"
l$data.type[i] <- if(ct == 4 | ct == 5) "integer"
else if (ct == -5 | ct ==-6 | (ct >= 2 & ct <= 8)) "numeric"
else "character"
l$field.name[i] <- .jcall(res@md, "S", "getColumnName", i)
}
as.data.frame(l, row.names=1:cols)
Expand Down
14 changes: 12 additions & 2 deletions java/JDBCBatchExecute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ public class JDBCBatchExecute {
static final int T_DOUBLE = 1;
static final int T_INT = 2;
static final int T_STRING = 3;

public static final double NA_double = Double.longBitsToDouble(0x7ff00000000007a2L);
public static final int NA_integer = -2147483648;


public JDBCBatchExecute(PreparedStatement stat, int n) {
cache = new Object[n];
Expand Down Expand Up @@ -48,10 +52,16 @@ public void execute(int maxBatch) throws java.sql.SQLException {
while (i < ptr) {
if (types[i] == T_DOUBLE) {
double val = ((double[])(cache[i]))[l]; // FIXME: NA?
s.setDouble(i + 1, val);
if(Double.isNaN(val))
s.setNull(i+1, java.sql.Types.DOUBLE);
else
s.setDouble(i + 1, val);
} else if (types[i] == T_INT) {
int val = ((int[])(cache[i]))[l]; // FIXME: NA?
s.setInt(i + 1, val);
if(val == NA_integer)
s.setNull(i+1, java.sql.Types.INTEGER);
else
s.setInt(i + 1, val);
} else if(types[i] == T_STRING) {
String val = ((String[])(cache[i]))[l];
if (val == null)
Expand Down
25 changes: 23 additions & 2 deletions java/JDBCResultPull.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ public class JDBCResultPull {
public static final int CT_STRING = 0;
/** column type: numeric (retrieved as doubles) */
public static final int CT_NUMERIC = 1;
public static final int CT_INTEGER = 2;
/** NA double value */
public static final double NA_double = Double.longBitsToDouble(0x7ff00000000007a2L);
public static final int NA_integer = -2147483648;

/** active result set */
ResultSet rs;
Expand Down Expand Up @@ -53,7 +55,13 @@ public JDBCResultPull(ResultSet rs, int cTypes[]) {
public void setCapacity(int atMost) {
if (capacity != atMost) {
for (int i = 0; i < cols; i++)
data[i] = (cTypes[i] == CT_NUMERIC) ? (Object)new double[atMost] : (Object)new String[atMost];
//data[i] = (cTypes[i] == CT_NUMERIC) ? (Object)new double[atMost] : (Object)new String[atMost];
if(cTypes[i] == CT_NUMERIC)
data[i] = (Object)new double[atMost];
else if(cTypes[i] == CT_INTEGER)
data[i] = (Object)new int[atMost];
else
data[i] = (Object)new String[atMost];
capacity = atMost;
}
}
Expand All @@ -80,6 +88,10 @@ public int fetch(int atMost, int fetchSize) throws java.sql.SQLException {
double val = rs.getDouble(i + 1);
if (rs.wasNull()) val = NA_double;
((double[])data[i])[count] = val;
} else if(cTypes[i] == CT_INTEGER) {
int val = rs.getInt(i + 1);
if (rs.wasNull()) val = NA_integer;
((int[])data[i])[count] = val;
} else
((String[])data[i])[count] = rs.getString(i + 1);
count++;
Expand Down Expand Up @@ -119,4 +131,13 @@ public double[] getDoubles(int column) {
if (count > 0) System.arraycopy(a, 0, b, 0, count);
return b;
}
}

public int[] getIntegers(int column) {
int[] a = (int[]) data[column - 1];
if(count == a.length) return a;

int[] b = new int[count];
if(count > 0) System.arraycopy(a, 0, b, 0, count);
return b;
}
}