Skip to content

Commit

Permalink
Remove unnecessary rsocket-cpp dependencies
Browse files Browse the repository at this point in the history
Reviewed By: iahs

Differential Revision: D22265248

fbshipit-source-id: acca92e27ea137cc63c330c833eeb7befe440059
  • Loading branch information
jmswen authored and facebook-github-bot committed Jul 1, 2020
1 parent 65be864 commit f8c46b1
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 16 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ if(lib_only OR build_all)
find_package(Gflags REQUIRED)
find_package(Glog REQUIRED)
find_package(folly CONFIG REQUIRED)
find_package(yarpl CONFIG REQUIRED) # transitive dep for rsocket
find_package(rsocket CONFIG)
find_package(fizz CONFIG REQUIRED)
find_package(fmt CONFIG REQUIRED)
find_package(wangle CONFIG REQUIRED)
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Facebook Thrift [![Build Status](https://travis-ci.org/facebook/fbthrift.svg?bra

Thrift is a serialization and RPC framework for service communication. Thrift enables these features in all major languages, and there is strong support for C++, Python, Hack, and Java. Most services at Facebook are written using Thrift for RPC, and some storage systems use Thrift for serializing records on disk.

Facebook Thrift is not a distribution of [Apache Thrift](https://thrift.apache.org/). This is an evolved internal branch of Thrift that Facebook re-released to open source community in February 2014. Facebook Thrift was originally released closely tracking Apache Thrift but is now evolving in new directions. In particular, the compiler was rewritten from scratch and the new implementation features a fully asynchronous Thrift server. Read more about these improvements in the [ThriftServer documentation](https://github.com/facebook/fbthrift/blob/master/thrift/doc/Cpp2.md).
Facebook Thrift is not a distribution of [Apache Thrift](https://thrift.apache.org/). This is an evolved internal branch of Thrift that Facebook re-released to open source community in February 2014. Facebook Thrift was originally released closely tracking Apache Thrift but is now evolving in new directions. In particular, the compiler was rewritten from scratch and the new implementation features a fully asynchronous Thrift server. Read more about these improvements in the [ThriftServer documentation](https://github.com/facebook/fbthrift/blob/master/thrift/doc/Cpp2.md).

You can also learn more about this project in the original Facebook Code [blog post](https://code.facebook.com/posts/1468950976659943/under-the-hood-building-and-open-sourcing-fbthrift/).

Expand Down Expand Up @@ -69,7 +69,6 @@ Please install the following dependencies before building Facebook Thrift:
[{fmt}](https://github.com/fmtlib/fmt),
[GFlags](https://github.com/gflags/gflags),
[GLog](https://github.com/google/glog),
[rsocket-cpp](https://github.com/rsocket/rsocket-cpp)

**Facebook**:
[Fizz](https://github.com/facebookincubator/fizz),
Expand Down Expand Up @@ -104,7 +103,7 @@ your project. This includes the following macro to help building Thrift files:
#output_path
)

This generates a library called `file_name-<language>`. That is, for
This generates a library called `file_name-<language>`. That is, for
`Test.thrift` compiled as cpp2, it will generate the library `Test-cpp2`.
This should be added as a dependency to any source or header file that contains
an include to generated code.
Expand Down
7 changes: 0 additions & 7 deletions thrift/lib/cpp2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,6 @@ target_link_libraries(
thriftfrozen2
thriftprotocol
)
if(TARGET rsocket::ReactiveSocket)
target_link_libraries(
thriftcpp2
PUBLIC
rsocket::ReactiveSocket
)
endif()

# Install includes
set(THRIFT2_HEADER_DIRS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
#include <folly/io/Cursor.h>
#include <folly/io/IOBuf.h>

#include <rsocket/RSocketParameters.h>

#include <thrift/lib/cpp/TApplicationException.h>
#include <thrift/lib/cpp2/protocol/CompactProtocol.h>
#include <thrift/lib/cpp2/server/Cpp2ConnContext.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

#include <thrift/lib/cpp2/transport/rocket/test/util/TestServiceMock.h>
#include <rsocket/Payload.h>

namespace testutil {
namespace testservice {
Expand Down
1 change: 0 additions & 1 deletion thrift/perf/cpp2/server/BenchmarkHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#pragma once

#include <folly/system/ThreadName.h>
#include <rsocket/internal/ScheduledSubscriber.h>
#include <thrift/perf/cpp2/if/gen-cpp2/StreamBenchmark.h>
#include <thrift/perf/cpp2/util/QPSStats.h>

Expand Down

0 comments on commit f8c46b1

Please sign in to comment.