Skip to content

Support PreparedStatement stream parameters #208

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 2 commits into from
Aug 30, 2019
Merged

Support PreparedStatement stream parameters #208

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
d6727e8
Support PreparedStatement stream parameters
nicktorwald Aug 14, 2019
2231ecf
Revert "Change getUnicodeStream encoding from UTF-8 to UTF-16."
nicktorwald Aug 22, 2019
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
107 changes: 91 additions & 16 deletions src/main/java/org/tarantool/jdbc/SQLPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

import org.tarantool.util.SQLStates;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URL;
import java.sql.Array;
Expand Down Expand Up @@ -31,6 +34,7 @@
public class SQLPreparedStatement extends SQLStatement implements PreparedStatement {

private static final String INVALID_CALL_MESSAGE = "The method cannot be called on a PreparedStatement.";
private static final int STREAM_WRITE_CHUNK_SIZE = 4096;

private final String sql;
private final Map<Integer, Object> parameters;
Expand Down Expand Up @@ -182,37 +186,40 @@ public void setTimestamp(int parameterIndex, Timestamp parameterValue, Calendar

@Override
public void setAsciiStream(int parameterIndex, InputStream parameterValue, int length) throws SQLException {
setParameter(parameterIndex, parameterValue);
setAsciiStream(parameterIndex, parameterValue, (long) length);
}

@Override
public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
throw new SQLFeatureNotSupportedException();
public void setAsciiStream(int parameterIndex, InputStream parameterValue) throws SQLException {
setCharStream(parameterIndex, parameterValue, Integer.MAX_VALUE, "ASCII");
}

@Override
public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
throw new SQLFeatureNotSupportedException();
public void setAsciiStream(int parameterIndex, InputStream parameterValue, long length) throws SQLException {
ensureLengthLowerBound(length);
setCharStream(parameterIndex, parameterValue, length, "ASCII");
}

@Override
public void setUnicodeStream(int parameterIndex, InputStream parameterValue, int length) throws SQLException {
setParameter(parameterIndex, parameterValue);
ensureLengthLowerBound(length);
setCharStream(parameterIndex, parameterValue, length, "UTF-8");
}

@Override
public void setBinaryStream(int parameterIndex, InputStream parameterValue, int length) throws SQLException {
setParameter(parameterIndex, parameterValue);
setBinaryStream(parameterIndex, parameterValue, (long) length);
}

@Override
public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
throw new SQLFeatureNotSupportedException();
public void setBinaryStream(int parameterIndex, InputStream parameterValue, long length) throws SQLException {
ensureLengthLowerBound(length);
setBinStream(parameterIndex, parameterValue, length);
}

@Override
public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
throw new SQLFeatureNotSupportedException();
public void setBinaryStream(int parameterIndex, InputStream parameterValue) throws SQLException {
setBinStream(parameterIndex, parameterValue, Integer.MAX_VALUE);
}

@Override
Expand Down Expand Up @@ -257,17 +264,18 @@ public boolean execute(String sql) throws SQLException {

@Override
public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
throw new SQLFeatureNotSupportedException();
setCharacterStream(parameterIndex, reader, (long) length);
}

@Override
public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
throw new SQLFeatureNotSupportedException();
ensureLengthLowerBound(length);
setCharStream(parameterIndex, reader, length);
}

@Override
public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
throw new SQLFeatureNotSupportedException();
setCharStream(parameterIndex, reader, Integer.MAX_VALUE);
}

@Override
Expand Down Expand Up @@ -343,12 +351,12 @@ public void setNString(int parameterIndex, String parameterValue) throws SQLExce

@Override
public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
throw new SQLFeatureNotSupportedException();
setCharacterStream(parameterIndex, value, length);
}

@Override
public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
throw new SQLFeatureNotSupportedException();
setCharacterStream(parameterIndex, value);
}

@Override
Expand Down Expand Up @@ -417,4 +425,71 @@ private Object[] toParametersList(Map<Integer, Object> parameters) throws SQLExc
return objects;
}

private void ensureLengthLowerBound(long length) throws SQLException {
if (length < 0) {
throw new SQLException("Stream size cannot be negative", SQLStates.INVALID_PARAMETER_VALUE.getSqlState());
}
}

private void ensureLengthUpperBound(long length) throws SQLException {
if (length > Integer.MAX_VALUE) {
throw new SQLException("Stream size is too large", SQLStates.INVALID_PARAMETER_VALUE.getSqlState());
}
}

private void setCharStream(int parameterIndex,
InputStream parameterValue,
long length,
String encoding) throws SQLException {
ensureLengthUpperBound(length);
try {
byte[] bytes = convertToBytes(parameterValue, length);
setParameter(parameterIndex, new String(bytes, 0, bytes.length, encoding));
} catch (UnsupportedEncodingException e) {
throw new SQLException("Unsupported encoding", SQLStates.INVALID_PARAMETER_VALUE.getSqlState(), e);
}
}

private void setCharStream(int parameterIndex, Reader reader, long length) throws SQLException {
ensureLengthUpperBound(length);
try {
StringBuilder value = new StringBuilder(STREAM_WRITE_CHUNK_SIZE);
char[] buffer = new char[STREAM_WRITE_CHUNK_SIZE];
int totalRead = 0;
int charsRead;
while (totalRead < length &&
(charsRead = reader.read(buffer, 0, (int) Math.min(length - totalRead, STREAM_WRITE_CHUNK_SIZE))) != -1) {
value.append(buffer, 0, charsRead);
totalRead += charsRead;
}
setParameter(parameterIndex, value.toString());
} catch (IOException e) {
throw new SQLException("Cannot read from the reader", SQLStates.INVALID_PARAMETER_VALUE.getSqlState(), e);
}
}

private void setBinStream(int parameterIndex,
InputStream parameterValue,
long length) throws SQLException {
ensureLengthUpperBound(length);
setBytes(parameterIndex, convertToBytes(parameterValue, length));
}

private byte[] convertToBytes(InputStream parameterValue, long length) throws SQLException {
try {
int bytesRead;
int totalRead = 0;
byte[] buffer = new byte[STREAM_WRITE_CHUNK_SIZE];
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(STREAM_WRITE_CHUNK_SIZE);
while (totalRead < length &&
(bytesRead = parameterValue.read(buffer, 0, (int) Math.min(length - totalRead, STREAM_WRITE_CHUNK_SIZE))) != -1) {
outputStream.write(buffer, 0, bytesRead);
totalRead += bytesRead;
}
return outputStream.toByteArray();
} catch (IOException e) {
throw new SQLException("Cannot read stream", SQLStates.INVALID_PARAMETER_VALUE.getSqlState(), e);
}
}

}
2 changes: 1 addition & 1 deletion src/main/java/org/tarantool/jdbc/SQLResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ public InputStream getAsciiStream(String columnLabel) throws SQLException {
@Override
public InputStream getUnicodeStream(int columnIndex) throws SQLException {
String string = getString(columnIndex);
return string == null ? null : new ByteArrayInputStream(string.getBytes(Charset.forName("UTF-16")));
return string == null ? null : new ByteArrayInputStream(string.getBytes(Charset.forName("UTF-8")));
}

@Override
Expand Down
Loading