github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4424 from kxbmap/deque-insted-of-stack

Browse Source 
[#4424] Use ArrayDeque as a stack internally, instead of java.util.Stack
This commit is contained in:
Lukas Eder 2015-07-22 19:37:23 +02:00
commit 1edf32b460
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
View File

@ -53,10 +53,11 @@ import static org.jooq.impl.Identifiers.QUOTE_END_DELIMITER_ESCAPED;
import static org.jooq.impl.Identifiers.QUOTE_START_DELIMITER;
import static org.jooq.impl.Utils.DATA_COUNT_BIND_VALUES;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Deque;
import java.util.HashSet;
import java.util.Set;
import java.util.Stack;
import java.util.regex.Pattern;
import org.jooq.BindContext;
@ -91,7 +92,7 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
private int params;
private int alias;
private int indent;
private Stack<Integer> indentLock;
private Deque<Integer> indentLock;
private int printMargin = 80;
// [#1632] Cached values from Settings
@ -273,9 +274,9 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
return this;
}
private Stack<Integer> indentLock() {
private Deque<Integer> indentLock() {
if (indentLock == null) {
indentLock = new Stack<Integer>();
indentLock = new ArrayDeque<Integer>();
}
return indentLock;

17
jOOQ/src/main/java/org/jooq/impl/DefaultTransactionProvider.java
View File

@ -47,7 +47,8 @@ import static org.jooq.impl.Utils.DATA_DEFAULT_TRANSACTION_PROVIDER_SAVEPOINTS;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Savepoint;
import java.util.Stack;
import java.util.ArrayDeque;
import java.util.Deque;
import org.jooq.Configuration;
import org.jooq.ConnectionProvider;
@ -105,11 +106,11 @@ public class DefaultTransactionProvider implements TransactionProvider {
}
@SuppressWarnings("unchecked")
private final Stack<Savepoint> savepoints(Configuration configuration) {
Stack<Savepoint> savepoints = (Stack<Savepoint>) configuration.data(DATA_DEFAULT_TRANSACTION_PROVIDER_SAVEPOINTS);
private final Deque<Savepoint> savepoints(Configuration configuration) {
Deque<Savepoint> savepoints = (Deque<Savepoint>) configuration.data(DATA_DEFAULT_TRANSACTION_PROVIDER_SAVEPOINTS);
if (savepoints == null) {
savepoints = new Stack<Savepoint>();
savepoints = new ArrayDeque<Savepoint>();
configuration.data(DATA_DEFAULT_TRANSACTION_PROVIDER_SAVEPOINTS, savepoints);
}
@ -140,7 +141,7 @@ public class DefaultTransactionProvider implements TransactionProvider {
@Override
public final void begin(TransactionContext ctx) {
Stack<Savepoint> savepoints = savepoints(ctx.configuration());
Deque<Savepoint> savepoints = savepoints(ctx.configuration());
// This is the top-level transaction
if (savepoints.isEmpty())
@ -148,7 +149,7 @@ public class DefaultTransactionProvider implements TransactionProvider {
Savepoint savepoint = setSavepoint(ctx.configuration());
if (savepoint == UNSUPPORTED_SAVEPOINT && savepoints.size() > 0)
if (savepoint == UNSUPPORTED_SAVEPOINT && !savepoints.isEmpty())
throw new DataAccessException("Cannot nest transactions because Savepoints are not supported");
savepoints.push(savepoint);
@ -170,7 +171,7 @@ public class DefaultTransactionProvider implements TransactionProvider {
@Override
public final void commit(TransactionContext ctx) {
Stack<Savepoint> savepoints = savepoints(ctx.configuration());
Deque<Savepoint> savepoints = savepoints(ctx.configuration());
Savepoint savepoint = savepoints.pop();
// [#3489] Explicitly release savepoints prior to commit
@ -196,7 +197,7 @@ public class DefaultTransactionProvider implements TransactionProvider {
@Override
public final void rollback(TransactionContext ctx) {
Stack<Savepoint> savepoints = savepoints(ctx.configuration());
Deque<Savepoint> savepoints = savepoints(ctx.configuration());
Savepoint savepoint = null;
// [#3537] If something went wrong with the savepoints per se