starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-06 00:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

finish

Browse Source 
Signed-off-by: pyranota <pyra@duck.com>
This commit is contained in:
pyranota
2025-10-28 17:15:33 +01:00
parent 2478ead1d1
commit d719a9c6c7
2 changed files with 67 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/migrations/20251028105101_mailbox.up.sql
+1 -1
View File
@@ -16,4 +16,4 @@ CREATE TABLE mailbox(
);
CREATE INDEX idx_mailbox_type_mailbox_id_message_id
ON mailbox(type, mailbox_id, message_id);
ON mailbox(type, mailbox_id, message_id ASC);
backend/windmill-common/src/mailbox.rs
+66 -70
View File
@@ -60,13 +60,11 @@ impl Mailbox {
MailboxMsg,
r#"
DELETE FROM mailbox
WHERE message_id = (
SELECT message_id
FROM mailbox
WHERE type = $1 AND mailbox_id = $2 AND workspace_id = $3
ORDER BY message_id ASC
LIMIT 1
)
WHERE message_id = ( SELECT message_id ║
FROM mailbox
WHERE type = $1 AND mailbox_id = $2 AND workspace_id = $3
LIMIT 1
)
RETURNING payload, created_at, message_id as id;
"#,
self.mailbox_type as MailboxType,
@@ -86,12 +84,7 @@ impl Mailbox {
MailboxMsg,
r#"
DELETE FROM mailbox
WHERE message_id = (
SELECT message_id
FROM mailbox
WHERE type = $1 AND mailbox_id = $2 AND workspace_id = $3
ORDER BY message_id ASC
)
WHERE type = $1 AND mailbox_id IS NOT DISTINCT FROM $2 AND workspace_id = $3
RETURNING payload, created_at, message_id as id;
"#,
self.mailbox_type as MailboxType,
@@ -114,7 +107,7 @@ impl Mailbox {
WHERE message_id = $1
AND workspace_id = $2
AND type = $3
AND mailbox_id = $4
AND mailbox_id IS NOT DISTINCT FROM $4
"#,
message_id,
&self.workspace_id,
@@ -137,7 +130,7 @@ impl Mailbox {
WHERE message_id = ANY($1)
AND workspace_id = $2
AND type = $3
AND mailbox_id = $4
AND mailbox_id IS NOT DISTINCT FROM $4
"#,
&message_ids,
&self.workspace_id,
@@ -157,10 +150,8 @@ impl Mailbox {
MailboxMsg,
r#"
SELECT payload, created_at, message_id as id
FROM mailbox
WHERE type = $1 AND mailbox_id = $2 AND workspace_id = $3
ORDER BY message_id ASC
LIMIT 1
FROM mailbox
WHERE type = $1 AND mailbox_id IS NOT DISTINCT FROM $2 AND workspace_id = $3
"#,
self.mailbox_type as MailboxType,
self.mailbox_id.as_ref(),
@@ -180,8 +171,7 @@ impl Mailbox {
r#"
SELECT payload, created_at, message_id as id
FROM mailbox
WHERE type = $1 AND mailbox_id = $2 AND workspace_id = $3
ORDER BY message_id ASC
WHERE type = $1 AND mailbox_id IS NOT DISTINCT FROM $2 AND workspace_id = $3
"#,
self.mailbox_type as MailboxType,
self.mailbox_id.as_ref(),
@@ -250,55 +240,61 @@ mod mailbox_tests {
assert_read_all(mbox.clone()).await;
assert_pull(mbox.clone()).await;
},
// // Same as above, but different workspace_id
// async {
// let mbox = Mailbox::open(
// Some("mymailbox"),
// crate::mailbox::MailboxType::Trigger,
// "another-workspace_id",
// );
// push(mbox.clone()).await;
// assert_read(mbox.clone()).await;
// assert_read_all(mbox.clone()).await;
// assert_pull(mbox.clone()).await;
// },
// // Different id
// async {
// let mbox = Mailbox::open(
// Some("another id"),
// crate::mailbox::MailboxType::Trigger,
// "test-workspace_id",
// );
// push(mbox.clone()).await;
// assert_read(mbox.clone()).await;
// assert_read_all(mbox.clone()).await;
// assert_pull(mbox.clone()).await;
// },
// // Different kind
// async {
// let mbox = Mailbox::open(
// Some("mymailbox"),
// crate::mailbox::MailboxType::DebouncingStaleData,
// "test-workspace_id",
// );
// push(mbox.clone()).await;
// assert_read(mbox.clone()).await;
// assert_read_all(mbox.clone()).await;
// assert_pull(mbox.clone()).await;
// },
// // Global mailboix
// async {
// let mbox = Mailbox::open(
// None,
// crate::mailbox::MailboxType::Trigger,
// "test-workspace_id",
// );
// push(mbox.clone()).await;
// assert_read(mbox.clone()).await;
// assert_read_all(mbox.clone()).await;
// // Also test pull_all
// assert_pull_all(mbox.clone()).await;
// },
// Same as above, but different workspace_id
async {
let mbox = Mailbox::open(
Some("mymailbox"),
crate::mailbox::MailboxType::Trigger,
"another-workspace_id",
);
push(mbox.clone()).await;
assert_read(mbox.clone()).await;
assert_read_all(mbox.clone()).await;
assert_pull(mbox.clone()).await;
},
// Different id
async {
let mbox = Mailbox::open(
Some("another id"),
crate::mailbox::MailboxType::Trigger,
"test-workspace_id",
);
push(mbox.clone()).await;
assert_read(mbox.clone()).await;
assert_read_all(mbox.clone()).await;
assert_pull(mbox.clone()).await;
},
// Different kind
async {
let mbox = Mailbox::open(
Some("mymailbox"),
crate::mailbox::MailboxType::DebouncingStaleData,
"test-workspace_id",
);
push(mbox.clone()).await;
assert_read(mbox.clone()).await;
assert_read_all(mbox.clone()).await;
assert_pull(mbox.clone()).await;
},
// Global mailboix
async {
let mbox = Mailbox::open(
None,
crate::mailbox::MailboxType::Trigger,
"test-workspace_id",
);
push(mbox.clone()).await;
dbg!(
sqlx::query!("SELECT mailbox_id, payload, workspace_id FROM mailbox")
.fetch_all(db)
.await
.unwrap()
);
assert_read(mbox.clone()).await;
assert_read_all(mbox.clone()).await;
// Also test pull_all
assert_pull_all(mbox.clone()).await;
},
);
Ok(())