Skip to content

H
h2database
提交 12e00f3a authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov
浏览文件
操作

Add abstract JdbcLob and make LOB state checks more reliable

上级 3bf8fd6a
master version-1.4.198
无相关合并请求
显示空白字符变更
内嵌 并排
正在显示 包含 285 行增加 和 222 行删除
h2/src/main/org/h2/jdbc/JdbcBlob.java
浏览文件 @ 12e00f3a
...@@ -9,14 +9,12 @@ import java.io.BufferedInputStream; ...@@ -9,14 +9,12 @@ import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PipedInputStream; import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.sql.Blob; import java.sql.Blob;
import java.sql.SQLException; import java.sql.SQLException;
import org.h2.api.ErrorCode;
import org.h2.engine.Constants; import org.h2.engine.Constants;
import org.h2.message.DbException; import org.h2.message.DbException;
import org.h2.message.TraceObject; import org.h2.message.TraceObject;
...@@ -27,18 +25,13 @@ import org.h2.value.Value; ...@@ -27,18 +25,13 @@ import org.h2.value.Value;
/** /**
* Represents a BLOB value. * Represents a BLOB value.
*/ */
public class JdbcBlob extends TraceObject implements Blob { public class JdbcBlob extends JdbcLob implements Blob {
Value value;
private final JdbcConnection conn;
/** /**
* INTERNAL * INTERNAL
*/ */
public JdbcBlob(JdbcConnection conn, Value value, int id) { public JdbcBlob(JdbcConnection conn, Value value, State state, int id) {
setTrace(conn.getSession().getTrace(), TraceObject.BLOB, id); super(conn, value, state, TraceObject.BLOB, id);
this.conn = conn;
this.value = value;
} }
/** /**
...@@ -50,7 +43,7 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -50,7 +43,7 @@ public class JdbcBlob extends TraceObject implements Blob {
public long length() throws SQLException { public long length() throws SQLException {
try { try {
debugCodeCall("length"); debugCodeCall("length");
checkClosed(); checkReadable();
if (value.getType() == Value.BLOB) { if (value.getType() == Value.BLOB) {
long precision = value.getPrecision(); long precision = value.getPrecision();
if (precision > 0) { if (precision > 0) {
...@@ -86,7 +79,7 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -86,7 +79,7 @@ public class JdbcBlob extends TraceObject implements Blob {
if (isDebugEnabled()) { if (isDebugEnabled()) {
debugCode("getBytes("+pos+", "+length+");"); debugCode("getBytes("+pos+", "+length+");");
} }
checkClosed(); checkReadable();
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
try (InputStream in = value.getInputStream()) { try (InputStream in = value.getInputStream()) {
IOUtils.skipFully(in, pos - 1); IOUtils.skipFully(in, pos - 1);
...@@ -113,11 +106,11 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -113,11 +106,11 @@ public class JdbcBlob extends TraceObject implements Blob {
if (isDebugEnabled()) { if (isDebugEnabled()) {
debugCode("setBytes("+pos+", "+quoteBytes(bytes)+");"); debugCode("setBytes("+pos+", "+quoteBytes(bytes)+");");
} }
checkClosed(); checkEditable();
if (pos != 1) { if (pos != 1) {
throw DbException.getInvalidValueException("pos", pos); throw DbException.getInvalidValueException("pos", pos);
} }
value = conn.createBlob(new ByteArrayInputStream(bytes), -1); completeWrite(conn.createBlob(new ByteArrayInputStream(bytes), -1));
return bytes.length; return bytes.length;
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
...@@ -140,31 +133,20 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -140,31 +133,20 @@ public class JdbcBlob extends TraceObject implements Blob {
if (isDebugEnabled()) { if (isDebugEnabled()) {
debugCode("setBytes(" + pos + ", " + quoteBytes(bytes) + ", " + offset + ", " + len + ");"); debugCode("setBytes(" + pos + ", " + quoteBytes(bytes) + ", " + offset + ", " + len + ");");
} }
checkClosed(); checkEditable();
if (pos != 1) { if (pos != 1) {
throw DbException.getInvalidValueException("pos", pos); throw DbException.getInvalidValueException("pos", pos);
} }
value = conn.createBlob(new ByteArrayInputStream(bytes, offset, len), -1); completeWrite(conn.createBlob(new ByteArrayInputStream(bytes, offset, len), -1));
return (int) value.getPrecision(); return (int) value.getPrecision();
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
} }
/**
* Returns the input stream.
*
* @return the input stream
*/
@Override @Override
public InputStream getBinaryStream() throws SQLException { public InputStream getBinaryStream() throws SQLException {
try { return super.getBinaryStream();
debugCodeCall("getBinaryStream");
checkClosed();
return value.getInputStream();
} catch (Exception e) {
throw logAndConvert(e);
}
} }
/** /**
...@@ -183,33 +165,20 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -183,33 +165,20 @@ public class JdbcBlob extends TraceObject implements Blob {
if (isDebugEnabled()) { if (isDebugEnabled()) {
debugCode("setBinaryStream("+pos+");"); debugCode("setBinaryStream("+pos+");");
} }
checkClosed(); checkEditable();
if (pos != 1) { if (pos != 1) {
throw DbException.getInvalidValueException("pos", pos); throw DbException.getInvalidValueException("pos", pos);
} }
if (value.getPrecision() != 0) {
throw DbException.getInvalidValueException("length", value.getPrecision());
}
final JdbcConnection c = conn; // local variable avoids generating synthetic accessor method
final PipedInputStream in = new PipedInputStream(); final PipedInputStream in = new PipedInputStream();
final Task task = new Task() { final Task task = new Task() {
@Override @Override
public void call() { public void call() {
value = c.createBlob(in, -1); completeWrite(conn.createBlob(in, -1));
}
};
PipedOutputStream out = new PipedOutputStream(in) {
@Override
public void close() throws IOException {
super.close();
try {
task.get();
} catch (Exception e) {
throw DbException.convertToIOException(e);
}
} }
}; };
Output out = new Output(in, task);
task.execute(); task.execute();
state = State.SET_CALLED;
return new BufferedOutputStream(out); return new BufferedOutputStream(out);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
...@@ -230,7 +199,7 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -230,7 +199,7 @@ public class JdbcBlob extends TraceObject implements Blob {
} }
if (Constants.BLOB_SEARCH) { if (Constants.BLOB_SEARCH) {
try { try {
checkClosed(); checkReadable();
if (pattern == null) { if (pattern == null) {
return -1; return -1;
} }
...@@ -285,7 +254,7 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -285,7 +254,7 @@ public class JdbcBlob extends TraceObject implements Blob {
} }
if (Constants.BLOB_SEARCH) { if (Constants.BLOB_SEARCH) {
try { try {
checkClosed(); checkReadable();
if (blobPattern == null) { if (blobPattern == null) {
return -1; return -1;
} }
...@@ -306,15 +275,6 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -306,15 +275,6 @@ public class JdbcBlob extends TraceObject implements Blob {
throw unsupported("LOB subset"); throw unsupported("LOB subset");
} }
/**
* Release all resources of this object.
*/
@Override
public void free() {
debugCodeCall("free");
value = null;
}
/** /**
* Returns the input stream, starting from an offset. * Returns the input stream, starting from an offset.
* *
...@@ -325,28 +285,22 @@ public class JdbcBlob extends TraceObject implements Blob { ...@@ -325,28 +285,22 @@ public class JdbcBlob extends TraceObject implements Blob {
@Override @Override
public InputStream getBinaryStream(long pos, long length) throws SQLException { public InputStream getBinaryStream(long pos, long length) throws SQLException {
try { try {
debugCodeCall("getBinaryStream(pos, length)"); if (isDebugEnabled()) {
checkClosed(); debugCode("getBinaryStream(" + pos + ", " + length + ");");
return value.getInputStream(pos, length);
} catch (Exception e) {
throw logAndConvert(e);
} }
checkReadable();
if (state == State.NEW) {
if (pos != 1) {
throw DbException.getInvalidValueException("pos", pos);
} }
if (length != 0) {
private void checkClosed() { throw DbException.getInvalidValueException("length", pos);
conn.checkClosed();
if (value == null) {
throw DbException.get(ErrorCode.OBJECT_CLOSED);
} }
} }
return value.getInputStream(pos, length);
/** } catch (Exception e) {
* INTERNAL throw logAndConvert(e);
*/ }
@Override
public String toString() {
return getTraceObjectName() + ": " +
(value == null ? "null" : value.getTraceSQL());
} }
} }
h2/src/main/org/h2/jdbc/JdbcClob.java
浏览文件 @ 12e00f3a
...@@ -5,11 +5,8 @@ ...@@ -5,11 +5,8 @@
*/ */
package org.h2.jdbc; package org.h2.jdbc;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.Reader; import java.io.Reader;
import java.io.StringReader; import java.io.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
...@@ -17,31 +14,24 @@ import java.io.Writer; ...@@ -17,31 +14,24 @@ import java.io.Writer;
import java.sql.Clob; import java.sql.Clob;
import java.sql.NClob; import java.sql.NClob;
import java.sql.SQLException; import java.sql.SQLException;
import org.h2.api.ErrorCode;
import org.h2.engine.Constants; import org.h2.engine.Constants;
import org.h2.message.DbException; import org.h2.message.DbException;
import org.h2.message.TraceObject; import org.h2.message.TraceObject;
import org.h2.store.RangeReader; import org.h2.store.RangeReader;
import org.h2.util.IOUtils; import org.h2.util.IOUtils;
import org.h2.util.Task;
import org.h2.value.Value; import org.h2.value.Value;
/** /**
* Represents a CLOB value. * Represents a CLOB value.
*/ */
public class JdbcClob extends TraceObject implements NClob public class JdbcClob extends JdbcLob implements NClob {
{
Value value;
private final JdbcConnection conn;
/** /**
* INTERNAL * INTERNAL
*/ */
public JdbcClob(JdbcConnection conn, Value value, int id) { public JdbcClob(JdbcConnection conn, Value value, State state, int id) {
setTrace(conn.getSession().getTrace(), TraceObject.CLOB, id); super(conn, value, state, TraceObject.CLOB, id);
this.conn = conn;
this.value = value;
} }
/** /**
...@@ -53,7 +43,7 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -53,7 +43,7 @@ public class JdbcClob extends TraceObject implements NClob
public long length() throws SQLException { public long length() throws SQLException {
try { try {
debugCodeCall("length"); debugCodeCall("length");
checkClosed(); checkReadable();
if (value.getType() == Value.CLOB) { if (value.getType() == Value.CLOB) {
long precision = value.getPrecision(); long precision = value.getPrecision();
if (precision > 0) { if (precision > 0) {
...@@ -83,7 +73,7 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -83,7 +73,7 @@ public class JdbcClob extends TraceObject implements NClob
public InputStream getAsciiStream() throws SQLException { public InputStream getAsciiStream() throws SQLException {
try { try {
debugCodeCall("getAsciiStream"); debugCodeCall("getAsciiStream");
checkClosed(); checkReadable();
String s = value.getString(); String s = value.getString();
return IOUtils.getInputStreamFromString(s); return IOUtils.getInputStreamFromString(s);
} catch (Exception e) { } catch (Exception e) {
...@@ -99,20 +89,9 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -99,20 +89,9 @@ public class JdbcClob extends TraceObject implements NClob
throw unsupported("LOB update"); throw unsupported("LOB update");
} }
/**
* Returns the reader.
*
* @return the reader
*/
@Override @Override
public Reader getCharacterStream() throws SQLException { public Reader getCharacterStream() throws SQLException {
try { return super.getCharacterStream();
debugCodeCall("getCharacterStream");
checkClosed();
return value.getReader();
} catch (Exception e) {
throw logAndConvert(e);
}
} }
/** /**
...@@ -129,39 +108,14 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -129,39 +108,14 @@ public class JdbcClob extends TraceObject implements NClob
public Writer setCharacterStream(long pos) throws SQLException { public Writer setCharacterStream(long pos) throws SQLException {
try { try {
if (isDebugEnabled()) { if (isDebugEnabled()) {
debugCodeCall("setCharacterStream(" + pos + ");"); debugCode("setCharacterStream(" + pos + ");");
} }
checkClosed(); checkEditable();
if (pos != 1) { if (pos != 1) {
throw DbException.getInvalidValueException("pos", pos); throw DbException.getInvalidValueException("pos", pos);
} }
if (value.getPrecision() != 0) { state = State.SET_CALLED;
throw DbException.getInvalidValueException("length", value.getPrecision()); return setCharacterStreamImpl();
}
final JdbcConnection c = conn; // required to avoid synthetic method creation
// PipedReader / PipedWriter are a lot slower
// than PipedInputStream / PipedOutputStream
// (Sun/Oracle Java 1.6.0_20)
final PipedInputStream in = new PipedInputStream();
final Task task = new Task() {
@Override
public void call() {
value = c.createClob(IOUtils.getReader(in), -1);
}
};
PipedOutputStream out = new PipedOutputStream(in) {
@Override
public void close() throws IOException {
super.close();
try {
task.get();
} catch (Exception e) {
throw DbException.convertToIOException(e);
}
}
};
task.execute();
return IOUtils.getBufferedWriter(out);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -180,7 +134,7 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -180,7 +134,7 @@ public class JdbcClob extends TraceObject implements NClob
if (isDebugEnabled()) { if (isDebugEnabled()) {
debugCode("getSubString(" + pos + ", " + length + ");"); debugCode("getSubString(" + pos + ", " + length + ");");
} }
checkClosed(); checkReadable();
if (pos < 1) { if (pos < 1) {
throw DbException.getInvalidValueException("pos", pos); throw DbException.getInvalidValueException("pos", pos);
} }
...@@ -214,13 +168,13 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -214,13 +168,13 @@ public class JdbcClob extends TraceObject implements NClob
if (isDebugEnabled()) { if (isDebugEnabled()) {
debugCode("setString(" + pos + ", " + quote(str) + ");"); debugCode("setString(" + pos + ", " + quote(str) + ");");
} }
checkClosed(); checkEditable();
if (pos != 1) { if (pos != 1) {
throw DbException.getInvalidValueException("pos", pos); throw DbException.getInvalidValueException("pos", pos);
} else if (str == null) { } else if (str == null) {
throw DbException.getInvalidValueException("str", str); throw DbException.getInvalidValueException("str", str);
} }
value = conn.createClob(new StringReader(str), -1); completeWrite(conn.createClob(new StringReader(str), -1));
return str.length(); return str.length();
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
...@@ -245,13 +199,13 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -245,13 +199,13 @@ public class JdbcClob extends TraceObject implements NClob
if (isDebugEnabled()) { if (isDebugEnabled()) {
debugCode("setString(" + pos + ", " + quote(str) + ", " + offset + ", " + len + ");"); debugCode("setString(" + pos + ", " + quote(str) + ", " + offset + ", " + len + ");");
} }
checkClosed(); checkEditable();
if (pos != 1) { if (pos != 1) {
throw DbException.getInvalidValueException("pos", pos); throw DbException.getInvalidValueException("pos", pos);
} else if (str == null) { } else if (str == null) {
throw DbException.getInvalidValueException("str", str); throw DbException.getInvalidValueException("str", str);
} }
value = conn.createClob(new RangeReader(new StringReader(str), offset, len), -1); completeWrite(conn.createClob(new RangeReader(new StringReader(str), offset, len), -1));
return (int) value.getPrecision(); return (int) value.getPrecision();
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
...@@ -274,15 +228,6 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -274,15 +228,6 @@ public class JdbcClob extends TraceObject implements NClob
throw unsupported("LOB search"); throw unsupported("LOB search");
} }
/**
* Release all resources of this object.
*/
@Override
public void free() {
debugCodeCall("free");
value = null;
}
/** /**
* Returns the reader, starting from an offset. * Returns the reader, starting from an offset.
* *
...@@ -293,28 +238,22 @@ public class JdbcClob extends TraceObject implements NClob ...@@ -293,28 +238,22 @@ public class JdbcClob extends TraceObject implements NClob
@Override @Override
public Reader getCharacterStream(long pos, long length) throws SQLException { public Reader getCharacterStream(long pos, long length) throws SQLException {
try { try {
debugCodeCall("getCharacterStream(pos, length)"); if (isDebugEnabled()) {
checkClosed(); debugCode("getCharacterStream(" + pos + ", " + length + ");");
return value.getReader(pos, length);
} catch (Exception e) {
throw logAndConvert(e);
} }
checkReadable();
if (state == State.NEW) {
if (pos != 1) {
throw DbException.getInvalidValueException("pos", pos);
} }
if (length != 0) {
private void checkClosed() { throw DbException.getInvalidValueException("length", pos);
conn.checkClosed();
if (value == null) {
throw DbException.get(ErrorCode.OBJECT_CLOSED);
} }
} }
return value.getReader(pos, length);
/** } catch (Exception e) {
* INTERNAL throw logAndConvert(e);
*/ }
@Override
public String toString() {
return getTraceObjectName() + ": " + (value == null ?
"null" : value.getTraceSQL());
} }
} }
h2/src/main/org/h2/jdbc/JdbcConnection.java
浏览文件 @ 12e00f3a
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
*/ */
package org.h2.jdbc; package org.h2.jdbc;
import java.io.ByteArrayInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
import java.sql.Array; import java.sql.Array;
import java.sql.Blob; import java.sql.Blob;
...@@ -49,10 +47,10 @@ import org.h2.message.TraceObject; ...@@ -49,10 +47,10 @@ import org.h2.message.TraceObject;
import org.h2.result.ResultInterface; import org.h2.result.ResultInterface;
import org.h2.util.CloseWatcher; import org.h2.util.CloseWatcher;
import org.h2.util.JdbcUtils; import org.h2.util.JdbcUtils;
import org.h2.util.Utils;
import org.h2.value.CompareMode; import org.h2.value.CompareMode;
import org.h2.value.DataType; import org.h2.value.DataType;
import org.h2.value.Value; import org.h2.value.Value;
import org.h2.value.ValueBytes;
import org.h2.value.ValueInt; import org.h2.value.ValueInt;
import org.h2.value.ValueNull; import org.h2.value.ValueNull;
import org.h2.value.ValueString; import org.h2.value.ValueString;
...@@ -1614,16 +1612,7 @@ public class JdbcConnection extends TraceObject ...@@ -1614,16 +1612,7 @@ public class JdbcConnection extends TraceObject
int id = getNextId(TraceObject.CLOB); int id = getNextId(TraceObject.CLOB);
debugCodeAssign("Clob", TraceObject.CLOB, id, "createClob()"); debugCodeAssign("Clob", TraceObject.CLOB, id, "createClob()");
checkClosedForWrite(); checkClosedForWrite();
try { return new JdbcClob(this, ValueString.EMPTY, JdbcLob.State.NEW, id);
Value v = session.getDataHandler().getLobStorage()
.createClob(new InputStreamReader(
new ByteArrayInputStream(Utils.EMPTY_BYTES)),
0);
session.addTemporaryLob(v);
return new JdbcClob(this, v, id);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1640,16 +1629,7 @@ public class JdbcConnection extends TraceObject ...@@ -1640,16 +1629,7 @@ public class JdbcConnection extends TraceObject
int id = getNextId(TraceObject.BLOB); int id = getNextId(TraceObject.BLOB);
debugCodeAssign("Blob", TraceObject.BLOB, id, "createClob()"); debugCodeAssign("Blob", TraceObject.BLOB, id, "createClob()");
checkClosedForWrite(); checkClosedForWrite();
try { return new JdbcBlob(this, ValueBytes.EMPTY, JdbcLob.State.NEW, id);
Value v = session.getDataHandler().getLobStorage().createBlob(
new ByteArrayInputStream(Utils.EMPTY_BYTES), 0);
synchronized (session) {
session.addTemporaryLob(v);
}
return new JdbcBlob(this, v, id);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1666,16 +1646,7 @@ public class JdbcConnection extends TraceObject ...@@ -1666,16 +1646,7 @@ public class JdbcConnection extends TraceObject
int id = getNextId(TraceObject.CLOB); int id = getNextId(TraceObject.CLOB);
debugCodeAssign("NClob", TraceObject.CLOB, id, "createNClob()"); debugCodeAssign("NClob", TraceObject.CLOB, id, "createNClob()");
checkClosedForWrite(); checkClosedForWrite();
try { return new JdbcClob(this, ValueString.EMPTY, JdbcLob.State.NEW, id);
Value v = session.getDataHandler().getLobStorage()
.createClob(new InputStreamReader(
new ByteArrayInputStream(Utils.EMPTY_BYTES)),
0);
session.addTemporaryLob(v);
return new JdbcClob(this, v, id);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -2069,11 +2040,11 @@ public class JdbcConnection extends TraceObject ...@@ -2069,11 +2040,11 @@ public class JdbcConnection extends TraceObject
switch (v.getType()) { switch (v.getType()) {
case Value.CLOB: { case Value.CLOB: {
int id = getNextId(TraceObject.CLOB); int id = getNextId(TraceObject.CLOB);
return new JdbcClob(this, v, id); return new JdbcClob(this, v, JdbcLob.State.WITH_VALUE, id);
} }
case Value.BLOB: { case Value.BLOB: {
int id = getNextId(TraceObject.BLOB); int id = getNextId(TraceObject.BLOB);
return new JdbcBlob(this, v, id); return new JdbcBlob(this, v, JdbcLob.State.WITH_VALUE, id);
} }
case Value.JAVA_OBJECT: case Value.JAVA_OBJECT:
if (SysProperties.serializeJavaObject) { if (SysProperties.serializeJavaObject) {
......
h2/src/main/org/h2/jdbc/JdbcLob.java 0 → 100644
浏览文件 @ 12e00f3a
/*
* Copyright 2004-2018 H2 Group. Multiple-Licensed under the MPL 2.0,
* and the EPL 1.0 (http://h2database.com/html/license.html).
* Initial Developer: H2 Group
*/
package org.h2.jdbc;
import java.io.IOException;
import java.io.InputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.Reader;
import java.io.Writer;
import java.sql.SQLException;
import org.h2.api.ErrorCode;
import org.h2.message.DbException;
import org.h2.message.TraceObject;
import org.h2.util.IOUtils;
import org.h2.util.Task;
import org.h2.value.Value;
/**
* Represents a large object value.
*/
public abstract class JdbcLob extends TraceObject {
final class Output extends PipedOutputStream {
private final Task task;
Output(PipedInputStream snk, Task task) throws IOException {
super(snk);
this.task = task;
}
@Override
public void close() throws IOException {
super.close();
try {
task.get();
} catch (Exception e) {
throw DbException.convertToIOException(e);
}
}
}
/**
* State of the object.
*/
public enum State {
/**
* New object without a value.
*/
NEW,
/**
* One of setter methods is invoked, but stream is not closed yet.
*/
SET_CALLED,
/**
* A value is set.
*/
WITH_VALUE,
/**
* Object is closed.
*/
CLOSED;
}
final JdbcConnection conn;
Value value;
State state;
JdbcLob(JdbcConnection conn, Value value, State state, int type, int id) {
setTrace(conn.getSession().getTrace(), type, id);
this.conn = conn;
this.value = value;
this.state = state;
}
void checkClosed() {
conn.checkClosed();
if (state == State.CLOSED) {
throw DbException.get(ErrorCode.OBJECT_CLOSED);
}
}
void checkEditable() {
checkClosed();
if (state != State.NEW) {
throw DbException.getUnsupportedException("Allocate a new object to set its value.");
}
}
void checkReadable() throws SQLException, IOException {
checkClosed();
if (state == State.SET_CALLED) {
throw DbException.getUnsupportedException("Stream setter is not yet closed.");
}
}
void completeWrite(Value blob) {
checkClosed();
state = State.WITH_VALUE;
value = blob;
}
/**
* Release all resources of this object.
*/
public void free() {
debugCodeCall("free");
state = State.CLOSED;
value = null;
}
/**
* Returns the input stream.
*
* @return the input stream
*/
InputStream getBinaryStream() throws SQLException {
try {
debugCodeCall("getBinaryStream");
checkReadable();
return value.getInputStream();
} catch (Exception e) {
throw logAndConvert(e);
}
}
/**
* Returns the reader.
*
* @return the reader
*/
Reader getCharacterStream() throws SQLException {
try {
debugCodeCall("getCharacterStream");
checkReadable();
return value.getReader();
} catch (Exception e) {
throw logAndConvert(e);
}
}
Writer setCharacterStreamImpl() throws IOException {
return IOUtils.getBufferedWriter(setClobOutputStreamImpl());
}
Output setClobOutputStreamImpl() throws IOException {
// PipedReader / PipedWriter are a lot slower
// than PipedInputStream / PipedOutputStream
// (Sun/Oracle Java 1.6.0_20)
final PipedInputStream in = new PipedInputStream();
final Task task = new Task() {
@Override
public void call() {
completeWrite(conn.createClob(IOUtils.getReader(in), -1));
}
};
Output out = new Output(in, task);
task.execute();
return out;
}
/**
* INTERNAL
*/
@Override
public String toString() {
StringBuilder builder = new StringBuilder().append(getTraceObjectName()).append(": ");
if (state == State.SET_CALLED) {
builder.append("<setter_in_progress>");
} else if (state == State.CLOSED) {
builder.append("<closed>");
} else {
builder.append(value.getTraceSQL());
}
return builder.toString();
}
}
h2/src/main/org/h2/jdbc/JdbcResultSet.java
浏览文件 @ 12e00f3a
...@@ -1024,7 +1024,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -1024,7 +1024,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
id, "getBlob(" + columnIndex + ")"); id, "getBlob(" + columnIndex + ")");
} }
Value v = get(columnIndex); Value v = get(columnIndex);
return v == ValueNull.INSTANCE ? null : new JdbcBlob(conn, v, id); return v == ValueNull.INSTANCE ? null : new JdbcBlob(conn, v, JdbcLob.State.WITH_VALUE, id);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1047,7 +1047,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -1047,7 +1047,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
id, "getBlob(" + quote(columnLabel) + ")"); id, "getBlob(" + quote(columnLabel) + ")");
} }
Value v = get(columnLabel); Value v = get(columnLabel);
return v == ValueNull.INSTANCE ? null : new JdbcBlob(conn, v, id); return v == ValueNull.INSTANCE ? null : new JdbcBlob(conn, v, JdbcLob.State.WITH_VALUE, id);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1142,7 +1142,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -1142,7 +1142,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
debugCodeAssign("Clob", TraceObject.CLOB, id, "getClob(" + columnIndex + ")"); debugCodeAssign("Clob", TraceObject.CLOB, id, "getClob(" + columnIndex + ")");
} }
Value v = get(columnIndex); Value v = get(columnIndex);
return v == ValueNull.INSTANCE ? null : new JdbcClob(conn, v, id); return v == ValueNull.INSTANCE ? null : new JdbcClob(conn, v, JdbcLob.State.WITH_VALUE, id);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1165,7 +1165,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -1165,7 +1165,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
quote(columnLabel) + ")"); quote(columnLabel) + ")");
} }
Value v = get(columnLabel); Value v = get(columnLabel);
return v == ValueNull.INSTANCE ? null : new JdbcClob(conn, v, id); return v == ValueNull.INSTANCE ? null : new JdbcClob(conn, v, JdbcLob.State.WITH_VALUE, id);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -3399,11 +3399,15 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -3399,11 +3399,15 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
} }
/** /**
* [Not supported] * Updates a column in the current or insert row.
*
* @param columnIndex (1,2,...)
* @param x the value
* @throws SQLException if the result set is closed or not updatable
*/ */
@Override @Override
public void updateNClob(int columnIndex, NClob x) throws SQLException { public void updateNClob(int columnIndex, NClob x) throws SQLException {
throw unsupported("NClob"); updateClob(columnIndex, x);
} }
/** /**
...@@ -3459,11 +3463,15 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -3459,11 +3463,15 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
} }
/** /**
* [Not supported] * Updates a column in the current or insert row.
*
* @param columnLabel the column label
* @param x the value
* @throws SQLException if the result set is closed or not updatable
*/ */
@Override @Override
public void updateNClob(String columnLabel, NClob x) throws SQLException { public void updateNClob(String columnLabel, NClob x) throws SQLException {
throw unsupported("NClob"); updateClob(columnLabel, x);
} }
/** /**
...@@ -3482,7 +3490,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -3482,7 +3490,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
debugCodeAssign("NClob", TraceObject.CLOB, id, "getNClob(" + columnIndex + ")"); debugCodeAssign("NClob", TraceObject.CLOB, id, "getNClob(" + columnIndex + ")");
} }
Value v = get(columnIndex); Value v = get(columnIndex);
return v == ValueNull.INSTANCE ? null : new JdbcClob(conn, v, id); return v == ValueNull.INSTANCE ? null : new JdbcClob(conn, v, JdbcLob.State.WITH_VALUE, id);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -3504,7 +3512,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -3504,7 +3512,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
debugCodeAssign("NClob", TraceObject.CLOB, id, "getNClob(" + columnLabel + ")"); debugCodeAssign("NClob", TraceObject.CLOB, id, "getNClob(" + columnLabel + ")");
} }
Value v = get(columnLabel); Value v = get(columnLabel);
return v == ValueNull.INSTANCE ? null : new JdbcClob(conn, v, id); return v == ValueNull.INSTANCE ? null : new JdbcClob(conn, v, JdbcLob.State.WITH_VALUE, id);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -3811,10 +3819,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS ...@@ -3811,10 +3819,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
return type.cast(value == ValueNull.INSTANCE ? null : new JdbcArray(conn, value, id)); return type.cast(value == ValueNull.INSTANCE ? null : new JdbcArray(conn, value, id));
} else if (type == Blob.class) { } else if (type == Blob.class) {
int id = getNextId(TraceObject.BLOB); int id = getNextId(TraceObject.BLOB);
return type.cast(value == ValueNull.INSTANCE ? null : new JdbcBlob(conn, value, id)); return type.cast(value == ValueNull.INSTANCE
? null : new JdbcBlob(conn, value, JdbcLob.State.WITH_VALUE, id));
} else if (type == Clob.class) { } else if (type == Clob.class) {
int id = getNextId(TraceObject.CLOB); int id = getNextId(TraceObject.CLOB);
return type.cast(value == ValueNull.INSTANCE ? null : new JdbcClob(conn, value, id)); return type.cast(value == ValueNull.INSTANCE
? null : new JdbcClob(conn, value, JdbcLob.State.WITH_VALUE, id));
} else if (type == TimestampWithTimeZone.class) { } else if (type == TimestampWithTimeZone.class) {
return type.cast(value.getObject()); return type.cast(value.getObject());
} else if (DataType.isGeometryClass(type)) { } else if (DataType.isGeometryClass(type)) {
......
h2/src/main/org/h2/value/DataType.java
浏览文件 @ 12e00f3a
...@@ -24,6 +24,7 @@ import java.sql.Types; ...@@ -24,6 +24,7 @@ import java.sql.Types;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID; import java.util.UUID;
import org.h2.api.ErrorCode; import org.h2.api.ErrorCode;
import org.h2.api.TimestampWithTimeZone; import org.h2.api.TimestampWithTimeZone;
import org.h2.engine.Mode; import org.h2.engine.Mode;
...@@ -33,6 +34,7 @@ import org.h2.jdbc.JdbcArray; ...@@ -33,6 +34,7 @@ import org.h2.jdbc.JdbcArray;
import org.h2.jdbc.JdbcBlob; import org.h2.jdbc.JdbcBlob;
import org.h2.jdbc.JdbcClob; import org.h2.jdbc.JdbcClob;
import org.h2.jdbc.JdbcConnection; import org.h2.jdbc.JdbcConnection;
import org.h2.jdbc.JdbcLob;
import org.h2.message.DbException; import org.h2.message.DbException;
import org.h2.tools.SimpleResultSet; import org.h2.tools.SimpleResultSet;
import org.h2.util.JdbcUtils; import org.h2.util.JdbcUtils;
...@@ -1365,9 +1367,9 @@ public class DataType { ...@@ -1365,9 +1367,9 @@ public class DataType {
public static Object convertTo(JdbcConnection conn, Value v, public static Object convertTo(JdbcConnection conn, Value v,
Class<?> paramClass) { Class<?> paramClass) {
if (paramClass == Blob.class) { if (paramClass == Blob.class) {
return new JdbcBlob(conn, v, 0); return new JdbcBlob(conn, v, JdbcLob.State.WITH_VALUE, 0);
} else if (paramClass == Clob.class) { } else if (paramClass == Clob.class) {
return new JdbcClob(conn, v, 0); return new JdbcClob(conn, v, JdbcLob.State.WITH_VALUE, 0);
} else if (paramClass == Array.class) { } else if (paramClass == Array.class) {
return new JdbcArray(conn, v, 0); return new JdbcArray(conn, v, 0);
} }
......
h2/src/main/org/h2/value/ValueBytes.java
浏览文件 @ 12e00f3a
...@@ -21,7 +21,10 @@ import org.h2.util.Utils; ...@@ -21,7 +21,10 @@ import org.h2.util.Utils;
*/ */
public class ValueBytes extends Value { public class ValueBytes extends Value {
private static final ValueBytes EMPTY = new ValueBytes(Utils.EMPTY_BYTES); /**
* Empty value.
*/
public static final ValueBytes EMPTY = new ValueBytes(Utils.EMPTY_BYTES);
/** /**
* The value. * The value.
......
h2/src/main/org/h2/value/ValueString.java
浏览文件 @ 12e00f3a
...@@ -18,7 +18,11 @@ import org.h2.util.StringUtils; ...@@ -18,7 +18,11 @@ import org.h2.util.StringUtils;
*/ */
public class ValueString extends Value { public class ValueString extends Value {
private static final ValueString EMPTY = new ValueString(""); /**
* Empty string. Should not be used in places where empty string can be
* treated as {@code NULL} depending on database mode.
*/
public static final ValueString EMPTY = new ValueString("");
/** /**
* The string data. * The string data.
......
h2/src/test/org/h2/test/jdbc/TestLobApi.java
浏览文件 @ 12e00f3a
...@@ -81,7 +81,7 @@ public class TestLobApi extends TestDb { ...@@ -81,7 +81,7 @@ public class TestLobApi extends TestDb {
assertEquals("x", new String(data, StandardCharsets.UTF_8)); assertEquals("x", new String(data, StandardCharsets.UTF_8));
assertTrue(clob.toString().endsWith("'x'")); assertTrue(clob.toString().endsWith("'x'"));
clob.free(); clob.free();
assertTrue(clob.toString().endsWith("null")); assertTrue(clob.toString().endsWith("<closed>"));
assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, clob). assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, clob).
truncate(0); truncate(0);
...@@ -101,7 +101,7 @@ public class TestLobApi extends TestDb { ...@@ -101,7 +101,7 @@ public class TestLobApi extends TestDb {
position((Blob) null, 0); position((Blob) null, 0);
assertTrue(blob.toString().endsWith("X'00'")); assertTrue(blob.toString().endsWith("X'00'"));
blob.free(); blob.free();
assertTrue(blob.toString().endsWith("null")); assertTrue(blob.toString().endsWith("<closed>"));
stat.execute("drop table test"); stat.execute("drop table test");
conn.close(); conn.close();
......
h2/src/test/org/h2/test/jdbc/TestResultSet.java
浏览文件 @ 12e00f3a
...@@ -20,7 +20,6 @@ import java.sql.Clob; ...@@ -20,7 +20,6 @@ import java.sql.Clob;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DatabaseMetaData; import java.sql.DatabaseMetaData;
import java.sql.Date; import java.sql.Date;
import java.sql.NClob;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.Ref; import java.sql.Ref;
import java.sql.ResultSet; import java.sql.ResultSet;
...@@ -178,10 +177,6 @@ public class TestResultSet extends TestDb { ...@@ -178,10 +177,6 @@ public class TestResultSet extends TestDb {
updateRowId(1, (RowId) null); updateRowId(1, (RowId) null);
assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, rs). assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, rs).
updateRowId("x", (RowId) null); updateRowId("x", (RowId) null);
assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, rs).
updateNClob(1, (NClob) null);
assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, rs).
updateNClob("x", (NClob) null);
assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, rs). assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, rs).
updateSQLXML(1, (SQLXML) null); updateSQLXML(1, (SQLXML) null);
assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, rs). assertThrows(ErrorCode.FEATURE_NOT_SUPPORTED_1, rs).
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论