Skip to content
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

Support unique constraint exceptions when running Vitess. #3386

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support unique constraint exceptions when running Vitess. #3386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5207526
Support unique constraint exceptions when running Vitess.
rgfindl Mar 19, 2025
7a3366d
Cleanup vitess constraint violation test.
rgfindl Mar 19, 2025
61ee071
Merge branch 'master' into master
rgfindl Mar 19, 2025
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
16 changes: 14 additions & 2 deletions misk-hibernate/src/main/kotlin/misk/hibernate/RealTransacter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import org.hibernate.FlushMode
import org.hibernate.SessionFactory
import org.hibernate.StaleObjectStateException
import org.hibernate.exception.ConstraintViolationException
import org.hibernate.exception.GenericJDBCException
import org.hibernate.exception.LockAcquisitionException
import wisp.logging.getLogger
import java.io.Closeable
Expand All @@ -27,7 +28,7 @@ import java.sql.SQLIntegrityConstraintViolationException
import java.sql.SQLRecoverableException
import java.sql.SQLTransientException
import java.time.Duration
import java.util.*
import java.util.EnumSet
import java.util.concurrent.Callable
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
Expand Down Expand Up @@ -498,13 +499,24 @@ internal class RealTransacter private constructor(
try {
function()
} finally {
use(previous)
try {
use(previous)
} catch (th: GenericJDBCException) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
} catch (th: GenericJDBCException) {
} catch (exception: GenericJDBCException) {

// Ignore the exception if the connection is already closed.
if (!isConnectionClosed(th)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!isConnectionClosed(th)) {
if (!isConnectionClosed(exception)) {

throw th
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
throw th
throw exception

}
}
}
} else {
function()
}
}

private fun isConnectionClosed(th: GenericJDBCException) =
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private fun isConnectionClosed(th: GenericJDBCException) =
private fun isConnectionClosed(exception: GenericJDBCException) =

th.cause?.javaClass == SQLException::class.java &&
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
th.cause?.javaClass == SQLException::class.java &&
exception.cause?.javaClass == SQLException::class.java &&

th.cause?.message.equals("Connection is closed")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
th.cause?.message.equals("Connection is closed")
exception.cause?.message.equals("Connection is closed")


private fun use(destination: Destination) = useConnection { connection ->
check(config.type.isVitess)
connection.createStatement().use { statement ->
Expand Down
6 changes: 1 addition & 5 deletions misk-hibernate/src/test/kotlin/misk/hibernate/TransacterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package misk.hibernate

import jakarta.inject.Inject
import misk.exceptions.UnauthorizedException
import misk.jdbc.DataSourceType
import misk.jdbc.uniqueString
import misk.testing.MiskTest
import misk.testing.MiskTestModule
import org.assertj.core.api.Assertions.assertThat
import org.hibernate.exception.ConstraintViolationException
import org.junit.jupiter.api.Assumptions.assumeTrue
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
Expand All @@ -16,7 +16,6 @@ import java.util.concurrent.Callable
import java.util.concurrent.CountDownLatch
import java.util.concurrent.Executors
import java.util.concurrent.atomic.AtomicInteger
import jakarta.inject.Inject
import kotlin.test.assertFailsWith

abstract class TransacterTest {
Expand Down Expand Up @@ -368,9 +367,6 @@ abstract class TransacterTest {

@Test
fun constraintViolationCausesTransactionToRollback() {
// Uniqueness constraints aren't reliably enforced on Vitess
assumeTrue(!transacter.config().type.isVitess)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this test is run on non-Vitess databases, should it stay and within an if block that stops it from running for Vitess?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I follow. This block was skipping this test when we're running Vitess. We want to run this test for Vitess as well.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks


transacter.transaction { session ->
session.save(DbMovie("Cinderella", LocalDate.of(1950, 3, 4)))
}
Expand Down
Loading