database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

remove commited old thrift, replace with static lib build from exterrnal project

Browse Source
This commit is contained in:
Leonid Fedorov
2022-12-15 16:18:03 +00:00
parent f6318f515a
commit 3b68353429
101 changed files with 58 additions and 19282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/querytele/CMakeLists.txt
View File

@ -13,7 +13,9 @@ set(querytele_LIB_SRCS
queryteleprotoimpl.cpp)
add_library(querytele SHARED ${querytele_LIB_SRCS})
add_dependencies(querytele external_boost)
add_dependencies(querytele external_boost external_thrift)
target_include_directories(querytele PRIVATE ${THRIFT_INCLUDE_DIRS})
target_link_libraries(querytele ${THRIFT_LIBRARY})
install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

6
utils/querytele/QueryTeleService.cpp
View File

@ -844,12 +844,12 @@ void QueryTeleServiceProcessor::process_postImport(int32_t seqid,
}
}
::boost::shared_ptr< ::apache::thrift::TProcessor> QueryTeleServiceProcessorFactory::getProcessor(
::std::shared_ptr< ::apache::thrift::TProcessor> QueryTeleServiceProcessorFactory::getProcessor(
const ::apache::thrift::TConnectionInfo& connInfo)
{
::apache::thrift::ReleaseHandler<QueryTeleServiceIfFactory> cleanup(handlerFactory_);
::boost::shared_ptr<QueryTeleServiceIf> handler(handlerFactory_->getHandler(connInfo), cleanup);
::boost::shared_ptr< ::apache::thrift::TProcessor> processor(new QueryTeleServiceProcessor(handler));
::std::shared_ptr<QueryTeleServiceIf> handler(handlerFactory_->getHandler(connInfo), cleanup);
::std::shared_ptr< ::apache::thrift::TProcessor> processor(new QueryTeleServiceProcessor(handler));
return processor;
}
} // namespace querytele

35
utils/querytele/QueryTeleService.h
View File

