CowSubscriptionManager: handle publish for HybridNode

Summary: Fix handling of publish paths in when traversing HybridNode.

Reviewed By: wilsonwinhi

Differential Revision: D67162095

fbshipit-source-id: 3e8b1a8c77e8e6690ddb9422eb96711456daeb88

fboss/fsdb/oper/CowSubscriptionManager.h

@@ -290,10 +290,16 @@ class CowSubscriptionManager
     auto processPath = [&](const std::vector<std::string>& /*path*/,
                            auto&& node) mutable {
       if constexpr (is_shared_ptr_v<folly::remove_cvref_t<decltype(node)>>) {
-        // We only want to publish the node itself, not recurse to
-        // children.  This invokes the base version of publish to
-        // avoid recursing automatically.
-        node->NodeBase::publish();
+        // skip publish on HybridNode.
+        if constexpr (!std::is_same_v<
+                          typename folly::remove_cvref_t<
+                              decltype(*node)>::CowType,
+                          thrift_cow::HybridNodeType>) {
+          // We only want to publish the node itself, not recurse to
+          // children.  This invokes the base version of publish to
+          // avoid recursing automatically.
+          node->NodeBase::publish();
+        }
       }
     };
 

fboss/thrift_cow/visitors/RecurseVisitor.h

@@ -297,9 +297,12 @@ struct RecurseVisitor<
       throw std::runtime_error(folly::to<std::string>(
           "RecurseVisitor support for hybridNodeDeepTraversal in Map not implemented"));
     }
+    if (options.mode == RecurseVisitMode::UNPUBLISHED) {
+      rv_detail::invokeVisitorFnHelper(traverser, node, std::forward<Func>(f));
+      return;
+    }
     auto& tObj = node->ref();
-    bool visitIntermediate = options.mode == RecurseVisitMode::FULL ||
-        options.mode == RecurseVisitMode::UNPUBLISHED;
+    bool visitIntermediate = options.mode == RecurseVisitMode::FULL;
     if (visitIntermediate &&
         options.order == RecurseVisitOrder::PARENTS_FIRST) {
       rv_detail::invokeVisitorFnHelper(traverser, node, std::forward<Func>(f));