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

fix: Avoid using boolean types under Oracle's data type limitations #673 #764

Merged
merged 2 commits into from
Oct 4, 2023
Merged

fix: Avoid using boolean types under Oracle's data type limitations #673 #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e3446f
fix: Avoid using boolean types under Oracle's data type limitations #673
Roiocam Sep 5, 2023
fbc5a06
remove unnecessary comments
Roiocam Oct 4, 2023
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
4 changes: 1 addition & 3 deletions core/src/it/scala/akka/persistence/jdbc/integration/EventsByTagTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ class PostgresScalaEventsByTagTest extends EventsByTagTest("postgres-application

class MySQLScalaEventByTagTest extends EventsByTagTest("mysql-application.conf") with MysqlCleaner

class OracleScalaEventByTagTest extends EventsByTagTest("oracle-application.conf") with OracleCleaner {
override def timeoutMultiplier: Int = 4
}
class OracleScalaEventByTagTest extends EventsByTagTest("oracle-application.conf") with OracleCleaner

class SqlServerScalaEventByTagTest extends EventsByTagTest("sqlserver-application.conf") with SqlServerCleaner
3 changes: 1 addition & 2 deletions core/src/main/scala/akka/persistence/jdbc/query/dao/legacy/ByteArrayReadJournalDao.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ trait OracleReadJournalDao extends ReadJournalDao {
if (isOracleDriver(profile)) {
val theOffset = Math.max(0, offset)
val theTag = s"%$tag%"

val selectStatement =
sql"""
SELECT "#$ordering", "#$deleted", "#$persistenceId", "#$sequenceNumber", "#$message", "#$tags"
Expand All @@ -131,7 +130,7 @@ trait OracleReadJournalDao extends ReadJournalDao {
WHERE "#$tags" LIKE $theTag
AND "#$ordering" > $theOffset
AND "#$ordering" <= $maxOffset
AND "#$deleted" = 'false'
AND "#$deleted" = 0
ORDER BY "#$ordering"
)
WHERE rownum <= $max""".as[JournalRow]
Expand Down
3 changes: 0 additions & 3 deletions core/src/test/scala/akka/persistence/jdbc/query/CurrentEventsByTagTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ abstract class CurrentEventsByTagTest(config: String) extends QueryTestSpec(conf
}

it should "find all events by tag" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
Expand Down Expand Up @@ -94,7 +93,6 @@ abstract class CurrentEventsByTagTest(config: String) extends QueryTestSpec(conf
}

it should "persist and find a tagged event with multiple tags" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
Expand Down Expand Up @@ -169,7 +167,6 @@ abstract class CurrentEventsByTagTest(config: String) extends QueryTestSpec(conf

it should "complete without any gaps in case events are being persisted when the query is executed" in withActorSystem {
implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new JavaDslJdbcReadJournalOperations(system)
import system.dispatcher
Expand Down
2 changes: 0 additions & 2 deletions core/src/test/scala/akka/persistence/jdbc/query/EventAdapterTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ abstract class EventAdapterTest(config: String) extends QueryTestSpec(config) {
}

it should "apply event adapters when querying events by tag from an offset" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
Expand Down Expand Up @@ -139,7 +138,6 @@ abstract class EventAdapterTest(config: String) extends QueryTestSpec(config) {
}

it should "apply event adapters when querying all current events by tag" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
Expand Down
8 changes: 0 additions & 8 deletions core/src/test/scala/akka/persistence/jdbc/query/EventsByTagTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con
}

it should "find all events by tag" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
Expand Down Expand Up @@ -122,7 +121,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con
}

it should "deliver EventEnvelopes non-zero timestamps" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val testStartTime = System.currentTimeMillis()
val journalOps = new ScalaJdbcReadJournalOperations(system)
Expand Down Expand Up @@ -159,7 +157,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con
}

it should "select events by tag with exact match" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)

Expand Down Expand Up @@ -201,7 +198,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con

it should "find all events by tag even when lots of events are persisted concurrently" in withActorSystem {
implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)
val msgCountPerActor = 20
Expand Down Expand Up @@ -232,7 +228,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con
}

it should "find events by tag from an offset" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new JavaDslJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
Expand All @@ -259,7 +254,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con
}

it should "persist and find tagged event for one tag" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new JavaDslJdbcReadJournalOperations(system)
withTestActors() { (actor1, actor2, actor3) =>
Expand Down Expand Up @@ -306,7 +300,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con
}

it should "persist and find tagged events when stored with multiple tags" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
Expand Down Expand Up @@ -385,7 +378,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con
def timeoutMultiplier: Int = 1

it should "show the configured performance characteristics" in withActorSystem { implicit system =>
pendingIfOracleWithLegacy()

import system.dispatcher
val journalOps = new ScalaJdbcReadJournalOperations(system)
Expand Down
1 change: 0 additions & 1 deletion core/src/test/scala/akka/persistence/jdbc/query/EventsByUnfrequentTagTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ abstract class EventsByUnfrequentTagTest(config: String) extends QueryTestSpec(c
final val NoMsgTime: FiniteDuration = 100.millis
it should "persist and find a tagged event with multiple (frequently and unfrequently) tags" in withActorSystem {
implicit system =>
pendingIfOracleWithLegacy()

val journalOps = new ScalaJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
Expand Down
8 changes: 0 additions & 8 deletions core/src/test/scala/akka/persistence/jdbc/query/QueryTestSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,14 +286,6 @@ abstract class QueryTestSpec(config: String, configOverrides: Map[String, Config
}
}

def pendingIfOracleWithLegacy(): Unit = {
if (
profile == slick.jdbc.OracleProfile && readJournalConfig.pluginConfig.dao == classOf[
akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao].getName
)
pending // TODO https://github.com/akka/akka-persistence-jdbc/issues/673
}

def setupEmpty(persistenceId: Int, replyToMessages: Boolean)(implicit system: ActorSystem): ActorRef = {
system.actorOf(Props(new TestActor(persistenceId, replyToMessages)))
}
Expand Down