Skip to content

Migrate OSS project to handle protocol split #9609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −1
Open

Migrate OSS project to handle protocol split #9609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/fbcode_builder/CMake/FBThriftCppLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE)
"${output_dir}/gen-cpp2/${base}_data.h"
"${output_dir}/gen-cpp2/${base}_data.cpp"
"${output_dir}/gen-cpp2/${base}_types.cpp"
"${output_dir}/gen-cpp2/${base}_types_compact.cpp"
"${output_dir}/gen-cpp2/${base}_types_binary.cpp"
"${output_dir}/gen-cpp2/${base}_metadata.cpp"
)
foreach(service IN LISTS ARG_SERVICES)
Expand Down
10 changes: 10 additions & 0 deletions third-party/mcrouter/src/mcrouter/lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,15 @@ libmcrouter_a_SOURCES = \
carbon/Util.h \
carbon/Variant.h \
carbon/gen-cpp2/carbon_result_types.cpp \
carbon/gen-cpp2/carbon_result_types_compact.cpp \
carbon/gen-cpp2/carbon_result_types_binary.cpp \
carbon/gen-cpp2/carbon_result_types.h \
carbon/gen-cpp2/carbon_result_types.tcc \
carbon/gen-cpp2/carbon_result_data.cpp \
carbon/gen-cpp2/carbon_result_data.h \
carbon/gen-cpp2/carbon_types.cpp \
carbon/gen-cpp2/carbon_types_compact.cpp \
carbon/gen-cpp2/carbon_types_binary.cpp \
carbon/gen-cpp2/carbon_types.h \
carbon/gen-cpp2/carbon_types.tcc \
carbon/gen-cpp2/carbon_data.cpp \
Expand Down Expand Up @@ -191,6 +195,8 @@ libmcrouter_a_SOURCES = \
network/gen/MemcacheMessagesThrift.cpp \
network/gen/MemcacheMessages.h \
network/gen/gen-cpp2/Common_types.cpp \
network/gen/gen-cpp2/Common_types_compact.cpp \
network/gen/gen-cpp2/Common_types_binary.cpp \
network/gen/gen-cpp2/Common_types.h \
network/gen/gen-cpp2/Common_types.tcc \
network/gen/gen-cpp2/Common_data.cpp \
Expand All @@ -200,11 +206,15 @@ libmcrouter_a_SOURCES = \
network/gen/gen-cpp2/MemcacheService_constants.cpp \
network/gen/gen-cpp2/MemcacheService_constants.h \
network/gen/gen-cpp2/MemcacheService_types.cpp \
network/gen/gen-cpp2/MemcacheService_types_compact.cpp \
network/gen/gen-cpp2/MemcacheService_types_binary.cpp \
network/gen/gen-cpp2/MemcacheService_types.h \
network/gen/gen-cpp2/MemcacheService_types.tcc \
network/gen/gen-cpp2/MemcacheService_data.cpp \
network/gen/gen-cpp2/MemcacheService_data.h \
network/gen/gen-cpp2/Memcache_types.cpp \
network/gen/gen-cpp2/Memcache_types_compact.cpp \
network/gen/gen-cpp2/Memcache_types_binary.cpp \
network/gen/gen-cpp2/Memcache_types.h \
network/gen/gen-cpp2/Memcache_types.tcc \
network/gen/gen-cpp2/Memcache_data.cpp \
Expand Down
8 changes: 8 additions & 0 deletions third-party/mcrouter/src/mcrouter/lib/carbon/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,32 @@

BUILT_SOURCES = \
gen-cpp2/carbon_result_types.cpp \
gen-cpp2/carbon_result_types_compact.cpp \
gen-cpp2/carbon_result_types_binary.cpp \
gen-cpp2/carbon_result_types.h \
gen-cpp2/carbon_result_types.tcc \
gen-cpp2/carbon_result_data.cpp \
gen-cpp2/carbon_result_data.h \
gen-cpp2/carbon_types.cpp \
gen-cpp2/carbon_types_compact.cpp \
gen-cpp2/carbon_types_binary.cpp \
gen-cpp2/carbon_types.h \
gen-cpp2/carbon_types.tcc \
gen-cpp2/carbon_data.cpp \
gen-cpp2/carbon_data.h

