MB-41550: Add hello flag for SubdocReplaceBodyWithXattr

Change-Id: I5de5276bc77078b2a33f7954b8aef843149a47ab
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/138165
Tested-by: Build Bot <[email protected]>
Reviewed-by: Paolo Cocchi <[email protected]>

Author: trondn

daemon/datatype_filter.cc

@@ -51,6 +51,7 @@ void DatatypeFilter::enable(cb::mcbp::Feature feature) {
     case cb::mcbp::Feature::PiTR:
     case cb::mcbp::Feature::SubdocCreateAsDeleted:
     case cb::mcbp::Feature::SubdocDocumentMacroSupport:
+    case cb::mcbp::Feature::SubdocReplaceBodyWithXattr:
         throw std::invalid_argument("Datatype::enable invalid feature:" +
                                     std::to_string(int(feature)));
     }

daemon/protocol/mcbp/hello_packet_executor.cc

@@ -85,6 +85,7 @@ void buildRequestVector(FeatureSet& requested, cb::sized_buffer<const uint16_t>
         case cb::mcbp::Feature::PiTR:
         case cb::mcbp::Feature::SubdocCreateAsDeleted:
         case cb::mcbp::Feature::SubdocDocumentMacroSupport:
+        case cb::mcbp::Feature::SubdocReplaceBodyWithXattr:
 
             // This isn't very optimal, but we've only got a handfull of elements ;)
             if (!containsFeature(requested, feature)) {
@@ -118,6 +119,7 @@ void buildRequestVector(FeatureSet& requested, cb::sized_buffer<const uint16_t>
         case cb::mcbp::Feature::PreserveTtl:
         case cb::mcbp::Feature::PiTR:
         case cb::mcbp::Feature::SubdocCreateAsDeleted:
+        case cb::mcbp::Feature::SubdocReplaceBodyWithXattr:
             // No other dependency
             break;
 
@@ -353,7 +355,8 @@ void process_hello_packet_executor(Cookie& cookie) {
         case cb::mcbp::Feature::SubdocDocumentMacroSupport:
         case cb::mcbp::Feature::PiTR:
         case cb::mcbp::Feature::SubdocCreateAsDeleted:
-            // VAttr, PiTR, SubdocCreateAsDeleted are only informative
+        case cb::mcbp::Feature::SubdocReplaceBodyWithXattr:
+            // Informative features don't need special handling
             added = true;
             break;
         } // end switch

docs/BinaryProtocol.md

@@ -1825,6 +1825,7 @@ The following features is defined:
 | 0x0016 | PiTR |
 | 0x0017 | SubdocCreateAsDeleted support |
 | 0x0018 | SubdocDocumentMacroSupport |
+| 0x0019 | SubdocReplaceBodyWithXattr |
 
 * `Datatype` - The client understands the 'non-null' values in the
   [datatype field](#data-types). The server expects the client to fill
@@ -1908,6 +1909,9 @@ The following features is defined:
           disable anything on the server). It may be used from the client to
           determine if the server supports using the virtual attribute $document
           in macros. Requires XATTR
+* `SubdocReplaceBodyWithXattr` This is purely information (it does not enable /
+  disable anything on the server). It may be used from the client to
+  determine if the server supports the command SubdocReplaceBodyWithXattr.
 
 Response:
 

include/mcbp/protocol/feature.h

@@ -19,8 +19,8 @@
 #include <cstdint>
 #include <string>
 
-namespace cb {
-namespace mcbp {
+namespace cb::mcbp {
+
 /**
  * Definition of hello's features.
  * Note regarding JSON:0x1. Previously this was named DATATYPE and
@@ -88,9 +88,12 @@ enum class Feature : uint16_t {
     /// Does the server support using the virtual $document attributes in macro
     /// expansion ( "${document.CAS}" etc)
     SubdocDocumentMacroSupport = 0x18,
+
+    /// Does the server support SubdocReplaceBodyWithXattr introduced in
+    /// Cheshire-Cat
+    SubdocReplaceBodyWithXattr = 0x19,
 };
 
-} // namespace mcbp
-} // namespace cb
+} // namespace cb::mcbp
 
 std::string to_string(cb::mcbp::Feature feature);

protocol/mcbp/feature.cc

@@ -69,6 +69,8 @@ std::string to_string(cb::mcbp::Feature feature) {
         return "SubdocCreateAsDeleted";
     case cb::mcbp::Feature::SubdocDocumentMacroSupport:
         return "SubdocDocumentMacroSupport";
+    case cb::mcbp::Feature::SubdocReplaceBodyWithXattr:
+        return "SubdocReplaceBodyWithXattr";
     }
 
     throw std::invalid_argument(

protocol/mcbp/feature_test.cc

@@ -44,7 +44,9 @@ const std::map<cb::mcbp::Feature, std::string> blueprint = {
          {cb::mcbp::Feature::PiTR, "PiTR"},
          {cb::mcbp::Feature::SubdocCreateAsDeleted, "SubdocCreateAsDeleted"},
          {cb::mcbp::Feature::SubdocDocumentMacroSupport,
-          "SubdocDocumentMacroSupport"}}};
+          "SubdocDocumentMacroSupport"},
+         {cb::mcbp::Feature::SubdocReplaceBodyWithXattr,
+          "SubdocReplaceBodyWithXattr"}}};
 
 TEST(to_string, LegalValues) {
     for (const auto& entry : blueprint) {

tests/testapp/testapp.cc

@@ -1302,7 +1302,8 @@ MemcachedConnection& TestappTest::prepare(MemcachedConnection& connection) {
             {cb::mcbp::Feature::MUTATION_SEQNO,
              cb::mcbp::Feature::XATTR,
              cb::mcbp::Feature::XERROR,
-             cb::mcbp::Feature::SELECT_BUCKET}};
+             cb::mcbp::Feature::SELECT_BUCKET,
+             cb::mcbp::Feature::SubdocReplaceBodyWithXattr}};
     if (hasSnappySupport() == ClientSnappySupport::Yes) {
         features.push_back(cb::mcbp::Feature::SNAPPY);
     }