Make RouteHandleFactoryFuncForWrapper more general so we can use it to create refill RH

Summary:
We are moving McRefillRoute.h to facebook/ so it can depend on UcacheRouterInfo. With that, the provider can not directly depend on McRefillRoute.h, we need to use the RouteHandleFactoryFuncForWrapper to pass in the factory function.

This diff is to extend the RouteHandleFactoryFuncForWrapper to support McRefillRoute construction.

Reviewed By: disylh

Differential Revision: D68187767

fbshipit-source-id: c8bca9668cd66b99f20b87bd72b1a80daa4a4242

Author: Xiaofei Hu

mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.h

@@ -107,7 +107,8 @@ struct HelloGoodbyeRouterInfo {
       std::function<RouteHandlePtr(
           RouteHandlePtr,
           facebook::memcache::mcrouter::ProxyBase&,
-          const folly::dynamic&)>,
+          const folly::dynamic&,
+          facebook::memcache::RouteHandleFactory<RouteHandleIf>&)>,
       folly::Hash>;
 
   static RouteHandleFactoryMap buildRouteMap();

mcrouter/lib/carbon/test/gen/ARouterInfo.h

@@ -110,7 +110,8 @@ struct ARouterInfo {
       std::function<RouteHandlePtr(
           RouteHandlePtr,
           facebook::memcache::mcrouter::ProxyBase&,
-          const folly::dynamic&)>,
+          const folly::dynamic&,
+          facebook::memcache::RouteHandleFactory<RouteHandleIf>&)>,
       folly::Hash>;
 
   static RouteHandleFactoryMap buildRouteMap();

mcrouter/lib/carbon/test/gen/BRouterInfo.h

@@ -110,7 +110,8 @@ struct BRouterInfo {
       std::function<RouteHandlePtr(
           RouteHandlePtr,
           facebook::memcache::mcrouter::ProxyBase&,
-          const folly::dynamic&)>,
+          const folly::dynamic&,
+          facebook::memcache::RouteHandleFactory<RouteHandleIf>&)>,
       folly::Hash>;
 
   static RouteHandleFactoryMap buildRouteMap();

mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.h

@@ -110,7 +110,8 @@ struct CarbonTestRouterInfo {
       std::function<RouteHandlePtr(
           RouteHandlePtr,
           facebook::memcache::mcrouter::ProxyBase&,
-          const folly::dynamic&)>,
+          const folly::dynamic&,
+          facebook::memcache::RouteHandleFactory<RouteHandleIf>&)>,
       folly::Hash>;
 
   static RouteHandleFactoryMap buildRouteMap();

mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.h

@@ -113,7 +113,8 @@ struct CarbonThriftTestRouterInfo {
       std::function<RouteHandlePtr(
           RouteHandlePtr,
           facebook::memcache::mcrouter::ProxyBase&,
-          const folly::dynamic&)>,
+          const folly::dynamic&,
+          facebook::memcache::RouteHandleFactory<RouteHandleIf>&)>,
       folly::Hash>;
 
   static RouteHandleFactoryMap buildRouteMap();

mcrouter/lib/network/gen/MemcacheRouterInfo.h

@@ -169,7 +169,8 @@ struct MemcacheRouterInfo {
       std::function<RouteHandlePtr(
           RouteHandlePtr,
           facebook::memcache::mcrouter::ProxyBase&,
-          const folly::dynamic&)>,
+          const folly::dynamic&,
+          facebook::memcache::RouteHandleFactory<RouteHandleIf>&)>,
       folly::Hash>;
 
   static RouteHandleFactoryMap buildRouteMap();

mcrouter/routes/McRouteHandleProvider-inl.h