gen-cpp2/carbon_result_types.cpp: gen-cpp2/carbon_result_types.h
gen-cpp2/carbon_result_types_compact.cpp: gen-cpp2/carbon_result_types.h
gen-cpp2/carbon_result_types_binary.cpp: gen-cpp2/carbon_result_types.h
gen-cpp2/carbon_result_types.h: gen-cpp2/carbon_result_types.tcc
gen-cpp2/carbon_result_types.tcc: gen-cpp2/carbon_result_data.cpp
gen-cpp2/carbon_result_data.cpp: gen-cpp2/carbon_result_data.h
gen-cpp2/carbon_result_data.h: carbon_result.thrift
@FBTHRIFT@ -gen mstch_cpp2:stack_arguments,sync_methods_return_try,include_prefix=mcrouter/lib/carbon/ carbon_result.thrift

gen-cpp2/carbon_types.cpp: gen-cpp2/carbon_types.h
gen-cpp2/carbon_types_compact.cpp: gen-cpp2/carbon_types.h
gen-cpp2/carbon_types_binary.cpp: gen-cpp2/carbon_types.h
gen-cpp2/carbon_types.h: gen-cpp2/carbon_types.tcc
gen-cpp2/carbon_types.tcc: gen-cpp2/carbon_data.cpp
gen-cpp2/carbon_data.cpp: gen-cpp2/carbon_data.h
Expand Down
10 changes: 10 additions & 0 deletions third-party/mcrouter/src/mcrouter/lib/network/gen/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@

BUILT_SOURCES = \
gen-cpp2/Common_types.cpp \
gen-cpp2/Common_types_compact.cpp \
gen-cpp2/Common_types_binary.cpp \
gen-cpp2/Common_types.h \
gen-cpp2/Common_types.tcc \
gen-cpp2/Common_data.cpp \
gen-cpp2/Common_data.h \
gen-cpp2/Memcache_types.cpp \
gen-cpp2/Memcache_types_compact.cpp \
gen-cpp2/Memcache_types_binary.cpp \
gen-cpp2/Memcache_types.h \
gen-cpp2/Memcache_types.tcc \
gen-cpp2/Memcache_data.cpp \
Expand All @@ -19,19 +23,25 @@ BUILT_SOURCES = \
gen-cpp2/MemcacheService_constants.cpp \
gen-cpp2/MemcacheService_constants.h \
gen-cpp2/MemcacheService_types.cpp \
gen-cpp2/MemcacheService_types_compact.cpp \
gen-cpp2/MemcacheService_types_binary.cpp \
gen-cpp2/MemcacheService_types.h \
gen-cpp2/MemcacheService_types.tcc \
gen-cpp2/MemcacheService_data.cpp \
gen-cpp2/MemcacheService_data.h

gen-cpp2/Common_types.cpp: gen-cpp2/Common_types.h
gen-cpp2/Common_types_compact.cpp: gen-cpp2/Common_types.h
gen-cpp2/Common_types_binary.cpp: gen-cpp2/Common_types.h
gen-cpp2/Common_types.h: gen-cpp2/Common_types.tcc
gen-cpp2/Common_types.tcc: gen-cpp2/Common_data.cpp
gen-cpp2/Common_data.cpp: gen-cpp2/Common_data.h
gen-cpp2/Common_data.h: Common.thrift
@FBTHRIFT@ -gen mstch_cpp2:stack_arguments,sync_methods_return_try,deprecated_terse_writes,include_prefix=mcrouter/lib/network/gen -I $(top_srcdir)/.. -I $(INSTALL_DIR)/include/ Common.thrift

gen-cpp2/Memcache_types.cpp: gen-cpp2/Memcache_types.h
gen-cpp2/Memcache_types_compact.cpp: gen-cpp2/Memcache_types.h
gen-cpp2/Memcache_types_binary.cpp: gen-cpp2/Memcache_types.h
gen-cpp2/Memcache_types.h: gen-cpp2/Memcache_types.tcc
gen-cpp2/Memcache_types.tcc: gen-cpp2/Memcache_data.cpp
gen-cpp2/Memcache_data.cpp: gen-cpp2/Memcache_data.h
Expand Down
9 changes: 8 additions & 1 deletion third-party/thrift/src/thrift/lib/py/TSCons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ def scons_env(env, add=""):

def gen_cpp(env, dir, file):
scons_env(env)
suffixes = ["_data.h", "_data.cpp", "_types.h", "_types.cpp"]
suffixes = [
"_data.h",
"_data.cpp",
"_types.h",
"_types.cpp",
"_types_compact.cpp",
"_types_binary.cpp",
]
targets = ["gen-cpp" + file + s for s in suffixes]
return env.ThriftCpp(targets, dir + file + ".thrift")
Loading