Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikgrinaker
erikgrinaker committed Feb 4, 2025
1 parent 61783ba commit 386153f
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 34 deletions.
6 changes: 2 additions & 4 deletions src/raft/testscripts/log/status
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ term=0 last=0@0 commit=0@0 vote=None engine=Status {
name: "bitcask",
keys: 0,
size: 0,
total_disk_size: 0,
disk_size: 0,
live_disk_size: 0,
garbage_disk_size: 0,
}

# Write some data.
Expand All @@ -30,7 +29,6 @@ term=2 last=3@2 commit=2@1 vote=1 engine=Status {
name: "bitcask",
keys: 5,
size: 51,
total_disk_size: 102,
disk_size: 102,
live_disk_size: 91,
garbage_disk_size: 11,
}
12 changes: 5 additions & 7 deletions src/raft/testscripts/node/request_status
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ status request=true 1
stabilize
---
c1@1 → n1 ClientRequest id=0x02 status
n1@1 → c1 ClientResponse id=0x02 status Status { leader: 1, term: 1, match_index: {1: 2, 2: 2, 3: 1}, commit_index: 2, applied_index: 2, storage: Status { name: "bitcask", keys: 4, size: 41, total_disk_size: 84, live_disk_size: 73, garbage_disk_size: 11 } }
n1@1 → c1 ClientResponse id=0x02 status Status { leader: 1, term: 1, match_index: {1: 2, 2: 2, 3: 1}, commit_index: 2, applied_index: 2, storage: Status { name: "bitcask", keys: 4, size: 41, disk_size: 84, live_disk_size: 73 } }
c1@1 status ⇒ Status {
leader: 1,
term: 1,
Expand All @@ -40,9 +40,8 @@ c1@1 status ⇒ Status {
name: "bitcask",
keys: 4,
size: 41,
total_disk_size: 84,
disk_size: 84,
live_disk_size: 73,
garbage_disk_size: 11,
},
}

Expand All @@ -52,8 +51,8 @@ stabilize
---
c2@1 → n2 ClientRequest id=0x03 status
n2@1 → n1 ClientRequest id=0x03 status
n1@1 → n2 ClientResponse id=0x03 status Status { leader: 1, term: 1, match_index: {1: 2, 2: 2, 3: 1}, commit_index: 2, applied_index: 2, storage: Status { name: "bitcask", keys: 4, size: 41, total_disk_size: 84, live_disk_size: 73, garbage_disk_size: 11 } }
n2@1 → c2 ClientResponse id=0x03 status Status { leader: 1, term: 1, match_index: {1: 2, 2: 2, 3: 1}, commit_index: 2, applied_index: 2, storage: Status { name: "bitcask", keys: 4, size: 41, total_disk_size: 84, live_disk_size: 73, garbage_disk_size: 11 } }
n1@1 → n2 ClientResponse id=0x03 status Status { leader: 1, term: 1, match_index: {1: 2, 2: 2, 3: 1}, commit_index: 2, applied_index: 2, storage: Status { name: "bitcask", keys: 4, size: 41, disk_size: 84, live_disk_size: 73 } }
n2@1 → c2 ClientResponse id=0x03 status Status { leader: 1, term: 1, match_index: {1: 2, 2: 2, 3: 1}, commit_index: 2, applied_index: 2, storage: Status { name: "bitcask", keys: 4, size: 41, disk_size: 84, live_disk_size: 73 } }
c2@1 status ⇒ Status {
leader: 1,
term: 1,
Expand All @@ -68,8 +67,7 @@ c2@1 status ⇒ Status {
name: "bitcask",
keys: 4,
size: 41,
total_disk_size: 84,
disk_size: 84,
live_disk_size: 73,
garbage_disk_size: 11,
},
}
5 changes: 2 additions & 3 deletions src/raft/testscripts/node/request_status_single
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ status request=true 1
stabilize
---
c1@1 → n1 ClientRequest id=0x02 status
n1@1 → c1 ClientResponse id=0x02 status Status { leader: 1, term: 1, match_index: {1: 2}, commit_index: 2, applied_index: 2, storage: Status { name: "bitcask", keys: 4, size: 41, total_disk_size: 84, live_disk_size: 73, garbage_disk_size: 11 } }
n1@1 → c1 ClientResponse id=0x02 status Status { leader: 1, term: 1, match_index: {1: 2}, commit_index: 2, applied_index: 2, storage: Status { name: "bitcask", keys: 4, size: 41, disk_size: 84, live_disk_size: 73 } }
c1@1 status ⇒ Status {
leader: 1,
term: 1,
Expand All @@ -29,8 +29,7 @@ c1@1 status ⇒ Status {
name: "bitcask",
keys: 4,
size: 41,
total_disk_size: 84,
disk_size: 84,
live_disk_size: 73,
garbage_disk_size: 11,
},
}
6 changes: 2 additions & 4 deletions src/storage/testscripts/bitcask/compact
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ Status {
name: "bitcask",
keys: 6,
size: 14,
total_disk_size: 128,
disk_size: 128,
live_disk_size: 62,
garbage_disk_size: 66,
}

# Dump the log.
Expand Down Expand Up @@ -99,9 +98,8 @@ Status {
name: "bitcask",
keys: 6,
size: 14,
total_disk_size: 62,
disk_size: 62,
live_disk_size: 62,
garbage_disk_size: 0,
}

# Dump the compacted log.
Expand Down
9 changes: 3 additions & 6 deletions src/storage/testscripts/bitcask/compact_open
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ Status {
name: "bitcask",
keys: 6,
size: 14,
total_disk_size: 128,
disk_size: 128,
live_disk_size: 62,
garbage_disk_size: 66,
}

# Reopening with a garbage fraction of 0.6 does not compact.
Expand All @@ -44,9 +43,8 @@ Status {
name: "bitcask",
keys: 6,
size: 14,
total_disk_size: 128,
disk_size: 128,
live_disk_size: 62,
garbage_disk_size: 66,
}

# Reopening with a fraction of 0.5 does compact.
Expand All @@ -57,9 +55,8 @@ Status {
name: "bitcask",
keys: 6,
size: 14,
total_disk_size: 62,
disk_size: 62,
live_disk_size: 62,
garbage_disk_size: 0,
}

dump
Expand Down
6 changes: 2 additions & 4 deletions src/storage/testscripts/bitcask/status
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ Status {
name: "bitcask",
keys: 2,
size: 10,
total_disk_size: 84,
disk_size: 84,
live_disk_size: 26,
garbage_disk_size: 58,
}

# Compact the log and show status again.
Expand All @@ -34,7 +33,6 @@ Status {
name: "bitcask",
keys: 2,
size: 10,
total_disk_size: 26,
disk_size: 26,
live_disk_size: 26,
garbage_disk_size: 0,
}
3 changes: 1 addition & 2 deletions src/storage/testscripts/memory/status
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Status {
name: "memory",
keys: 2,
size: 10,
total_disk_size: 0,
disk_size: 0,
live_disk_size: 0,
garbage_disk_size: 0,
}
6 changes: 2 additions & 4 deletions tests/scripts/client
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,8 @@ Status {
name: "bitcask",
keys: 27,
size: 1169,
total_disk_size: 1649,
disk_size: 1649,
live_disk_size: 1385,
garbage_disk_size: 264,
},
},
mvcc: Status {
Expand All @@ -187,9 +186,8 @@ Status {
name: "bitcask",
keys: 36,
size: 2177,
total_disk_size: 8259,
disk_size: 8259,
live_disk_size: 2465,
garbage_disk_size: 5794,
},
},
}

0 comments on commit 386153f

Please sign in to comment.