Skip to content

A native macOS / windows / Linux database IDE built with Swift and AppKit. Connect to PostgreSQL, MySQL, SQLite, and Redis from a single app with a fast, keyboard-driven interface.

C++

fix(redis): serialize database transitions

Tobi01eb37997edb
diff --git a/macos/App/State/AppState.swift b/macos/App/State/AppState.swift
index 22a4f9b..ea667d0 100644
--- a/macos/App/State/AppState.swift
+++ b/macos/App/State/AppState.swift
@@ -130,6 +130,8 @@ final class AppState: ObservableObject {
}
private var redisDatabaseTransitionBatch: RedisDatabaseTransitionBatch?
+ private var redisOperationLeaseIsHeld = false
+ private var redisOperationLeaseWaiters: [CheckedContinuation<Void, Never>] = []
func requestRedisKeyBrowserRefresh() {
redisKeyBrowserRefreshNonce &+= 1
@@ -616,6 +618,19 @@ final class AppState: ObservableObject {
return false
}
+ await acquireRedisOperationLease()
+ defer { releaseRedisOperationLease() }
+
+ guard isPendingRedisDatabaseTransition(token) else {
+ discardRedisDatabaseTransition(token)
+ return false
+ }
+
+ guard !Task.isCancelled else {
+ _ = finishRedisDatabaseTransition(token, outcome: .failure)
+ return false
+ }
+
do {
try await performSelect()
return finishRedisDatabaseTransition(
@@ -628,6 +643,26 @@ final class AppState: ObservableObject {
}
}
+ private func acquireRedisOperationLease() async {
+ guard redisOperationLeaseIsHeld else {
+ redisOperationLeaseIsHeld = true
+ return
+ }
+
+ await withCheckedContinuation { continuation in
+ redisOperationLeaseWaiters.append(continuation)
+ }
+ }
+
+ private func releaseRedisOperationLease() {
+ guard !redisOperationLeaseWaiters.isEmpty else {
+ redisOperationLeaseIsHeld = false
+ return
+ }
+
+ redisOperationLeaseWaiters.removeFirst().resume()
+ }
+
private func rotateRedisSession(for adapter: (any DatabaseAdapter)?) {
redisDatabaseTransitionBatch = nil
redisDatabaseRevision = 0
@@ -693,6 +728,23 @@ final class AppState: ObservableObject {
return ownsPostTransitionPublication
}
+ private func isPendingRedisDatabaseTransition(_ token: RedisSessionRevisionToken) -> Bool {
+ guard isCurrentRedisSession(token),
+ let batch = redisDatabaseTransitionBatch,
+ batch.connectionID == token.connectionID,
+ batch.sessionID == token.sessionID else { return false }
+ return batch.pendingRevisions.contains(token.databaseRevision)
+ }
+
+ private func discardRedisDatabaseTransition(_ token: RedisSessionRevisionToken) {
+ guard var batch = redisDatabaseTransitionBatch,
+ batch.connectionID == token.connectionID,
+ batch.sessionID == token.sessionID else { return }
+
+ batch.pendingRevisions.remove(token.databaseRevision)
+ redisDatabaseTransitionBatch = batch.pendingRevisions.isEmpty ? nil : batch
+ }
+
private func isCurrentRedisSession(_ token: RedisSessionRevisionToken) -> Bool {
activeAdapter is RedisAdapter
&& activeConnectionId == token.connectionID