update comments

jiaqizho · jiaqizho · commit f2ff623df715 · 2021-12-28T10:39:09.000+08:00
diff --git a/dbms/src/Storages/Page/V3/PageDirectory.cpp b/dbms/src/Storages/Page/V3/PageDirectory.cpp
@@ -195,7 +195,8 @@ void PageDirectory::apply(PageEntriesEdit && edit)
 
     if (!updating_locks.empty())
     {
-        LOG_FMT_WARNING(log, "`updating_locks` must be cleared. But there are some locks not been erased. [remain sizes={}]", updating_locks.size());
+        throw Exception(fmt::format("`updating_locks` must be cleared. But there are some locks not been erased. [remain sizes={}]", updating_locks.size()),
+                        ErrorCodes::LOGICAL_ERROR);
     }
 
     // The edit committed, incr the sequence number to publish changes for `createSnapshot`
diff --git a/dbms/src/Storages/Page/V3/tests/gtest_page_directory.cpp b/dbms/src/Storages/Page/V3/tests/gtest_page_directory.cpp
@@ -294,6 +294,7 @@ CATCH
 TEST_F(PageDirectoryTest, ApplyPutWithIdenticalPages)
 try
 {
+    // Put identical page in different `edit`
     PageId page_id = 50;
 
     auto snap0 = dir.createSnapshot();
@@ -325,6 +326,7 @@ try
         EXPECT_ENTRIES_EQ(expected_entries, dir, ids, snap2);
     }
 
+    // Put identical page within one `edit`
     page_id++;
     PageEntryV3 entry3{.file_id = 1, .size = 1024, .offset = 0x12345, .checksum = 0x4567};
     {

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,8 @@ void PageDirectory::apply(PageEntriesEdit && edit)`
`195`	`195`
`196`	`196`	`if (!updating_locks.empty())`
`197`	`197`	`{`
`198`		- LOG_FMT_WARNING(log, "`updating_locks` must be cleared. But there are some locks not been erased. [remain sizes={}]", updating_locks.size());
	`198`	+ throw Exception(fmt::format("`updating_locks` must be cleared. But there are some locks not been erased. [remain sizes={}]", updating_locks.size()),
	`199`	`+ ErrorCodes::LOGICAL_ERROR);`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	// The edit committed, incr the sequence number to publish changes for `createSnapshot`
Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,7 @@ CATCH`
`294`	`294`	`TEST_F(PageDirectoryTest, ApplyPutWithIdenticalPages)`
`295`	`295`	`try`
`296`	`296`	`{`
	`297`	+ // Put identical page in different `edit`
`297`	`298`	`PageId page_id = 50;`
`298`	`299`
`299`	`300`	`auto snap0 = dir.createSnapshot();`
`@@ -325,6 +326,7 @@ try`
`325`	`326`	`EXPECT_ENTRIES_EQ(expected_entries, dir, ids, snap2);`
`326`	`327`	`}`
`327`	`328`
	`329`	+ // Put identical page within one `edit`
`328`	`330`	`page_id++;`
`329`	`331`	`PageEntryV3 entry3{.file_id = 1, .size = 1024, .offset = 0x12345, .checksum = 0x4567};`
`330`	`332`	`{`