Skip to content

Commit 34e46d7

Browse files
committed
Rename KrescentEventsTable to KrescentEventLogTable and update references throughout the codebase and update constructor signature to match the publisher
1 parent edb1da9 commit 34e46d7

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/ExposedEventPublisher.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import kotlin.time.ExperimentalTime
1010
class ExposedEventPublisher(
1111
val database: Database,
1212
val streamId: String,
13-
val table: KrescentEventsTable = KrescentEventsTable(),
13+
val table: KrescentEventLogTable = KrescentEventLogTable(),
1414
) : EventPublisher {
1515
@OptIn(ExperimentalTime::class)
1616
override suspend fun publish(event: EventMessage) {

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/ExposedEventSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import kotlin.time.ExperimentalTime
1616
@OptIn(ExperimentalTime::class)
1717
class ExposedEventSource(
1818
val database: Database,
19-
val table: KrescentEventsTable = KrescentEventsTable(),
2019
val streamId: String? = null,
20+
val table: KrescentEventLogTable = KrescentEventLogTable(),
2121
val streamIdMatcher: StreamIdMatcher = StreamIdMatcher.EQ,
2222
val eventFilter: StreamEventFilter? = null,
2323
val batchSize: Int = 20,

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/ExposedStreamingToken.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ sealed class ExposedStreamingToken : StreamingToken<ExposedStreamingToken> {
3232
class HeadToken : ExposedStreamingToken()
3333
data class PositionToken(val pos: Long) : ExposedStreamingToken()
3434

35-
fun begin(table: KrescentEventsTable): Query {
35+
fun begin(table: KrescentEventLogTable): Query {
3636
val query = table.selectAll()
3737
return when (this) {
3838
is HeadToken -> query.orderBy(table.id)

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/KrescentEventsTable.kt renamed to krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/KrescentEventLogTable.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.jetbrains.exposed.sql.upsert
1515
import kotlin.time.ExperimentalTime
1616

1717
@OptIn(ExperimentalTime::class)
18-
class KrescentEventsTable(tableName: String = "krescent") : LongIdTable(tableName) {
18+
class KrescentEventLogTable(tableName: String = "krescent") : LongIdTable(tableName) {
1919
val uid = uuid("uuid").uniqueIndex()
2020
val streamId = text("streamId").index()
2121
val type = text("type").index()
@@ -28,11 +28,11 @@ class KrescentEventsTable(tableName: String = "krescent") : LongIdTable(tableNam
2828
})
2929

3030
suspend fun create(database: Database) {
31-
jdbcSuspendTransaction(database) { SchemaUtils.create(this@KrescentEventsTable) }
31+
jdbcSuspendTransaction(database) { SchemaUtils.create(this@KrescentEventLogTable) }
3232
}
3333

3434
suspend fun drop(database: Database) {
35-
jdbcSuspendTransaction(database) { SchemaUtils.drop(this@KrescentEventsTable) }
35+
jdbcSuspendTransaction(database) { SchemaUtils.drop(this@KrescentEventLogTable) }
3636
}
3737
}
3838

krescent-exposed/src/test/kotlin/dev/helight/krescent/exposed/ExposedTableProjectorTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ class ExposedTableProjectorTest {
5151
)
5252
}
5353

54-
fun execWithTable(block: suspend CoroutineScope.(Database, KrescentEventsTable) -> Unit) = runBlocking {
54+
fun execWithTable(block: suspend CoroutineScope.(Database, KrescentEventLogTable) -> Unit) = runBlocking {
5555
mutex.withLock {
5656
val db = connect()
5757
val tableName = "krescent_${UUID.randomUUID()}"
58-
val table = KrescentEventsTable(tableName)
58+
val table = KrescentEventLogTable(tableName)
5959
table.create(db)
6060
try {
6161
this.block(db, table)

krescent-exposed/src/test/kotlin/dev/helight/krescent/exposed/PostgresStreamingSource.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ class PostgresStreamingSource : StreamingEventSourceContract {
4545
)
4646
}
4747

48-
fun execWithTable(block: suspend CoroutineScope.(Database, KrescentEventsTable) -> Unit) = runBlocking {
48+
fun execWithTable(block: suspend CoroutineScope.(Database, KrescentEventLogTable) -> Unit) = runBlocking {
4949
val db = connect()
5050
val tableName = "krescent_${UUID.randomUUID()}"
51-
val table = KrescentEventsTable(tableName)
51+
val table = KrescentEventLogTable(tableName)
5252
table.create(db)
5353
try {
5454
this.block(db, table)
@@ -60,7 +60,7 @@ class PostgresStreamingSource : StreamingEventSourceContract {
6060

6161
override fun execWithStreamingSource(block: suspend CoroutineScope.(StreamingEventSource, EventPublisher) -> Unit) =
6262
execWithTable { db, table ->
63-
val source = ExposedEventSource(db, table).polling()
63+
val source = ExposedEventSource(db, table = table).polling()
6464
val publisher = ExposedEventPublisher(db, "default", table)
6565
this.block(source, publisher)
6666
}
@@ -77,9 +77,9 @@ class PostgresStreamingSource : StreamingEventSourceContract {
7777
ExposedEventPublisher(db, "user-ALICE-conversation-2", table)
7878
.publish(EventMessage(type = "created", payload = buildJsonObject { put("number", 3) }))
7979

80-
val aliceEvents = ExposedEventSource(db, table, "user-ALICE-conversation-%", StreamIdMatcher.LIKE)
80+
val aliceEvents = ExposedEventSource(db, "user-ALICE-conversation-%", table, StreamIdMatcher.LIKE)
8181
.fetchEventsAfter().toList()
82-
val bobEvents = ExposedEventSource(db, table, "user-BOB-conversation-%", StreamIdMatcher.LIKE)
82+
val bobEvents = ExposedEventSource(db, "user-BOB-conversation-%", table, StreamIdMatcher.LIKE)
8383
.fetchEventsAfter().toList()
8484

8585
assertEquals(2, aliceEvents.size)
@@ -97,9 +97,9 @@ class PostgresStreamingSource : StreamingEventSourceContract {
9797
ExposedEventPublisher(db, "user-ALICE-conversation-2", table)
9898
.publish(EventMessage(type = "created", payload = buildJsonObject { put("number", 3) }))
9999

100-
val aliceEvents = ExposedEventSource(db, table, "^user-ALICE-conversation-.*", StreamIdMatcher.REGEX)
100+
val aliceEvents = ExposedEventSource(db, "^user-ALICE-conversation-.*", table, StreamIdMatcher.REGEX)
101101
.fetchEventsAfter().toList()
102-
val bobEvents = ExposedEventSource(db, table, "^user-BOB-conversation-.*", StreamIdMatcher.REGEX)
102+
val bobEvents = ExposedEventSource(db, "^user-BOB-conversation-.*", table, StreamIdMatcher.REGEX)
103103
.fetchEventsAfter().toList()
104104

105105
assertEquals(2, aliceEvents.size)
@@ -115,13 +115,13 @@ class PostgresStreamingSource : StreamingEventSourceContract {
115115
publisher.publish(exampleCatalog.create(EventC(4)))
116116

117117
val regexReceived = ExposedEventSource(
118-
db, table, "event-stream",
118+
db, "event-stream", table,
119119
eventFilter = StreamEventFilter.fromRegex(exampleCatalog, "^main.*$".toRegex())
120120
).fetchEventsAfter().toList()
121121
assertEquals(2, regexReceived.count())
122122

123123
val listReceived = ExposedEventSource(
124-
db, table, "event-stream",
124+
db, "event-stream", table,
125125
eventFilter = StreamEventFilter.fromTypes(exampleCatalog, EventB::class, EventC::class),
126126
).fetchEventsAfter().toList()
127127
assertEquals(3, listReceived.count())

0 commit comments

Comments
 (0)