@ -9,6 +9,7 @@
#include <thrift/TDispatchProcessor.h>
#include "querytele_types.h"
namespace querytele
{
class QueryTeleServiceIf
@ -38,7 +39,7 @@ class QueryTeleServiceIfFactory
class QueryTeleServiceIfSingletonFactory : virtual public QueryTeleServiceIfFactory
{
public:
QueryTeleServiceIfSingletonFactory(const boost::shared_ptr<QueryTeleServiceIf>& iface) : iface_(iface)
QueryTeleServiceIfSingletonFactory(const std::shared_ptr<QueryTeleServiceIf>& iface) : iface_(iface)
{
}
virtual ~QueryTeleServiceIfSingletonFactory()
@ -54,7 +55,7 @@ class QueryTeleServiceIfSingletonFactory : virtual public QueryTeleServiceIfFact
}
protected:
boost::shared_ptr<QueryTeleServiceIf> iface_;
std::shared_ptr<QueryTeleServiceIf> iface_;
};
class QueryTeleServiceNull : virtual public QueryTeleServiceIf
@ -362,24 +363,24 @@ class QueryTeleService_postImport_presult
class QueryTeleServiceClient : virtual public QueryTeleServiceIf
{
public:
QueryTeleServiceClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot)
QueryTeleServiceClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot)
: piprot_(prot), poprot_(prot)
{
iprot_ = prot.get();
oprot_ = prot.get();
}
QueryTeleServiceClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot,
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot)
QueryTeleServiceClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot,
std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot)
: piprot_(iprot), poprot_(oprot)
{
iprot_ = iprot.get();
oprot_ = oprot.get();
}
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol()
std::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol()
{
return piprot_;
}
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol()
std::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol()
{
return poprot_;
}
@ -394,8 +395,8 @@ class QueryTeleServiceClient : virtual public QueryTeleServiceIf
void recv_postImport();
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
std::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
std::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
::apache::thrift::protocol::TProtocol* iprot_;
::apache::thrift::protocol::TProtocol* oprot_;
};
@ -403,7 +404,7 @@ class QueryTeleServiceClient : virtual public QueryTeleServiceIf
class QueryTeleServiceProcessor : public ::apache::thrift::TDispatchProcessor
{
protected:
boost::shared_ptr<QueryTeleServiceIf> iface_;
std::shared_ptr<QueryTeleServiceIf> iface_;
virtual bool dispatchCall(::apache::thrift::protocol::TProtocol* iprot,
::apache::thrift::protocol::TProtocol* oprot, const std::string& fname,
int32_t seqid, void* callContext);
@ -421,7 +422,7 @@ class QueryTeleServiceProcessor : public ::apache::thrift::TDispatchProcessor
::apache::thrift::protocol::TProtocol* oprot, void* callContext);
public:
QueryTeleServiceProcessor(boost::shared_ptr<QueryTeleServiceIf> iface) : iface_(iface)
QueryTeleServiceProcessor(std::shared_ptr<QueryTeleServiceIf> iface) : iface_(iface)
{
processMap_["postQuery"] = &QueryTeleServiceProcessor::process_postQuery;
processMap_["postStep"] = &QueryTeleServiceProcessor::process_postStep;
@ -436,22 +437,22 @@ class QueryTeleServiceProcessor : public ::apache::thrift::TDispatchProcessor
class QueryTeleServiceProcessorFactory : public ::apache::thrift::TProcessorFactory
{
public:
QueryTeleServiceProcessorFactory(const ::boost::shared_ptr<QueryTeleServiceIfFactory>& handlerFactory)
QueryTeleServiceProcessorFactory(const ::std::shared_ptr<QueryTeleServiceIfFactory>& handlerFactory)
: handlerFactory_(handlerFactory)
{
}
::boost::shared_ptr< ::apache::thrift::TProcessor> getProcessor(
::std::shared_ptr< ::apache::thrift::TProcessor> getProcessor(
const ::apache::thrift::TConnectionInfo& connInfo);
protected:
::boost::shared_ptr<QueryTeleServiceIfFactory> handlerFactory_;
::std::shared_ptr<QueryTeleServiceIfFactory> handlerFactory_;
};
class QueryTeleServiceMultiface : virtual public QueryTeleServiceIf
{
public:
QueryTeleServiceMultiface(std::vector<boost::shared_ptr<QueryTeleServiceIf> >& ifaces) : ifaces_(ifaces)
QueryTeleServiceMultiface(std::vector<std::shared_ptr<QueryTeleServiceIf> >& ifaces) : ifaces_(ifaces)
{
}
virtual ~QueryTeleServiceMultiface()
@ -459,11 +460,11 @@ class QueryTeleServiceMultiface : virtual public QueryTeleServiceIf
}
protected:
std::vector<boost::shared_ptr<QueryTeleServiceIf> > ifaces_;
std::vector<std::shared_ptr<QueryTeleServiceIf> > ifaces_;
QueryTeleServiceMultiface()
{
}
void add(boost::shared_ptr<QueryTeleServiceIf> iface)
void add(std::shared_ptr<QueryTeleServiceIf> iface)
{
ifaces_.push_back(iface);
}

1
utils/querytele/querytele_types.h
View File

@ -11,7 +11,6 @@
#include <thrift/protocol/TProtocol.h>
#include <thrift/transport/TTransport.h>
#include <thrift/cxxfunctional.h>
namespace querytele
{

7
utils/querytele/queryteleprotoimpl.cpp
View File

@ -22,7 +22,6 @@ using namespace std;
#define BOOST_DISABLE_ASSERTS
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include "thrift/transport/TSocket.h"
#include "thrift/transport/TBufferTransports.h"
@ -59,9 +58,9 @@ TsTeleQueue<querytele::ImportTele> itQueue;
volatile bool isInited = false;
boost::mutex initMux;
boost::shared_ptr<att::TSocket> fSocket;
boost::shared_ptr<att::TBufferedTransport> fTransport;
boost::shared_ptr<atp::TBinaryProtocol> fProtocol;
std::shared_ptr<att::TSocket> fSocket;
std::shared_ptr<att::TBufferedTransport> fTransport;
std::shared_ptr<atp::TBinaryProtocol> fProtocol;
querytele::StepTele gLastStep;