Skip to content

H
h2database
提交 a263a7d0 authored 作者: Thomas Mueller's avatar Thomas Mueller
浏览文件
操作

More bugs in the server-less multi-connection mode have been fixed.

上级 b4ee1336
隐藏空白字符变更
内嵌 并排
正在显示 包含 333 行增加 和 189 行删除
h2/src/docsrc/html/changelog.html
浏览文件 @ a263a7d0
...@@ -18,7 +18,11 @@ Change Log ...@@ -18,7 +18,11 @@ Change Log
<h1>Change Log</h1> <h1>Change Log</h1>
<h2>Next Version (unreleased)</h2> <h2>Next Version (unreleased)</h2>
<ul><li>User defined functions: the source code is now available using <ul><li>More bugs in the server-less multi-connection mode have been fixed.
</li><li>When running against an old database, the SCRIPT statement could generate a
SQL script that contained duplicate indexes (PRIMARY_KEY_E).
</li><li>JdbcConnectionPool.getConnection() could throw a NullPointerException.
</li><li>User defined functions: the source code is now available using
SELECT SOURCE FROM INFORMATION_SCHEMA.FUNCTION_ALIASES. SELECT SOURCE FROM INFORMATION_SCHEMA.FUNCTION_ALIASES.
</li><li>User defined functions with source code didn't work after re-opening the database. </li><li>User defined functions with source code didn't work after re-opening the database.
</li><li>The newsfeeds are now Atom 1.0 standard compliant. </li><li>The newsfeeds are now Atom 1.0 standard compliant.
......
h2/src/main/org/h2/engine/Database.java
浏览文件 @ a263a7d0
...@@ -169,8 +169,9 @@ public class Database implements DataHandler { ...@@ -169,8 +169,9 @@ public class Database implements DataHandler {
private Properties reconnectLastLock; private Properties reconnectLastLock;
private volatile long reconnectCheckNext; private volatile long reconnectCheckNext;
private volatile boolean reconnectChangePending; private volatile boolean reconnectChangePending;
private volatile boolean checkpointAllowed; private volatile int checkpointAllowed;
private volatile boolean checkpointRunning; private volatile boolean checkpointRunning;
private final Object reconnectSync = new Object();
private int cacheSize; private int cacheSize;
private boolean compactFully; private boolean compactFully;
private SourceCompiler compiler; private SourceCompiler compiler;
...@@ -467,7 +468,7 @@ public class Database implements DataHandler { ...@@ -467,7 +468,7 @@ public class Database implements DataHandler {
} }
} }
Engine.getInstance().close(databaseName); Engine.getInstance().close(databaseName);
throw Message.getSQLException(ErrorCode.SIMULATED_POWER_OFF); throw Message.getSQLException(ErrorCode.DATABASE_IS_CLOSED);
} }
/** /**
...@@ -719,6 +720,7 @@ public class Database implements DataHandler { ...@@ -719,6 +720,7 @@ public class Database implements DataHandler {
} }
systemSession.commit(true); systemSession.commit(true);
traceSystem.getTrace(Trace.DATABASE).info("opened " + databaseName); traceSystem.getTrace(Trace.DATABASE).info("opened " + databaseName);
afterWriting();
} }
public Schema getMainSchema() { public Schema getMainSchema() {
...@@ -1289,7 +1291,7 @@ public class Database implements DataHandler { ...@@ -1289,7 +1291,7 @@ public class Database implements DataHandler {
pageStore.compact(compactFully); pageStore.compact(compactFully);
} }
} catch (SQLException e) { } catch (SQLException e) {
if (e.getErrorCode() != ErrorCode.SIMULATED_POWER_OFF){ if (e.getErrorCode() != ErrorCode.DATABASE_IS_CLOSED){
// e.printStackTrace(); // e.printStackTrace();
// TODO don't ignore exceptions // TODO don't ignore exceptions
} }
...@@ -2388,24 +2390,27 @@ public class Database implements DataHandler { ...@@ -2388,24 +2390,27 @@ public class Database implements DataHandler {
if (fileLockMethod != FileLock.LOCK_SERIALIZED || readOnly || !reconnectChangePending || closing) { if (fileLockMethod != FileLock.LOCK_SERIALIZED || readOnly || !reconnectChangePending || closing) {
return; return;
} }
// to avoid race conditions, we already set it here
// (overlap with checkpointAllowed)
checkpointRunning = true;
if (!checkpointAllowed) {
checkpointRunning = false;
return;
}
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
if (now > reconnectCheckNext + SysProperties.RECONNECT_CHECK_DELAY) { if (now > reconnectCheckNext + SysProperties.RECONNECT_CHECK_DELAY) {
if (SysProperties.CHECK && checkpointAllowed < 0) {
Message.throwInternalError();
}
synchronized (reconnectSync) {
if (checkpointAllowed > 0) {
return;
}
checkpointRunning = true;
}
synchronized (this) { synchronized (this) {
getTrace().debug("checkpoint start"); getTrace().debug("checkpoint start");
flushIndexes(0); flushIndexes(0);
checkpoint(); checkpoint();
reconnectModified(false); reconnectModified(false);
checkpointRunning = false;
getTrace().debug("checkpoint end"); getTrace().debug("checkpoint end");
} }
synchronized (reconnectSync) {
checkpointRunning = false;
}
} }
} }
...@@ -2462,33 +2467,44 @@ public class Database implements DataHandler { ...@@ -2462,33 +2467,44 @@ public class Database implements DataHandler {
* false if another connection was faster * false if another connection was faster
*/ */
public boolean beforeWriting() { public boolean beforeWriting() {
if (fileLockMethod == FileLock.LOCK_SERIALIZED) { if (fileLockMethod != FileLock.LOCK_SERIALIZED) {
// to avoid race conditions, we already set it here return true;
// (overlap with checkpointRunning) }
checkpointAllowed = false; while (checkpointRunning) {
while (checkpointRunning) { try {
try { Thread.sleep(10 + (int) (Math.random() * 10));
Thread.sleep(10 + (int) (Math.random() * 10)); } catch (Exception e) {
} catch (Exception e) { // ignore
// ignore
}
} }
boolean writingAllowed = reconnectModified(true); }
if (!writingAllowed) { synchronized (reconnectSync) {
// make sure the next call to isReconnectNeeded() returns yes if (reconnectModified(true)) {
reconnectCheckNext = System.currentTimeMillis() - 1; checkpointAllowed++;
reconnectLastLock = null; if (SysProperties.CHECK && checkpointAllowed > 20) {
throw Message.throwInternalError();
}
return true;
} }
return writingAllowed;
} }
return true; // make sure the next call to isReconnectNeeded() returns true
reconnectCheckNext = System.currentTimeMillis() - 1;
reconnectLastLock = null;
return false;
} }
/** /**
* This method is called after updates are finished. * This method is called after updates are finished.
*/ */
public void afterWriting() { public void afterWriting() {
checkpointAllowed = true; if (fileLockMethod != FileLock.LOCK_SERIALIZED) {
return;
}
synchronized (reconnectSync) {
checkpointAllowed--;
}
if (SysProperties.CHECK && checkpointAllowed < 0) {
throw Message.throwInternalError();
}
} }
/** /**
......
h2/src/main/org/h2/engine/Session.java
浏览文件 @ a263a7d0
...@@ -28,7 +28,7 @@ import org.h2.log.UndoLogRecord; ...@@ -28,7 +28,7 @@ import org.h2.log.UndoLogRecord;
import org.h2.message.Message; import org.h2.message.Message;
import org.h2.message.Trace; import org.h2.message.Trace;
import org.h2.message.TraceSystem; import org.h2.message.TraceSystem;
import org.h2.result.LocalResult; import org.h2.result.ResultInterface;
import org.h2.result.Row; import org.h2.result.Row;
import org.h2.schema.Schema; import org.h2.schema.Schema;
import org.h2.store.DataHandler; import org.h2.store.DataHandler;
...@@ -93,7 +93,7 @@ public class Session extends SessionWithState { ...@@ -93,7 +93,7 @@ public class Session extends SessionWithState {
private long sessionStart = System.currentTimeMillis(); private long sessionStart = System.currentTimeMillis();
private long currentCommandStart; private long currentCommandStart;
private HashMap<String, Value> variables; private HashMap<String, Value> variables;
private HashSet<LocalResult> temporaryResults; private HashSet<ResultInterface> temporaryResults;
private int queryTimeout = SysProperties.getMaxQueryTimeout(); private int queryTimeout = SysProperties.getMaxQueryTimeout();
private int lastUncommittedDelete; private int lastUncommittedDelete;
private boolean commitOrRollbackDisabled; private boolean commitOrRollbackDisabled;
...@@ -1059,7 +1059,7 @@ public class Session extends SessionWithState { ...@@ -1059,7 +1059,7 @@ public class Session extends SessionWithState {
* *
* @param result the temporary result set * @param result the temporary result set
*/ */
public void addTemporaryResult(LocalResult result) { public void addTemporaryResult(ResultInterface result) {
if (!result.needToClose()) { if (!result.needToClose()) {
return; return;
} }
...@@ -1078,7 +1078,7 @@ public class Session extends SessionWithState { ...@@ -1078,7 +1078,7 @@ public class Session extends SessionWithState {
*/ */
public void closeTemporaryResults() { public void closeTemporaryResults() {
if (temporaryResults != null) { if (temporaryResults != null) {
for (LocalResult result : temporaryResults) { for (ResultInterface result : temporaryResults) {
result.close(); result.close();
} }
temporaryResults = null; temporaryResults = null;
...@@ -1129,6 +1129,10 @@ public class Session extends SessionWithState { ...@@ -1129,6 +1129,10 @@ public class Session extends SessionWithState {
} }
} }
public void afterWriting() {
database.afterWriting();
}
public SessionInterface reconnect(boolean write) throws SQLException { public SessionInterface reconnect(boolean write) throws SQLException {
readSessionState(); readSessionState();
close(); close();
......
h2/src/main/org/h2/engine/SessionInterface.java
浏览文件 @ a263a7d0
...@@ -89,4 +89,10 @@ public interface SessionInterface { ...@@ -89,4 +89,10 @@ public interface SessionInterface {
*/ */
SessionInterface reconnect(boolean write) throws SQLException; SessionInterface reconnect(boolean write) throws SQLException;
/**
* Called after writing has ended. It needs to be called after
* isReconnectNeeded(true) returned false.
*/
void afterWriting();
} }
h2/src/main/org/h2/engine/SessionRemote.java
浏览文件 @ a263a7d0
...@@ -661,4 +661,8 @@ public class SessionRemote extends SessionWithState implements SessionFactory, D ...@@ -661,4 +661,8 @@ public class SessionRemote extends SessionWithState implements SessionFactory, D
return this; return this;
} }
public void afterWriting() {
// nothing to do
}
} }
h2/src/main/org/h2/jdbc/JdbcConnection.java
浏览文件 @ a263a7d0
...@@ -306,9 +306,10 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -306,9 +306,10 @@ public class JdbcConnection extends TraceObject implements Connection {
if (!session.isClosed()) { if (!session.isClosed()) {
try { try {
// roll back unless that would require to re-connect // roll back unless that would require to re-connect
// (the transaction can't be rolled back when re-connecting) // (the transaction can't be rolled back after re-connecting)
if (!session.isReconnectNeeded(true)) { if (!session.isReconnectNeeded(true)) {
rollbackInternal(); rollbackInternal();
session.afterWriting();
} }
commit = closeAndSetNull(commit); commit = closeAndSetNull(commit);
rollback = closeAndSetNull(rollback); rollback = closeAndSetNull(rollback);
...@@ -405,8 +406,12 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -405,8 +406,12 @@ public class JdbcConnection extends TraceObject implements Connection {
try { try {
debugCodeCall("commit"); debugCodeCall("commit");
checkClosedForWrite(); checkClosedForWrite();
commit = prepareCommand("COMMIT", commit); try {
commit.executeUpdate(); commit = prepareCommand("COMMIT", commit);
commit.executeUpdate();
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -423,7 +428,11 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -423,7 +428,11 @@ public class JdbcConnection extends TraceObject implements Connection {
try { try {
debugCodeCall("rollback"); debugCodeCall("rollback");
checkClosedForWrite(); checkClosedForWrite();
rollbackInternal(); try {
rollbackInternal();
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -914,7 +923,11 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -914,7 +923,11 @@ public class JdbcConnection extends TraceObject implements Connection {
JdbcSavepoint sp = convertSavepoint(savepoint); JdbcSavepoint sp = convertSavepoint(savepoint);
debugCode("rollback(" + sp.getTraceObjectName() + ");"); debugCode("rollback(" + sp.getTraceObjectName() + ");");
checkClosedForWrite(); checkClosedForWrite();
sp.rollback(); try {
sp.rollback();
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1338,6 +1351,10 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -1338,6 +1351,10 @@ public class JdbcConnection extends TraceObject implements Connection {
} }
} }
protected void afterWriting() {
session.afterWriting();
}
String getURL() throws SQLException { String getURL() throws SQLException {
checkClosed(); checkClosed();
return url; return url;
...@@ -1408,8 +1425,12 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -1408,8 +1425,12 @@ public class JdbcConnection extends TraceObject implements Connection {
int id = getNextId(TraceObject.CLOB); int id = getNextId(TraceObject.CLOB);
debugCodeAssign("Clob", TraceObject.CLOB, id, "createClob()"); debugCodeAssign("Clob", TraceObject.CLOB, id, "createClob()");
checkClosedForWrite(); checkClosedForWrite();
ValueLob v = ValueLob.createSmallLob(Value.CLOB, MemoryUtils.EMPTY_BYTES); try {
return new JdbcClob(this, v, id); ValueLob v = ValueLob.createSmallLob(Value.CLOB, MemoryUtils.EMPTY_BYTES);
return new JdbcClob(this, v, id);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1425,8 +1446,12 @@ public class JdbcConnection extends TraceObject implements Connection { ...@@ -1425,8 +1446,12 @@ public class JdbcConnection extends TraceObject implements Connection {
int id = getNextId(TraceObject.BLOB); int id = getNextId(TraceObject.BLOB);
debugCodeAssign("Blob", TraceObject.BLOB, id, "createClob()"); debugCodeAssign("Blob", TraceObject.BLOB, id, "createClob()");
checkClosedForWrite(); checkClosedForWrite();
ValueLob v = ValueLob.createSmallLob(Value.BLOB, MemoryUtils.EMPTY_BYTES); try {
return new JdbcBlob(this, v, id); ValueLob v = ValueLob.createSmallLob(Value.BLOB, MemoryUtils.EMPTY_BYTES);
return new JdbcBlob(this, v, id);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
......
h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java
浏览文件 @ a263a7d0
...@@ -125,7 +125,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -125,7 +125,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
try { try {
debugCodeCall("executeUpdate"); debugCodeCall("executeUpdate");
checkClosedForWrite(); checkClosedForWrite();
return executeUpdateInternal(); try {
return executeUpdateInternal();
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -160,26 +164,30 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -160,26 +164,30 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCodeCall("execute"); debugCodeCall("execute");
} }
checkClosedForWrite(); checkClosedForWrite();
closeOldResultSet(); try {
boolean returnsResultSet; closeOldResultSet();
synchronized (conn.getSession()) { boolean returnsResultSet;
try { synchronized (conn.getSession()) {
setExecutingStatement(command); try {
if (command.isQuery()) { setExecutingStatement(command);
returnsResultSet = true; if (command.isQuery()) {
boolean scrollable = resultSetType != ResultSet.TYPE_FORWARD_ONLY; returnsResultSet = true;
boolean updatable = resultSetConcurrency == ResultSet.CONCUR_UPDATABLE; boolean scrollable = resultSetType != ResultSet.TYPE_FORWARD_ONLY;
ResultInterface result = command.executeQuery(maxRows, scrollable); boolean updatable = resultSetConcurrency == ResultSet.CONCUR_UPDATABLE;
resultSet = new JdbcResultSet(conn, this, result, id, closedByResultSet, scrollable, updatable); ResultInterface result = command.executeQuery(maxRows, scrollable);
} else { resultSet = new JdbcResultSet(conn, this, result, id, closedByResultSet, scrollable, updatable);
returnsResultSet = false; } else {
updateCount = command.executeUpdate(); returnsResultSet = false;
updateCount = command.executeUpdate();
}
} finally {
setExecutingStatement(null);
} }
} finally {
setExecutingStatement(null);
} }
return returnsResultSet;
} finally {
afterWriting();
} }
return returnsResultSet;
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -700,13 +708,17 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -700,13 +708,17 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setBlob("+parameterIndex+", x);"); debugCode("setBlob("+parameterIndex+", x);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v; try {
if (x == null) { Value v;
v = ValueNull.INSTANCE; if (x == null) {
} else { v = ValueNull.INSTANCE;
v = conn.createBlob(x.getBinaryStream(), -1); } else {
v = conn.createBlob(x.getBinaryStream(), -1);
}
setParameter(parameterIndex, v);
} finally {
afterWriting();
} }
setParameter(parameterIndex, v);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -727,8 +739,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -727,8 +739,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setBlob("+parameterIndex+", x);"); debugCode("setBlob("+parameterIndex+", x);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createBlob(x, -1); try {
setParameter(parameterIndex, v); Value v = conn.createBlob(x, -1);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -747,13 +763,17 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -747,13 +763,17 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setClob("+parameterIndex+", x);"); debugCode("setClob("+parameterIndex+", x);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v; try {
if (x == null) { Value v;
v = ValueNull.INSTANCE; if (x == null) {
} else { v = ValueNull.INSTANCE;
v = conn.createClob(x.getCharacterStream(), -1); } else {
v = conn.createClob(x.getCharacterStream(), -1);
}
setParameter(parameterIndex, v);
} finally {
afterWriting();
} }
setParameter(parameterIndex, v);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -774,13 +794,17 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -774,13 +794,17 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setClob("+parameterIndex+", x);"); debugCode("setClob("+parameterIndex+", x);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v; try {
if (x == null) { Value v;
v = ValueNull.INSTANCE; if (x == null) {
} else { v = ValueNull.INSTANCE;
v = conn.createClob(x, -1); } else {
v = conn.createClob(x, -1);
}
setParameter(parameterIndex, v);
} finally {
afterWriting();
} }
setParameter(parameterIndex, v);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -833,8 +857,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -833,8 +857,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setBinaryStream("+parameterIndex+", x, "+length+"L);"); debugCode("setBinaryStream("+parameterIndex+", x, "+length+"L);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createBlob(x, length); try {
setParameter(parameterIndex, v); Value v = conn.createBlob(x, length);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -897,8 +925,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -897,8 +925,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setAsciiStream("+parameterIndex+", x, "+length+"L);"); debugCode("setAsciiStream("+parameterIndex+", x, "+length+"L);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createClob(IOUtils.getAsciiReader(x), length); try {
setParameter(parameterIndex, v); Value v = conn.createClob(IOUtils.getAsciiReader(x), length);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -960,8 +992,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -960,8 +992,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setCharacterStream("+parameterIndex+", x, "+length+"L);"); debugCode("setCharacterStream("+parameterIndex+", x, "+length+"L);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createClob(x, length); try {
setParameter(parameterIndex, v); Value v = conn.createClob(x, length);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1045,7 +1081,6 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1045,7 +1081,6 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
public int[] executeBatch() throws SQLException { public int[] executeBatch() throws SQLException {
try { try {
debugCodeCall("executeBatch"); debugCodeCall("executeBatch");
checkClosedForWrite();
if (batchParameters == null) { if (batchParameters == null) {
// TODO batch: check what other database do if no parameters are set // TODO batch: check what other database do if no parameters are set
batchParameters = ObjectArray.newInstance(); batchParameters = ObjectArray.newInstance();
...@@ -1053,37 +1088,42 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1053,37 +1088,42 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
int[] result = new int[batchParameters.size()]; int[] result = new int[batchParameters.size()];
boolean error = false; boolean error = false;
SQLException next = null; SQLException next = null;
for (int i = 0; i < batchParameters.size(); i++) { checkClosedForWrite();
Value[] set = batchParameters.get(i); try {
ObjectArray< ? extends ParameterInterface> parameters = command.getParameters(); for (int i = 0; i < batchParameters.size(); i++) {
for (int j = 0; j < set.length; j++) { Value[] set = batchParameters.get(i);
Value value = set[j]; ObjectArray< ? extends ParameterInterface> parameters = command.getParameters();
ParameterInterface param = parameters.get(j); for (int j = 0; j < set.length; j++) {
param.setValue(value, false); Value value = set[j];
} ParameterInterface param = parameters.get(j);
try { param.setValue(value, false);
result[i] = executeUpdateInternal(); }
} catch (SQLException e) { try {
if (next == null) { result[i] = executeUpdateInternal();
next = e; } catch (SQLException e) {
} else { if (next == null) {
e.setNextException(next); next = e;
next = e; } else {
e.setNextException(next);
next = e;
}
logAndConvert(e);
//## Java 1.4 begin ##
result[i] = Statement.EXECUTE_FAILED;
//## Java 1.4 end ##
error = true;
} }
logAndConvert(e);
//## Java 1.4 begin ##
result[i] = Statement.EXECUTE_FAILED;
//## Java 1.4 end ##
error = true;
} }
batchParameters = null;
if (error) {
JdbcBatchUpdateException e = new JdbcBatchUpdateException(next, result);
e.setNextException(next);
throw e;
}
return result;
} finally {
afterWriting();
} }
batchParameters = null;
if (error) {
JdbcBatchUpdateException e = new JdbcBatchUpdateException(next, result);
e.setNextException(next);
throw e;
}
return result;
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1096,17 +1136,21 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1096,17 +1136,21 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
try { try {
debugCodeCall("addBatch"); debugCodeCall("addBatch");
checkClosedForWrite(); checkClosedForWrite();
ObjectArray< ? extends ParameterInterface> parameters = command.getParameters(); try {
Value[] set = new Value[parameters.size()]; ObjectArray< ? extends ParameterInterface> parameters = command.getParameters();
for (int i = 0; i < parameters.size(); i++) { Value[] set = new Value[parameters.size()];
ParameterInterface param = parameters.get(i); for (int i = 0; i < parameters.size(); i++) {
Value value = param.getParamValue(); ParameterInterface param = parameters.get(i);
set[i] = value; Value value = param.getParamValue();
} set[i] = value;
if (batchParameters == null) { }
batchParameters = ObjectArray.newInstance(); if (batchParameters == null) {
batchParameters = ObjectArray.newInstance();
}
batchParameters.add(set);
} finally {
afterWriting();
} }
batchParameters.add(set);
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1276,8 +1320,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1276,8 +1320,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setNCharacterStream("+parameterIndex+", x, "+length+"L);"); debugCode("setNCharacterStream("+parameterIndex+", x, "+length+"L);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createClob(x, length); try {
setParameter(parameterIndex, v); Value v = conn.createClob(x, length);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1338,8 +1386,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1338,8 +1386,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setNClob("+parameterIndex+", x);"); debugCode("setNClob("+parameterIndex+", x);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createClob(x, -1); try {
setParameter(parameterIndex, v); Value v = conn.createClob(x, -1);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1360,8 +1412,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1360,8 +1412,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setClob("+parameterIndex+", x, "+length+"L);"); debugCode("setClob("+parameterIndex+", x, "+length+"L);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createClob(x, length); try {
setParameter(parameterIndex, v); Value v = conn.createClob(x, length);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1382,8 +1438,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1382,8 +1438,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setBlob("+parameterIndex+", x, "+length+"L);"); debugCode("setBlob("+parameterIndex+", x, "+length+"L);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createBlob(x, length); try {
setParameter(parameterIndex, v); Value v = conn.createBlob(x, length);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -1404,8 +1464,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat ...@@ -1404,8 +1464,12 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
debugCode("setNClob("+parameterIndex+", x, "+length+"L);"); debugCode("setNClob("+parameterIndex+", x, "+length+"L);");
} }
checkClosedForWrite(); checkClosedForWrite();
Value v = conn.createClob(x, length); try {
setParameter(parameterIndex, v); Value v = conn.createClob(x, length);
setParameter(parameterIndex, v);
} finally {
afterWriting();
}
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
......
h2/src/main/org/h2/jdbc/JdbcStatement.java
浏览文件 @ a263a7d0
...@@ -114,19 +114,23 @@ public class JdbcStatement extends TraceObject implements Statement { ...@@ -114,19 +114,23 @@ public class JdbcStatement extends TraceObject implements Statement {
private int executeUpdateInternal(String sql) throws SQLException { private int executeUpdateInternal(String sql) throws SQLException {
checkClosedForWrite(); checkClosedForWrite();
closeOldResultSet(); try {
sql = conn.translateSQL(sql, escapeProcessing); closeOldResultSet();
CommandInterface command = conn.prepareCommand(sql, fetchSize); sql = conn.translateSQL(sql, escapeProcessing);
synchronized (session) { CommandInterface command = conn.prepareCommand(sql, fetchSize);
setExecutingStatement(command); synchronized (session) {
try { setExecutingStatement(command);
updateCount = command.executeUpdate(); try {
} finally { updateCount = command.executeUpdate();
setExecutingStatement(null); } finally {
setExecutingStatement(null);
}
} }
command.close();
return updateCount;
} finally {
afterWriting();
} }
command.close();
return updateCount;
} }
/** /**
...@@ -153,29 +157,33 @@ public class JdbcStatement extends TraceObject implements Statement { ...@@ -153,29 +157,33 @@ public class JdbcStatement extends TraceObject implements Statement {
private boolean executeInternal(String sql) throws SQLException { private boolean executeInternal(String sql) throws SQLException {
int id = getNextId(TraceObject.RESULT_SET); int id = getNextId(TraceObject.RESULT_SET);
checkClosedForWrite(); checkClosedForWrite();
closeOldResultSet(); try {
sql = conn.translateSQL(sql, escapeProcessing); closeOldResultSet();
CommandInterface command = conn.prepareCommand(sql, fetchSize); sql = conn.translateSQL(sql, escapeProcessing);
boolean returnsResultSet; CommandInterface command = conn.prepareCommand(sql, fetchSize);
synchronized (session) { boolean returnsResultSet;
setExecutingStatement(command); synchronized (session) {
try { setExecutingStatement(command);
if (command.isQuery()) { try {
returnsResultSet = true; if (command.isQuery()) {
boolean scrollable = resultSetType != ResultSet.TYPE_FORWARD_ONLY; returnsResultSet = true;
boolean updatable = resultSetConcurrency == ResultSet.CONCUR_UPDATABLE; boolean scrollable = resultSetType != ResultSet.TYPE_FORWARD_ONLY;
ResultInterface result = command.executeQuery(maxRows, scrollable); boolean updatable = resultSetConcurrency == ResultSet.CONCUR_UPDATABLE;
resultSet = new JdbcResultSet(conn, this, result, id, closedByResultSet, scrollable, updatable); ResultInterface result = command.executeQuery(maxRows, scrollable);
} else { resultSet = new JdbcResultSet(conn, this, result, id, closedByResultSet, scrollable, updatable);
returnsResultSet = false; } else {
updateCount = command.executeUpdate(); returnsResultSet = false;
updateCount = command.executeUpdate();
}
} finally {
setExecutingStatement(null);
} }
} finally {
setExecutingStatement(null);
} }
command.close();
return returnsResultSet;
} finally {
afterWriting();
} }
command.close();
return returnsResultSet;
} }
/** /**
...@@ -607,29 +615,33 @@ public class JdbcStatement extends TraceObject implements Statement { ...@@ -607,29 +615,33 @@ public class JdbcStatement extends TraceObject implements Statement {
try { try {
debugCodeCall("executeBatch"); debugCodeCall("executeBatch");
checkClosedForWrite(); checkClosedForWrite();
if (batchCommands == null) { try {
// TODO batch: check what other database do if no commands are set if (batchCommands == null) {
batchCommands = ObjectArray.newInstance(); // TODO batch: check what other database do if no commands are set
} batchCommands = ObjectArray.newInstance();
int[] result = new int[batchCommands.size()];
boolean error = false;
for (int i = 0; i < batchCommands.size(); i++) {
String sql = batchCommands.get(i);
try {
result[i] = executeUpdateInternal(sql);
} catch (SQLException e) {
logAndConvert(e);
//## Java 1.4 begin ##
result[i] = Statement.EXECUTE_FAILED;
//## Java 1.4 end ##
error = true;
} }
int[] result = new int[batchCommands.size()];
boolean error = false;
for (int i = 0; i < batchCommands.size(); i++) {
String sql = batchCommands.get(i);
try {
result[i] = executeUpdateInternal(sql);
} catch (SQLException e) {
logAndConvert(e);
//## Java 1.4 begin ##
result[i] = Statement.EXECUTE_FAILED;
//## Java 1.4 end ##
error = true;
}
}
batchCommands = null;
if (error) {
throw new BatchUpdateException(result);
}
return result;
} finally {
afterWriting();
} }
batchCommands = null;
if (error) {
throw new BatchUpdateException(result);
}
return result;
} catch (Exception e) { } catch (Exception e) {
throw logAndConvert(e); throw logAndConvert(e);
} }
...@@ -883,6 +895,15 @@ public class JdbcStatement extends TraceObject implements Statement { ...@@ -883,6 +895,15 @@ public class JdbcStatement extends TraceObject implements Statement {
return false; return false;
} }
/**
* Called after each write operation.
*/
void afterWriting() {
if (conn != null) {
conn.afterWriting();
}
}
/** /**
* INTERNAL. * INTERNAL.
* Close and old result set if there is still one open. * Close and old result set if there is still one open.
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论