mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
Merge pull request #2815 from ebean-orm/feature/2814-nestedUseSavepoint
#2814 - Change setNestedUseSavepoint() to use 'ScopeTrans' rather than the underlying Transaction
This commit is contained in:
4 files changed
+55
-11
No files matched your search
@@ -45,15 +45,14 @@ public final class ScopeTrans {
|
|||||||
* Flag set when nested commit has occurred.
|
* Flag set when nested commit has occurred.
|
||||||
*/
|
*/
|
||||||
private boolean nestedCommit;
|
private boolean nestedCommit;
|
||||||
|
private boolean nestedUseSavepoint;
|
||||||
|
|
||||||
public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope) {
|
public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope) {
|
||||||
|
|
||||||
this.rollbackOnChecked = rollbackOnChecked;
|
this.rollbackOnChecked = rollbackOnChecked;
|
||||||
this.created = created;
|
this.created = created;
|
||||||
this.transaction = transaction;
|
this.transaction = transaction;
|
||||||
this.noRollbackFor = txScope.getNoRollbackFor();
|
this.noRollbackFor = txScope.getNoRollbackFor();
|
||||||
this.rollbackFor = txScope.getRollbackFor();
|
this.rollbackFor = txScope.getRollbackFor();
|
||||||
|
|
||||||
if (transaction != null) {
|
if (transaction != null) {
|
||||||
if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
|
if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
|
||||||
restoreBatch = transaction.isBatchMode();
|
restoreBatch = transaction.isBatchMode();
|
||||||
@@ -90,6 +89,14 @@ public final class ScopeTrans {
|
|||||||
return "ScopeTrans " + transaction;
|
return "ScopeTrans " + transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setNestedUseSavepoint() {
|
||||||
|
nestedUseSavepoint = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean isNestedUseSavepoint() {
|
||||||
|
return nestedUseSavepoint;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the current/active transaction.
|
* Return the current/active transaction.
|
||||||
*/
|
*/
|
||||||
@@ -101,7 +108,6 @@ public final class ScopeTrans {
|
|||||||
* Complete the transaction from enhanced transactional. Try to commit.
|
* Complete the transaction from enhanced transactional. Try to commit.
|
||||||
*/
|
*/
|
||||||
void complete(Object returnOrThrowable, int opCode) {
|
void complete(Object returnOrThrowable, int opCode) {
|
||||||
|
|
||||||
if (opCode == OPCODE_ATHROW) {
|
if (opCode == OPCODE_ATHROW) {
|
||||||
// exited with a Throwable
|
// exited with a Throwable
|
||||||
caughtThrowable((Throwable) returnOrThrowable);
|
caughtThrowable((Throwable) returnOrThrowable);
|
||||||
@@ -168,7 +174,6 @@ public final class ScopeTrans {
|
|||||||
* Returns the exception and this should be thrown by the calling code.
|
* Returns the exception and this should be thrown by the calling code.
|
||||||
*/
|
*/
|
||||||
public <T extends Throwable> T caughtThrowable(T e) {
|
public <T extends Throwable> T caughtThrowable(T e) {
|
||||||
|
|
||||||
if (isRollbackThrowable(e)) {
|
if (isRollbackThrowable(e)) {
|
||||||
rollback(e);
|
rollback(e);
|
||||||
}
|
}
|
||||||
@@ -188,21 +193,17 @@ public final class ScopeTrans {
|
|||||||
* Return true if this throwable should cause a rollback to occur.
|
* Return true if this throwable should cause a rollback to occur.
|
||||||
*/
|
*/
|
||||||
private boolean isRollbackThrowable(Throwable e) {
|
private boolean isRollbackThrowable(Throwable e) {
|
||||||
|
|
||||||
if (e instanceof Error) {
|
if (e instanceof Error) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (noRollbackFor != null) {
|
if (noRollbackFor != null) {
|
||||||
for (Class<? extends Throwable> aNoRollbackFor : noRollbackFor) {
|
for (Class<? extends Throwable> aNoRollbackFor : noRollbackFor) {
|
||||||
if (aNoRollbackFor.equals(e.getClass())) {
|
if (aNoRollbackFor.equals(e.getClass())) {
|
||||||
|
|
||||||
// explicit no rollback for this one
|
// explicit no rollback for this one
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rollbackFor != null) {
|
if (rollbackFor != null) {
|
||||||
for (Class<? extends Throwable> aRollbackFor : rollbackFor) {
|
for (Class<? extends Throwable> aRollbackFor : rollbackFor) {
|
||||||
if (aRollbackFor.equals(e.getClass())) {
|
if (aRollbackFor.equals(e.getClass())) {
|
||||||
@@ -211,7 +212,6 @@ public final class ScopeTrans {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// checked exceptions...
|
// checked exceptions...
|
||||||
// EJB defaults this to false which is not intuitive IMO
|
// EJB defaults this to false which is not intuitive IMO
|
||||||
// Ebean makes this configurable (default to true)
|
// Ebean makes this configurable (default to true)
|
||||||
|
|||||||
@@ -33,13 +33,26 @@ public final class ScopedTransaction extends SpiTransactionProxy {
|
|||||||
return "ScopedTransaction " + current;
|
return "ScopedTransaction " + current;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setNestedUseSavepoint() {
|
||||||
|
current.setNestedUseSavepoint();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isNestedUseSavepoint() {
|
||||||
|
return current.isNestedUseSavepoint();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Push the scope transaction.
|
* Push the scope transaction.
|
||||||
*/
|
*/
|
||||||
public void push(ScopeTrans scopeTrans) {
|
public void push(ScopeTrans scopeTrans) {
|
||||||
|
|
||||||
if (current != null) {
|
if (current != null) {
|
||||||
stack.push(current);
|
stack.push(current);
|
||||||
|
if (current.isNestedUseSavepoint()) {
|
||||||
|
// child scope 'inherits' nestedUseSavepoint
|
||||||
|
scopeTrans.setNestedUseSavepoint();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
current = scopeTrans;
|
current = scopeTrans;
|
||||||
transaction = scopeTrans.getTransaction();
|
transaction = scopeTrans.getTransaction();
|
||||||
|
|||||||
+1
-1
@@ -573,7 +573,7 @@ public class TransactionManager implements SpiTransactionManager {
|
|||||||
} else {
|
} else {
|
||||||
setToScope = false;
|
setToScope = false;
|
||||||
transaction = txnContainer.current();
|
transaction = txnContainer.current();
|
||||||
nestedSavepoint = transaction.isNestedUseSavepoint();
|
nestedSavepoint = txnContainer.isNestedUseSavepoint();
|
||||||
}
|
}
|
||||||
|
|
||||||
TxType type = txScope.getType();
|
TxType type = txScope.getType();
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package org.tests.transaction;
|
package org.tests.transaction;
|
||||||
|
|
||||||
import io.ebean.*;
|
import io.ebean.*;
|
||||||
|
import io.ebean.test.LoggedSql;
|
||||||
import io.ebean.xtest.BaseTestCase;
|
import io.ebean.xtest.BaseTestCase;
|
||||||
import io.ebean.xtest.IgnorePlatform;
|
import io.ebean.xtest.IgnorePlatform;
|
||||||
import io.ebean.annotation.Platform;
|
import io.ebean.annotation.Platform;
|
||||||
@@ -9,6 +10,8 @@ import io.ebeaninternal.api.TransactionEvent;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.tests.model.basic.EBasic;
|
import org.tests.model.basic.EBasic;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
@@ -62,6 +65,34 @@ public class TestNestedSubTransaction extends BaseTestCase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA, Platform.ORACLE})
|
||||||
|
@Test
|
||||||
|
void nestedNested() {
|
||||||
|
LoggedSql.start();
|
||||||
|
try (Transaction txn0 = DB.beginTransaction()) {
|
||||||
|
runNestedMethod();
|
||||||
|
try (Transaction txnAfter = DB.beginTransaction()) {
|
||||||
|
DB.save(new EBasic("startAfter"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
List<String> sql = LoggedSql.stop();
|
||||||
|
assertThat(sql).hasSize(3);
|
||||||
|
assertThat(sql.get(0)).contains("insert into e_basic").contains("sp[");
|
||||||
|
assertThat(sql.get(1)).contains("insert into e_basic").doesNotContain("sp[");
|
||||||
|
assertThat(sql.get(2)).contains("insert into e_basic").doesNotContain("sp[");
|
||||||
|
}
|
||||||
|
|
||||||
|
void runNestedMethod() {
|
||||||
|
try (Transaction txn0 = DB.beginTransaction()) {
|
||||||
|
txn0.setNestedUseSavepoint();
|
||||||
|
try (Transaction nested = DB.beginTransaction()) {
|
||||||
|
DB.save(new EBasic("nested in sp"));
|
||||||
|
nested.commit();
|
||||||
|
}
|
||||||
|
DB.save(new EBasic("nested"));
|
||||||
|
txn0.commit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA, Platform.ORACLE})
|
@IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA, Platform.ORACLE})
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Reference in new issue
Block a user