@@ -133,7 +133,8 @@ std::shared_ptr<typename RouterInfo::RouteHandleIf>
 McRouteHandleProvider<RouterInfo>::wrapAxonLogRoute(
     RouteHandlePtr route,
     ProxyBase& proxy,
-    const folly::dynamic& json) {
+    const folly::dynamic& json,
+    RouteHandleFactory<RouteHandleIf>& factory) {
   bool needAxonlog = false;
   if (auto* jNeedAxonlog = json.get_ptr("axonlog")) {
     needAxonlog = parseBool(*jNeedAxonlog, "axonlog");
@@ -143,7 +144,7 @@ McRouteHandleProvider<RouterInfo>::wrapAxonLogRoute(
     checkLogic(
         it != routeMapForWrapper_.end(),
         "AxonLogRoute is not implemented for this router");
-    return it->second(std::move(route), proxy, json);
+    return it->second(std::move(route), proxy, json, factory);
   }
   return route;
 }
@@ -557,7 +558,7 @@ McRouteHandleProvider<RouterInfo>::createSRRoute(
     route = createAsynclogRoute(std::move(route), asynclogName.toString());
   }
 
-  route = wrapAxonLogRoute(std::move(route), proxy_, json);
+  route = wrapAxonLogRoute(std::move(route), proxy_, json, factory);
 
   if (json.count("shadows")) {
     route = std::move(makeShadowRoutes(
@@ -731,7 +732,7 @@ McRouteHandleProvider<RouterInfo>::makePoolRoute(
     }
     if (json.isObject()) {
       // Wrap AxonLogRoute if configured
-      route = wrapAxonLogRoute(std::move(route), proxy_, json);
+      route = wrapAxonLogRoute(std::move(route), proxy_, json, factory);
       route = bucketize(std::move(route), json);
 
       if (auto jPoolId = json.get_ptr("pool_id")) {
@@ -844,9 +845,12 @@ McRouteHandleProvider<RouterInfo>::buildCheckedRouteMapForWrapper() {
     checkedRouteMapForWrapper.emplace(
         it.first,
         [factoryFunc = std::move(it.second), rhName = it.first](
-            RouteHandlePtr rh, ProxyBase& proxy, const folly::dynamic& json) {
+            RouteHandlePtr rh,
+            ProxyBase& proxy,
+            const folly::dynamic& json,
+            RouteHandleFactory<RouteHandleIf>& factory) {
           try {
-            auto ret = factoryFunc(std::move(rh), proxy, json);
+            auto ret = factoryFunc(std::move(rh), proxy, json, factory);
             checkLogic(ret != nullptr, "make{} returned nullptr", rhName);
             return ret;
           } catch (const std::exception& e) {

mcrouter/routes/McRouteHandleProvider.cpp

@@ -329,8 +329,11 @@ typename McRouteHandleProvider<
 McRouteHandleProvider<MemcacheRouterInfo>::buildRouteMapForWrapper() {
   RouteHandleFactoryMapForWrapper map{
       {"AxonLogRoute",
-       [](RouteHandlePtr rh, ProxyBase& proxy, const folly::dynamic& json) {
-         return makeAxonLogRoute(std::move(rh), proxy, json);
+       [](RouteHandlePtr rh,
+          ProxyBase& proxy,
+          const folly::dynamic& json,
+          RouteHandleFactory<RouteHandleIf>& factory) {
+         return makeAxonLogRoute(std::move(rh), proxy, json, factory);
        }}};
   return map;
 }

mcrouter/routes/McRouteHandleProvider.h

@@ -40,7 +40,8 @@ FOLLY_ATTR_WEAK MemcacheRouterInfo::RouteHandlePtr makeSRRoute(
 FOLLY_ATTR_WEAK MemcacheRouterInfo::RouteHandlePtr makeAxonLogRoute(
     MemcacheRouterInfo::RouteHandlePtr rh,
     ProxyBase& proxy,
-    const folly::dynamic& json);
+    const folly::dynamic& json,
+    RouteHandleFactory<MemcacheRouterInfo::RouteHandleIf>& factory);
 
 template <class RouteHandleIf>
 class ExtraRouteHandleProviderIf;
@@ -107,8 +108,11 @@ class McRouteHandleProvider
       folly::StringPiece,
       RouteHandleFactoryFuncWithProxy,
       folly::Hash>;
-  using RouteHandleFactoryFuncForWrapper = std::function<
-      RouteHandlePtr(RouteHandlePtr, ProxyBase&, const folly::dynamic&)>;
+  using RouteHandleFactoryFuncForWrapper = std::function<RouteHandlePtr(
+      RouteHandlePtr,
+      ProxyBase&,
+      const folly::dynamic&,
+      RouteHandleFactory<RouteHandleIf>&)>;
   using RouteHandleFactoryMapForWrapper = std::unordered_map<
       folly::StringPiece,
       RouteHandleFactoryFuncForWrapper,
@@ -212,7 +216,8 @@ class McRouteHandleProvider
   RouteHandlePtr wrapAxonLogRoute(
       RouteHandlePtr route,
       ProxyBase& proxy,
-      const folly::dynamic& json);
+      const folly::dynamic& json,
+      RouteHandleFactory<RouteHandleIf>& factory);
 
   template <class Transport>
   std::pair<RouteHandlePtr, std::shared_ptr<const AccessPoint>>