Skip to content

Commit ac8e992

Browse files
committed
Merge commit neo/c88c04aa0 into master
* c88c04a [BP MB-52276] MB-53657: Notify DCP frontend at CM::queueSetVBState() * f6ba8a7 [BP MB-52276] MB-53657: Notify DCP frontend if cursor jumps into new checkpoint * 25fd6d3 [BP MB-52276] MB-53657: Don't check for stream-active in Prod::notifySeqnoAvailable * 065ecd2 [BP MB-52276] MB-53657: Remove unused seqno arg in KVBucket::notifyReplication * 39f73a3 [BP MB-52276] MB-53657: Remove unused seqno arg in DcpConnMap::notifySeqnoAvailable * 451e0bd [BP MB-52276] MB-53657: Remove unused seqno arg in DcpProducer::notifySeqnoAvailable * 8801765 MB-39344: Fix sporadic ep_testsuite failures * 0c99362 [BP] MB-39344: Simplify logic in CM::registerCursorBySeqno * 12eb97b [BP] MB-39344: Allow expelling all non-meta items in checkpoint * 6683344 [BP] MB-39344: Add test coverage for Checkpoint::getMinimumCursorSeqno * 0059ff8 [BP] MB-39344: Fix computation in Checkpoint::getHighSeqno() * eec7031 [BP] MB-39344: Remove Vbid arg from CM::createCheckpointMetaItem * d557f64 [BP] MB-39344: Rename createCheckpointItem() into createCheckpointMetaItem() * 9606a0b [BP] MB-39344: De-inline Checkpoint::getHighSeqno() Change-Id: I0ca75a339e7cfbb68e57a49876c1b964a5da17c8
2 parents 178bcae + c88c04a commit ac8e992

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

engines/ep/tests/module_tests/checkpoint_remover_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,22 +633,22 @@ TEST_P(CheckpointRemoverEPTest,
633633
cm->incrCursor(*cursor);
634634
}
635635

636-
// Can now expel the 2 items in (ckpt_start, cursor)
636+
// Can now expel the 2 items in (ckpt_start, cursor]
637637
auto result = cm->expelUnreferencedCheckpointItems();
638638

639-
EXPECT_EQ(2, result.count);
639+
EXPECT_EQ(3, result.count);
640640

641641
/* items in first checkpoint
642642
*
643643
* dummy
644644
* chk start
645-
* key_1
646645
* key_2
646+
* chk end
647647
*/
648648

649649
afterCount = getItemsWithCursor("Cursor4", 0, true).size();
650650

651-
EXPECT_EQ(beforeCount - 2, afterCount);
651+
EXPECT_EQ(beforeCount - 3, afterCount);
652652
}
653653

654654
TEST_P(CheckpointRemoverEPTest, earliestCheckpointSelectedCorrectly) {

engines/ep/tests/module_tests/checkpoint_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2501,7 +2501,7 @@ TEST_P(ReplicaCheckpointTest, ExpelCheckpointItemsDisk) {
25012501

25022502
// Test that we correctly handle duplicates, where the initial version of the
25032503
// document has been expelled.
2504-
TEST_P(CheckpointTest, ExpelCheckpointItemsWithDuplicateTest) {
2504+
TEST_P(CheckpointTest, ExpelCheckpointItemsWithDuplicate) {
25052505
const int itemCount{3};
25062506

25072507
for (auto ii = 0; ii < itemCount; ++ii) {

0 commit comments

Comments
 (0)