MB-32568: Set DeleteSource in StoredValue::setValueImpl

setValueImpl leaves the delete source member untouched
meaning we can end up with a StoredValue in a state
which doesn't match it's source.

Change-Id: I6beb050e797a7eb080fe7d64c464a6c1f9f6e7a9
Reviewed-on: http://review.couchbase.org/103484
Reviewed-by: Chris Farman <[email protected]>
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: jimwwalker

engines/ep/src/item.cc

@@ -295,8 +295,7 @@ void Item::setDeleted(DeleteSource cause) {
     case queue_op::system_event:
         if (cause == DeleteSource::TTL) {
             throw std::logic_error(
-                    "Item::setDeleted should not expire a system_event " +
-                    to_string(op));
+                    "Item::setDeleted should not expire a system_event");
         }
         deleted = 1; // true
         deletionCause = static_cast<uint8_t>(cause);

engines/ep/src/stored-value.cc

@@ -46,6 +46,7 @@ StoredValue::StoredValue(const Item& itm,
       flags(itm.getFlags()),
       revSeqno(itm.getRevSeqno()),
       datatype(itm.getDataType()),
+      deletionSource(0),
       committed(static_cast<uint8_t>(CommittedState::CommittedViaMutation)) {
     // Initialise bit fields
     setDeletedPriv(itm.isDeleted());
@@ -338,10 +339,13 @@ void StoredValue::setValueImpl(const Item& itm) {
     }
 
     setDeletedPriv(itm.isDeleted());
+    if (itm.isDeleted()) {
+        setDeletionSource(itm.deletionSource());
+    }
+
     flags = itm.getFlags();
     datatype = itm.getDataType();
     bySeqno = itm.getBySeqno();
-
     cas = itm.getCas();
     lock_expiry_or_delete_time = 0;
     exptime = itm.getExptime();
@@ -452,6 +456,11 @@ std::ostream& operator<<(std::ostream& os, const StoredValue& sv) {
         const auto* osv = sv.toOrderedStoredValue();
         os << (osv->isStalePriv() ? 'S' : '.');
     }
+
+    if (sv.isDeleted() && sv.getDeletionSource() == DeleteSource::TTL) {
+        os << "TTL";
+    }
+
     os << ' ';
 
     // Temporary states

engines/ep/tests/module_tests/stored_value_test.cc

@@ -370,6 +370,26 @@ TEST(StoredValueTest, expectedSize) {
             << "Unexpected change in StoredValue storage size for key: " << key;
 }
 
+// Validate the deletion source propagates via setValue
+TYPED_TEST(ValueTest, MB_32568) {
+    Item itm(makeStoredDocKey("k"),
+             0,
+             0,
+             (const value_t)TaggedPtr<Blob>{},
+             PROTOCOL_BINARY_RAW_BYTES,
+             0,
+             StoredValue::state_temp_init);
+    itm.setDeleted();
+    this->sv->setValue(itm);
+    EXPECT_EQ(DeleteSource::Explicit, this->sv->getDeletionSource());
+
+    // And now for TTL
+    this->sv = this->factory(this->item, {});
+    itm.setDeleted(DeleteSource::TTL);
+    this->sv->setValue(itm);
+    EXPECT_EQ(DeleteSource::TTL, this->sv->getDeletionSource());
+}
+
 /**
  * Test fixture for OrderedStoredValue-only tests.
  */