Moving from govendor to dep, updated dependencies (#48)
* Moving from govendor to dep. * Making the pull request template more friendly. * Fixing akward space in PR template. * goimports run on whole project using ` goimports -w $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./gen-go/*")` source of command: https://gist.github.com/bgentry/fd1ffef7dbde01857f66
This commit is contained in:
parent
9631aa3aab
commit
8d445c1c77
2186 changed files with 400410 additions and 352 deletions
52
vendor/git.apache.org/thrift.git/tutorial/cpp/CMakeLists.txt
generated
vendored
Normal file
52
vendor/git.apache.org/thrift.git/tutorial/cpp/CMakeLists.txt
generated
vendored
Normal file
|
@ -0,0 +1,52 @@
|
|||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
|
||||
include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
|
||||
|
||||
#Make sure gen-cpp files can be included
|
||||
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
|
||||
include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-cpp")
|
||||
include_directories("${PROJECT_SOURCE_DIR}/lib/cpp/src")
|
||||
|
||||
include(ThriftMacros)
|
||||
|
||||
set(tutorialgencpp_SOURCES
|
||||
gen-cpp/Calculator.cpp
|
||||
gen-cpp/SharedService.cpp
|
||||
gen-cpp/shared_constants.cpp
|
||||
gen-cpp/shared_types.cpp
|
||||
gen-cpp/tutorial_constants.cpp
|
||||
gen-cpp/tutorial_types.cpp
|
||||
)
|
||||
add_library(tutorialgencpp STATIC ${tutorialgencpp_SOURCES})
|
||||
LINK_AGAINST_THRIFT_LIBRARY(tutorialgencpp thrift)
|
||||
|
||||
add_custom_command(OUTPUT gen-cpp/Calculator.cpp gen-cpp/SharedService.cpp gen-cpp/shared_constants.cpp gen-cpp/shared_types.cpp gen-cpp/tutorial_constants.cpp gen-cpp/tutorial_types.cpp
|
||||
COMMAND ${THRIFT_COMPILER} --gen cpp -r ${PROJECT_SOURCE_DIR}/tutorial/tutorial.thrift
|
||||
)
|
||||
|
||||
add_executable(TutorialServer CppServer.cpp)
|
||||
target_link_libraries(TutorialServer tutorialgencpp)
|
||||
LINK_AGAINST_THRIFT_LIBRARY(TutorialServer thrift)
|
||||
target_link_libraries(TutorialServer ${ZLIB_LIBRARIES})
|
||||
|
||||
add_executable(TutorialClient CppClient.cpp)
|
||||
target_link_libraries(TutorialClient tutorialgencpp)
|
||||
LINK_AGAINST_THRIFT_LIBRARY(TutorialClient thrift)
|
||||
target_link_libraries(TutorialClient ${ZLIB_LIBRARIES})
|
80
vendor/git.apache.org/thrift.git/tutorial/cpp/CppClient.cpp
generated
vendored
Normal file
80
vendor/git.apache.org/thrift.git/tutorial/cpp/CppClient.cpp
generated
vendored
Normal file
|
@ -0,0 +1,80 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <thrift/protocol/TBinaryProtocol.h>
|
||||
#include <thrift/transport/TSocket.h>
|
||||
#include <thrift/transport/TTransportUtils.h>
|
||||
|
||||
#include "../gen-cpp/Calculator.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace apache::thrift;
|
||||
using namespace apache::thrift::protocol;
|
||||
using namespace apache::thrift::transport;
|
||||
|
||||
using namespace tutorial;
|
||||
using namespace shared;
|
||||
|
||||
int main() {
|
||||
boost::shared_ptr<TTransport> socket(new TSocket("localhost", 9090));
|
||||
boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));
|
||||
boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
|
||||
CalculatorClient client(protocol);
|
||||
|
||||
try {
|
||||
transport->open();
|
||||
|
||||
client.ping();
|
||||
cout << "ping()" << endl;
|
||||
|
||||
cout << "1 + 1 = " << client.add(1, 1) << endl;
|
||||
|
||||
Work work;
|
||||
work.op = Operation::DIVIDE;
|
||||
work.num1 = 1;
|
||||
work.num2 = 0;
|
||||
|
||||
try {
|
||||
client.calculate(1, work);
|
||||
cout << "Whoa? We can divide by zero!" << endl;
|
||||
} catch (InvalidOperation& io) {
|
||||
cout << "InvalidOperation: " << io.why << endl;
|
||||
// or using generated operator<<: cout << io << endl;
|
||||
// or by using std::exception native method what(): cout << io.what() << endl;
|
||||
}
|
||||
|
||||
work.op = Operation::SUBTRACT;
|
||||
work.num1 = 15;
|
||||
work.num2 = 10;
|
||||
int32_t diff = client.calculate(1, work);
|
||||
cout << "15 - 10 = " << diff << endl;
|
||||
|
||||
// Note that C++ uses return by reference for complex types to avoid
|
||||
// costly copy construction
|
||||
SharedStruct ss;
|
||||
client.getStruct(ss, 1);
|
||||
cout << "Received log: " << ss << endl;
|
||||
|
||||
transport->close();
|
||||
} catch (TException& tx) {
|
||||
cout << "ERROR: " << tx.what() << endl;
|
||||
}
|
||||
}
|
181
vendor/git.apache.org/thrift.git/tutorial/cpp/CppServer.cpp
generated
vendored
Normal file
181
vendor/git.apache.org/thrift.git/tutorial/cpp/CppServer.cpp
generated
vendored
Normal file
|
@ -0,0 +1,181 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
#include <thrift/concurrency/ThreadManager.h>
|
||||
#include <thrift/concurrency/PlatformThreadFactory.h>
|
||||
#include <thrift/protocol/TBinaryProtocol.h>
|
||||
#include <thrift/server/TSimpleServer.h>
|
||||
#include <thrift/server/TThreadPoolServer.h>
|
||||
#include <thrift/server/TThreadedServer.h>
|
||||
#include <thrift/transport/TServerSocket.h>
|
||||
#include <thrift/transport/TSocket.h>
|
||||
#include <thrift/transport/TTransportUtils.h>
|
||||
#include <thrift/TToString.h>
|
||||
|
||||
#include <boost/make_shared.hpp>
|
||||
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include <sstream>
|
||||
|
||||
#include "../gen-cpp/Calculator.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace apache::thrift;
|
||||
using namespace apache::thrift::concurrency;
|
||||
using namespace apache::thrift::protocol;
|
||||
using namespace apache::thrift::transport;
|
||||
using namespace apache::thrift::server;
|
||||
|
||||
using namespace tutorial;
|
||||
using namespace shared;
|
||||
|
||||
class CalculatorHandler : public CalculatorIf {
|
||||
public:
|
||||
CalculatorHandler() {}
|
||||
|
||||
void ping() { cout << "ping()" << endl; }
|
||||
|
||||
int32_t add(const int32_t n1, const int32_t n2) {
|
||||
cout << "add(" << n1 << ", " << n2 << ")" << endl;
|
||||
return n1 + n2;
|
||||
}
|
||||
|
||||
int32_t calculate(const int32_t logid, const Work& work) {
|
||||
cout << "calculate(" << logid << ", " << work << ")" << endl;
|
||||
int32_t val;
|
||||
|
||||
switch (work.op) {
|
||||
case Operation::ADD:
|
||||
val = work.num1 + work.num2;
|
||||
break;
|
||||
case Operation::SUBTRACT:
|
||||
val = work.num1 - work.num2;
|
||||
break;
|
||||
case Operation::MULTIPLY:
|
||||
val = work.num1 * work.num2;
|
||||
break;
|
||||
case Operation::DIVIDE:
|
||||
if (work.num2 == 0) {
|
||||
InvalidOperation io;
|
||||
io.whatOp = work.op;
|
||||
io.why = "Cannot divide by 0";
|
||||
throw io;
|
||||
}
|
||||
val = work.num1 / work.num2;
|
||||
break;
|
||||
default:
|
||||
InvalidOperation io;
|
||||
io.whatOp = work.op;
|
||||
io.why = "Invalid Operation";
|
||||
throw io;
|
||||
}
|
||||
|
||||
SharedStruct ss;
|
||||
ss.key = logid;
|
||||
ss.value = to_string(val);
|
||||
|
||||
log[logid] = ss;
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
void getStruct(SharedStruct& ret, const int32_t logid) {
|
||||
cout << "getStruct(" << logid << ")" << endl;
|
||||
ret = log[logid];
|
||||
}
|
||||
|
||||
void zip() { cout << "zip()" << endl; }
|
||||
|
||||
protected:
|
||||
map<int32_t, SharedStruct> log;
|
||||
};
|
||||
|
||||
/*
|
||||
CalculatorIfFactory is code generated.
|
||||
CalculatorCloneFactory is useful for getting access to the server side of the
|
||||
transport. It is also useful for making per-connection state. Without this
|
||||
CloneFactory, all connections will end up sharing the same handler instance.
|
||||
*/
|
||||
class CalculatorCloneFactory : virtual public CalculatorIfFactory {
|
||||
public:
|
||||
virtual ~CalculatorCloneFactory() {}
|
||||
virtual CalculatorIf* getHandler(const ::apache::thrift::TConnectionInfo& connInfo)
|
||||
{
|
||||
boost::shared_ptr<TSocket> sock = boost::dynamic_pointer_cast<TSocket>(connInfo.transport);
|
||||
cout << "Incoming connection\n";
|
||||
cout << "\tSocketInfo: " << sock->getSocketInfo() << "\n";
|
||||
cout << "\tPeerHost: " << sock->getPeerHost() << "\n";
|
||||
cout << "\tPeerAddress: " << sock->getPeerAddress() << "\n";
|
||||
cout << "\tPeerPort: " << sock->getPeerPort() << "\n";
|
||||
return new CalculatorHandler;
|
||||
}
|
||||
virtual void releaseHandler( ::shared::SharedServiceIf* handler) {
|
||||
delete handler;
|
||||
}
|
||||
};
|
||||
|
||||
int main() {
|
||||
TThreadedServer server(
|
||||
boost::make_shared<CalculatorProcessorFactory>(boost::make_shared<CalculatorCloneFactory>()),
|
||||
boost::make_shared<TServerSocket>(9090), //port
|
||||
boost::make_shared<TBufferedTransportFactory>(),
|
||||
boost::make_shared<TBinaryProtocolFactory>());
|
||||
|
||||
/*
|
||||
// if you don't need per-connection state, do the following instead
|
||||
TThreadedServer server(
|
||||
boost::make_shared<CalculatorProcessor>(boost::make_shared<CalculatorHandler>()),
|
||||
boost::make_shared<TServerSocket>(9090), //port
|
||||
boost::make_shared<TBufferedTransportFactory>(),
|
||||
boost::make_shared<TBinaryProtocolFactory>());
|
||||
*/
|
||||
|
||||
/**
|
||||
* Here are some alternate server types...
|
||||
|
||||
// This server only allows one connection at a time, but spawns no threads
|
||||
TSimpleServer server(
|
||||
boost::make_shared<CalculatorProcessor>(boost::make_shared<CalculatorHandler>()),
|
||||
boost::make_shared<TServerSocket>(9090),
|
||||
boost::make_shared<TBufferedTransportFactory>(),
|
||||
boost::make_shared<TBinaryProtocolFactory>());
|
||||
|
||||
const int workerCount = 4;
|
||||
|
||||
boost::shared_ptr<ThreadManager> threadManager =
|
||||
ThreadManager::newSimpleThreadManager(workerCount);
|
||||
threadManager->threadFactory(
|
||||
boost::make_shared<PlatformThreadFactory>());
|
||||
threadManager->start();
|
||||
|
||||
// This server allows "workerCount" connection at a time, and reuses threads
|
||||
TThreadPoolServer server(
|
||||
boost::make_shared<CalculatorProcessorFactory>(boost::make_shared<CalculatorCloneFactory>()),
|
||||
boost::make_shared<TServerSocket>(9090),
|
||||
boost::make_shared<TBufferedTransportFactory>(),
|
||||
boost::make_shared<TBinaryProtocolFactory>(),
|
||||
threadManager);
|
||||
*/
|
||||
|
||||
cout << "Starting the server..." << endl;
|
||||
server.serve();
|
||||
cout << "Done." << endl;
|
||||
return 0;
|
||||
}
|
88
vendor/git.apache.org/thrift.git/tutorial/cpp/Makefile.am
generated
vendored
Executable file
88
vendor/git.apache.org/thrift.git/tutorial/cpp/Makefile.am
generated
vendored
Executable file
|
@ -0,0 +1,88 @@
|
|||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
AUTOMAKE_OPTIONS = subdir-objects serial-tests
|
||||
|
||||
BUILT_SOURCES = gen-cpp/shared_types.cpp \
|
||||
gen-cpp/tutorial_types.cpp
|
||||
|
||||
noinst_LTLIBRARIES = libtutorialgencpp.la
|
||||
nodist_libtutorialgencpp_la_SOURCES = \
|
||||
gen-cpp/Calculator.cpp \
|
||||
gen-cpp/Calculator.h \
|
||||
gen-cpp/SharedService.cpp \
|
||||
gen-cpp/SharedService.h \
|
||||
gen-cpp/shared_constants.cpp \
|
||||
gen-cpp/shared_constants.h \
|
||||
gen-cpp/shared_types.cpp \
|
||||
gen-cpp/shared_types.h \
|
||||
gen-cpp/tutorial_constants.cpp \
|
||||
gen-cpp/tutorial_constants.h \
|
||||
gen-cpp/tutorial_types.cpp \
|
||||
gen-cpp/tutorial_types.h
|
||||
|
||||
|
||||
|
||||
libtutorialgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
|
||||
|
||||
noinst_PROGRAMS = \
|
||||
TutorialServer \
|
||||
TutorialClient
|
||||
|
||||
TutorialServer_SOURCES = \
|
||||
CppServer.cpp
|
||||
|
||||
TutorialServer_LDADD = \
|
||||
libtutorialgencpp.la \
|
||||
$(top_builddir)/lib/cpp/libthrift.la
|
||||
|
||||
TutorialClient_SOURCES = \
|
||||
CppClient.cpp
|
||||
|
||||
TutorialClient_LDADD = \
|
||||
libtutorialgencpp.la \
|
||||
$(top_builddir)/lib/cpp/libthrift.la
|
||||
|
||||
#
|
||||
# Common thrift code generation rules
|
||||
#
|
||||
THRIFT = $(top_builddir)/compiler/cpp/thrift
|
||||
|
||||
gen-cpp/Calculator.cpp gen-cpp/SharedService.cpp gen-cpp/shared_constants.cpp gen-cpp/shared_types.cpp gen-cpp/tutorial_constants.cpp gen-cpp/tutorial_types.cpp: $(top_srcdir)/tutorial/tutorial.thrift
|
||||
$(THRIFT) --gen cpp -r $<
|
||||
|
||||
AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
|
||||
AM_CXXFLAGS = -Wall -Wextra -pedantic
|
||||
AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
|
||||
|
||||
clean-local:
|
||||
$(RM) gen-cpp/*
|
||||
|
||||
tutorialserver: all
|
||||
./TutorialServer
|
||||
|
||||
tutorialclient: all
|
||||
./TutorialClient
|
||||
|
||||
style-local:
|
||||
$(CPPSTYLE_CMD)
|
||||
|
||||
EXTRA_DIST = \
|
||||
CMakeLists.txt \
|
||||
CppClient.cpp \
|
||||
CppServer.cpp
|
Loading…
Add table
Add a link
Reference in a new issue