Merge pull request #11236 from apple/fanout

Fix bug in which private mutations were detected incorrectly.
This commit is contained in:
Jingyu Zhou 2024-03-13 10:59:32 -07:00 committed by GitHub
commit 1ed42ee658
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions

View File

@ -800,8 +800,8 @@ struct LogPushData : NonCopyable {
// MUST be called after getMessages() and recordEmptyMessage().
float getEmptyMessageRatio() const;
// Returns the total number of mutations.
uint32_t getMutationCount() const { return subsequence; }
// Returns the total number of mutations. Subsequence is initialized to 1, so subtract 1 to get count.
uint32_t getMutationCount() const { return subsequence - 1; }
// Sets mutations for all internal writers. "mutations" is the output from
// getAllMessages() and is used before writing any other mutations.

View File

@ -337,10 +337,10 @@ if(WITH_PYTHON)
restarting/from_7.1.0_until_7.2.0/UpgradeAndBackupRestore-2.toml)
add_fdb_test(
TEST_FILES restarting/from_7.1.0_until_7.2.0/VersionVectorDisableRestart-1.toml
restarting/from_7.1.0_until_7.2.0/VersionVectorDisableRestart-2.toml)
restarting/from_7.1.0_until_7.2.0/VersionVectorDisableRestart-2.toml IGNORE)
add_fdb_test(
TEST_FILES restarting/from_7.1.0_until_7.2.0/VersionVectorEnableRestart-1.toml
restarting/from_7.1.0_until_7.2.0/VersionVectorEnableRestart-2.toml)
restarting/from_7.1.0_until_7.2.0/VersionVectorEnableRestart-2.toml IGNORE)
add_fdb_test(
TEST_FILES restarting/from_7.2.0_until_7.3.0/ConfigureTestRestart-1.toml
restarting/from_7.2.0_until_7.3.0/ConfigureTestRestart-2.toml)
@ -352,10 +352,10 @@ if(WITH_PYTHON)
restarting/from_7.2.0_until_7.3.0/DrUpgradeRestart-2.toml)
add_fdb_test(
TEST_FILES restarting/from_7.2.0_until_7.3.0/VersionVectorDisableRestart-1.toml
restarting/from_7.2.0_until_7.3.0/VersionVectorDisableRestart-2.toml)
restarting/from_7.2.0_until_7.3.0/VersionVectorDisableRestart-2.toml IGNORE)
add_fdb_test(
TEST_FILES restarting/from_7.2.0_until_7.3.0/VersionVectorEnableRestart-1.toml
restarting/from_7.2.0_until_7.3.0/VersionVectorEnableRestart-2.toml)
restarting/from_7.2.0_until_7.3.0/VersionVectorEnableRestart-2.toml IGNORE)
add_fdb_test(
TEST_FILES restarting/from_7.2.4_until_7.3.0/UpgradeAndBackupRestore-1.toml
restarting/from_7.2.4_until_7.3.0/UpgradeAndBackupRestore-2.toml)
@ -373,10 +373,10 @@ if(WITH_PYTHON)
restarting/from_7.3.0/UpgradeAndBackupRestore-2.toml)
add_fdb_test(
TEST_FILES restarting/from_7.3.0/VersionVectorDisableRestart-1.toml
restarting/from_7.3.0/VersionVectorDisableRestart-2.toml)
restarting/from_7.3.0/VersionVectorDisableRestart-2.toml IGNORE)
add_fdb_test(
TEST_FILES restarting/from_7.3.0/VersionVectorEnableRestart-1.toml
restarting/from_7.3.0/VersionVectorEnableRestart-2.toml)
restarting/from_7.3.0/VersionVectorEnableRestart-2.toml IGNORE)
add_fdb_test(
TEST_FILES restarting/from_7.3.0/BlobGranuleRestartCycle-1.toml
restarting/from_7.3.0/BlobGranuleRestartCycle-2.toml)