fix tests

This commit is contained in:
Nikita Sivukhin
2025-07-28 17:06:48 +04:00
parent 4695719d2b
commit eb32ea49e6

View File

@@ -42,8 +42,7 @@ fn test_wal_frame_transfer_no_schema_changes() {
let mut frame = [0u8; 24 + 4096]; let mut frame = [0u8; 24 + 4096];
conn2.wal_insert_begin().unwrap(); conn2.wal_insert_begin().unwrap();
for frame_id in 1..=conn1.wal_frame_count().unwrap() as u32 { for frame_id in 1..=conn1.wal_frame_count().unwrap() as u32 {
let c = conn1.wal_get_frame(frame_id, &mut frame).unwrap(); conn1.wal_get_frame(frame_id, &mut frame).unwrap();
db1.io.wait_for_completion(c).unwrap();
conn2.wal_insert_frame(frame_id, &frame).unwrap(); conn2.wal_insert_frame(frame_id, &frame).unwrap();
} }
conn2.wal_insert_end().unwrap(); conn2.wal_insert_end().unwrap();
@@ -137,8 +136,7 @@ fn test_wal_frame_transfer_schema_changes() {
let mut frame = [0u8; 24 + 4096]; let mut frame = [0u8; 24 + 4096];
conn2.wal_insert_begin().unwrap(); conn2.wal_insert_begin().unwrap();
for frame_id in 1..=conn1.wal_frame_count().unwrap() as u32 { for frame_id in 1..=conn1.wal_frame_count().unwrap() as u32 {
let c = conn1.wal_get_frame(frame_id, &mut frame).unwrap(); conn1.wal_get_frame(frame_id, &mut frame).unwrap();
db1.io.wait_for_completion(c).unwrap();
conn2.wal_insert_frame(frame_id, &frame).unwrap(); conn2.wal_insert_frame(frame_id, &frame).unwrap();
} }
conn2.wal_insert_end().unwrap(); conn2.wal_insert_end().unwrap();
@@ -172,8 +170,7 @@ fn test_wal_frame_transfer_no_schema_changes_rollback() {
let mut frame = [0u8; 24 + 4096]; let mut frame = [0u8; 24 + 4096];
conn2.wal_insert_begin().unwrap(); conn2.wal_insert_begin().unwrap();
for frame_id in 1..=(conn1.wal_frame_count().unwrap() as u32 - 1) { for frame_id in 1..=(conn1.wal_frame_count().unwrap() as u32 - 1) {
let c = conn1.wal_get_frame(frame_id, &mut frame).unwrap(); conn1.wal_get_frame(frame_id, &mut frame).unwrap();
db1.io.wait_for_completion(c).unwrap();
conn2.wal_insert_frame(frame_id, &frame).unwrap(); conn2.wal_insert_frame(frame_id, &frame).unwrap();
} }
conn2.wal_insert_end().unwrap(); conn2.wal_insert_end().unwrap();
@@ -208,8 +205,7 @@ fn test_wal_frame_transfer_schema_changes_rollback() {
let mut frame = [0u8; 24 + 4096]; let mut frame = [0u8; 24 + 4096];
conn2.wal_insert_begin().unwrap(); conn2.wal_insert_begin().unwrap();
for frame_id in 1..=(conn1.wal_frame_count().unwrap() as u32 - 1) { for frame_id in 1..=(conn1.wal_frame_count().unwrap() as u32 - 1) {
let c = conn1.wal_get_frame(frame_id, &mut frame).unwrap(); conn1.wal_get_frame(frame_id, &mut frame).unwrap();
db1.io.wait_for_completion(c).unwrap();
conn2.wal_insert_frame(frame_id, &frame).unwrap(); conn2.wal_insert_frame(frame_id, &frame).unwrap();
} }
conn2.wal_insert_end().unwrap(); conn2.wal_insert_end().unwrap();
@@ -243,8 +239,7 @@ fn test_wal_frame_conflict() {
assert_eq!(conn1.wal_frame_count().unwrap(), 2); assert_eq!(conn1.wal_frame_count().unwrap(), 2);
let mut frame = [0u8; 24 + 4096]; let mut frame = [0u8; 24 + 4096];
conn2.wal_insert_begin().unwrap(); conn2.wal_insert_begin().unwrap();
let c = conn1.wal_get_frame(1, &mut frame).unwrap(); conn1.wal_get_frame(1, &mut frame).unwrap();
db1.io.wait_for_completion(c).unwrap();
assert!(conn2.wal_insert_frame(1, &frame).is_err()); assert!(conn2.wal_insert_frame(1, &frame).is_err());
} }
@@ -267,12 +262,10 @@ fn test_wal_frame_far_away_write() {
let mut frame = [0u8; 24 + 4096]; let mut frame = [0u8; 24 + 4096];
conn2.wal_insert_begin().unwrap(); conn2.wal_insert_begin().unwrap();
let c = conn1.wal_get_frame(3, &mut frame).unwrap(); conn1.wal_get_frame(3, &mut frame).unwrap();
db1.io.wait_for_completion(c).unwrap();
conn2.wal_insert_frame(3, &frame).unwrap(); conn2.wal_insert_frame(3, &frame).unwrap();
let c = conn1.wal_get_frame(5, &mut frame).unwrap(); conn1.wal_get_frame(5, &mut frame).unwrap();
db1.io.wait_for_completion(c).unwrap();
assert!(conn2.wal_insert_frame(5, &frame).is_err()); assert!(conn2.wal_insert_frame(5, &frame).is_err());
} }
@@ -311,8 +304,7 @@ fn test_wal_frame_api_no_schema_changes_fuzz() {
let mut frame = [0u8; 24 + 4096]; let mut frame = [0u8; 24 + 4096];
conn2.wal_insert_begin().unwrap(); conn2.wal_insert_begin().unwrap();
for frame_no in (synced_frame + 1)..=next_frame { for frame_no in (synced_frame + 1)..=next_frame {
let c = conn1.wal_get_frame(frame_no as u32, &mut frame).unwrap(); conn1.wal_get_frame(frame_no as u32, &mut frame).unwrap();
db1.io.wait_for_completion(c).unwrap();
conn2.wal_insert_frame(frame_no as u32, &frame[..]).unwrap(); conn2.wal_insert_frame(frame_no as u32, &frame[..]).unwrap();
} }
conn2.wal_insert_end().unwrap(); conn2.wal_insert_end().unwrap();