Skip to content

Commit

Permalink
Add missing rowsort and use Chinese test comments
Browse files Browse the repository at this point in the history
Signed-off-by: Wenbo Li <[email protected]>
  • Loading branch information
hnjylwb committed Mar 12, 2024
1 parent 1e8767e commit 73f109c
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion test/lab1/10-insert.test
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ select score, info from test_insert;
5.5 eeeee
6.6 ffffff

# 新建页面
# New page
query
insert into test_insert values(7, 7.7, 'ggggggg'), (8, 8.8, 'hhhhhhhh'), (9, 9.9, 'iiiiiiiii'), (10, 10.1, 'jjjjjjjjjj'), (11, 11.1, 'kkkkkkkkkkk');
----
Expand Down
4 changes: 2 additions & 2 deletions test/lab1/20-delete.test
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ select score, info from test_delete;
5.5 eeeee
6.6 ffffff

# 新建页面
# New page
query
insert into test_delete values(7, 7.7, 'ggggggg'), (8, 8.8, 'hhhhhhhh'), (9, 9.9, 'iiiiiiiii'), (10, 10.1, 'jjjjjjjjjj'), (11, 11.1, 'kkkkkkkkkkk');
----
Expand Down Expand Up @@ -103,7 +103,7 @@ query
select * from test_delete;
----

# 新建页面
# New page
query
insert into test_delete values(1, 1.1, 'a'), (2, 2.2, 'bb');
----
Expand Down
6 changes: 3 additions & 3 deletions test/lab1/30-update.test
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ select * from test_update;
2 2.2 bb
3 3.4 ccc

# 新建页面
# New page
query
insert into test_update values(4, 4.4, 'dddd'), (5, 5.5, 'eeeee'), (6, 6.6, 'ffffff');
----
Expand Down Expand Up @@ -69,7 +69,7 @@ select * from test_update;
100 3.4 ccc
100 4.4 dddd

# 新建页面
# New page
query
insert into test_update values(7, 7.7, 'ggggggg'), (8, 8.8, 'hhhhhhhh'), (9, 9.9, 'iiiiiiiii'), (10, 10.1, 'jjjjjjjjjj'), (11, 11.1, 'kkkkkkkkkkk');
----
Expand Down Expand Up @@ -106,7 +106,7 @@ select id, info from test_update;
10 jjjjjjjjjj
11 kkkkkkkkkkk

# 新建页面
# New page
query
update test_update set score = 99.9 where score < 4.0 or id = 11;
----
Expand Down
16 changes: 8 additions & 8 deletions test/lab1/50-buffer_pool.test
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ show disk_access_count;
3

# lru list is: 4 5 7 7 6
query
query rowsort
select * from buffer_6;
----
1 aaa
Expand All @@ -91,7 +91,7 @@ select * from buffer_6;
5 eee

# lru list is: 4 5 6 7 7
query
query rowsort
select * from buffer_7;
----
1 aaa
Expand All @@ -106,7 +106,7 @@ select * from buffer_7;
10 jjj

# lru list is: 4 5 7 7 6
query
query rowsort
select * from buffer_6;
----
1 aaa
Expand All @@ -121,7 +121,7 @@ show disk_access_count;
3

# lru list is: 5 7 7 6 3, disk_access_count + 2 (Write page 4, Read Page 3)
query
query rowsort
select * from buffer_3;
----
1 aaa
Expand All @@ -136,7 +136,7 @@ show disk_access_count;
5

# lru list is: 7 7 6 3 5
query
query rowsort
select * from buffer_5;
----
1 aaa
Expand All @@ -146,7 +146,7 @@ select * from buffer_5;
5 eee

# lru list is: 7 6 3 5 4, disk_access_count + 2 (Write page 7, Read page 4)
query
query rowsort
select * from buffer_4;
----
1 aaa
Expand All @@ -161,7 +161,7 @@ show disk_access_count;
7

# lru list is: 6 3 5 4 2, disk_access_count + 2 (Write page 7, Read page 2)
query
query rowsort
select * from buffer_2;
----
1 aaa
Expand All @@ -177,7 +177,7 @@ show disk_access_count;

# lru list is: 5 4 2 7 7, disk_access_count + 3 (Read page 7, 7, Write page 6)
# Note that page 3 write does not increment disk_access_count because it is not dirty
query
query rowsort
select * from buffer_7;
----
1 aaa
Expand Down
8 changes: 4 additions & 4 deletions test/lab2/10-rollback.test
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ select * from test_rollback;
1 info1
2 info2

# 插入回滚测试
# Insert rollback test
statement ok
begin;

Expand All @@ -37,7 +37,7 @@ select * from test_rollback;
1 info1
2 info2

# 删除回滚测试
# Delete rollback test
statement ok
begin;

Expand All @@ -60,7 +60,7 @@ select * from test_rollback;
1 info1
2 info2

# 更新回滚测试
# Update rollback test
statement ok
begin;

Expand All @@ -84,7 +84,7 @@ select * from test_rollback;
1 info1
2 info2

# 新页回滚测试
# New page rollback test
statement ok
begin;

Expand Down
10 changes: 5 additions & 5 deletions test/lab2/20-recover.test
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ select * from recover;
1 info1
2 info2

# 重启,确保数据持久化
# Restart to ensure data is written to disk
statement ok
restart;

Expand All @@ -22,7 +22,7 @@ select * from recover;
1 info1
2 info2

# 插入恢复测试
# Insert recovery test
query
insert into recover values(3, 'info3');
----
Expand All @@ -48,7 +48,7 @@ select * from recover;
2 info2
3 info3

# 删除恢复测试
# Delete recovery test
query
delete from recover where id = 1;
----
Expand All @@ -72,7 +72,7 @@ select * from recover;
2 info2
3 info3

# 更新恢复测试
# Update recovery test
query
update recover set id = 3 where id < 3;
----
Expand All @@ -96,7 +96,7 @@ select * from recover;
3 info2
3 info3

# 新页恢复测试
# New page recovery test
query
insert into recover values(4, 'info4'), (5, 'info5'), (6, 'info6'), (7, 'info7'), (8, 'info8'), (9, 'info9'), (10, 'info10');
----
Expand Down

0 comments on commit 73f109c

Please sign in to comment.