Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
21e51ff6
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
21e51ff6
编写于
4月 16, 2019
作者:
G
groot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine code
Former-commit-id: aca348ba7691ed82df6f8fcae687b7015e6cf401
上级
062e370b
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
347 addition
and
449 deletion
+347
-449
cpp/src/server/Server.cpp
cpp/src/server/Server.cpp
+3
-3
cpp/src/server/VecServiceHandler.cpp
cpp/src/server/VecServiceHandler.cpp
+119
-0
cpp/src/server/VecServiceHandler.h
cpp/src/server/VecServiceHandler.h
+70
-0
cpp/src/server/VecServiceWrapper.cpp
cpp/src/server/VecServiceWrapper.cpp
+121
-0
cpp/src/server/VecServiceWrapper.h
cpp/src/server/VecServiceWrapper.h
+1
-1
cpp/src/thrift/VectorService.thrift
cpp/src/thrift/VectorService.thrift
+0
-1
cpp/src/thrift/gen-cpp/VecService.cpp
cpp/src/thrift/gen-cpp/VecService.cpp
+0
-317
cpp/src/thrift/gen-cpp/VecService.h
cpp/src/thrift/gen-cpp/VecService.h
+0
-95
cpp/src/thrift/gen-cpp/VecService_server.skeleton.cpp
cpp/src/thrift/gen-cpp/VecService_server.skeleton.cpp
+1
-6
cpp/test_client/src/ClientApp.cpp
cpp/test_client/src/ClientApp.cpp
+32
-26
未找到文件。
cpp/src/server/Server.cpp
浏览文件 @
21e51ff6
...
...
@@ -5,7 +5,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "Server.h"
#include "ServerConfig.h"
#include "ServiceWrapper.h"
#include "
Vec
ServiceWrapper.h"
#include "utils/Log.h"
#include "utils/SignalUtil.h"
#include "utils/TimeRecorder.h"
...
...
@@ -215,12 +215,12 @@ Server::LoadConfig() {
void
Server
::
StartService
()
{
ServiceWrapper
::
StartService
();
Vec
ServiceWrapper
::
StartService
();
}
void
Server
::
StopService
()
{
ServiceWrapper
::
StopService
();
Vec
ServiceWrapper
::
StopService
();
}
}
...
...
cpp/src/server/VecServiceHandler.cpp
0 → 100644
浏览文件 @
21e51ff6
//
// Created by yhmo on 19-4-16.
//
#include "VecServiceHandler.h"
#include "utils/Log.h"
namespace
zilliz
{
namespace
vecwise
{
namespace
server
{
VecServiceHandler
::
VecServiceHandler
()
{
}
void
VecServiceHandler
::
add_group
(
const
VecGroup
&
group
)
{
SERVER_LOG_INFO
<<
"add_group() called"
;
SERVER_LOG_TRACE
<<
"group.id = "
<<
group
.
id
<<
", group.dimension = "
<<
group
.
dimension
<<
", group.index_type = "
<<
group
.
index_type
;
try
{
}
catch
(
std
::
exception
&
ex
)
{
SERVER_LOG_ERROR
<<
ex
.
what
();
}
}
void
VecServiceHandler
::
get_group
(
VecGroup
&
_return
,
const
std
::
string
&
group_id
)
{
SERVER_LOG_INFO
<<
"get_group() called"
;
SERVER_LOG_TRACE
<<
"group_id = "
<<
group_id
;
try
{
}
catch
(
std
::
exception
&
ex
)
{
SERVER_LOG_ERROR
<<
ex
.
what
();
}
}
void
VecServiceHandler
::
del_group
(
const
std
::
string
&
group_id
)
{
SERVER_LOG_INFO
<<
"del_group() called"
;
SERVER_LOG_TRACE
<<
"group_id = "
<<
group_id
;
try
{
}
catch
(
std
::
exception
&
ex
)
{
SERVER_LOG_ERROR
<<
ex
.
what
();
}
}
int64_t
VecServiceHandler
::
add_vector
(
const
std
::
string
&
group_id
,
const
VecTensor
&
tensor
)
{
SERVER_LOG_INFO
<<
"add_vector() called"
;
SERVER_LOG_TRACE
<<
"group_id = "
<<
group_id
<<
", vector size = "
<<
tensor
.
tensor
.
size
();
try
{
}
catch
(
std
::
exception
&
ex
)
{
SERVER_LOG_ERROR
<<
ex
.
what
();
}
}
void
VecServiceHandler
::
add_vector_batch
(
VecTensorIdList
&
_return
,
const
std
::
string
&
group_id
,
const
VecTensorList
&
tensor_list
)
{
SERVER_LOG_INFO
<<
"add_vector_batch() called"
;
SERVER_LOG_TRACE
<<
"group_id = "
<<
group_id
<<
", vector list size = "
<<
tensor_list
.
tensor_list
.
size
();
try
{
}
catch
(
std
::
exception
&
ex
)
{
SERVER_LOG_ERROR
<<
ex
.
what
();
}
}
void
VecServiceHandler
::
search_vector
(
VecSearchResult
&
_return
,
const
std
::
string
&
group_id
,
const
int64_t
top_k
,
const
VecTensor
&
tensor
,
const
VecTimeRangeList
&
time_range_list
)
{
SERVER_LOG_INFO
<<
"search_vector() called"
;
SERVER_LOG_TRACE
<<
"group_id = "
<<
group_id
<<
", top_k = "
<<
top_k
<<
", vector size = "
<<
tensor
.
tensor
.
size
()
<<
", time range list size = "
<<
time_range_list
.
range_list
.
size
();
try
{
}
catch
(
std
::
exception
&
ex
)
{
SERVER_LOG_ERROR
<<
ex
.
what
();
}
}
void
VecServiceHandler
::
search_vector_batch
(
VecSearchResultList
&
_return
,
const
std
::
string
&
group_id
,
const
int64_t
top_k
,
const
VecTensorList
&
tensor_list
,
const
VecTimeRangeList
&
time_range_list
)
{
SERVER_LOG_INFO
<<
"search_vector_batch() called"
;
SERVER_LOG_TRACE
<<
"group_id = "
<<
group_id
<<
", top_k = "
<<
top_k
<<
", vector list size = "
<<
tensor_list
.
tensor_list
.
size
()
<<
", time range list size = "
<<
time_range_list
.
range_list
.
size
();
try
{
}
catch
(
std
::
exception
&
ex
)
{
SERVER_LOG_ERROR
<<
ex
.
what
();
}
}
}
}
}
\ No newline at end of file
cpp/src/server/VecServiceHandler.h
0 → 100644
浏览文件 @
21e51ff6
/*******************************************************************************
* Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
* Unauthorized copying of this file, via any medium is strictly prohibited.
* Proprietary and confidential.
******************************************************************************/
#pragma once
#include "utils/Error.h"
#include "thrift/gen-cpp/VecService.h"
#include <cstdint>
#include <string>
namespace
zilliz
{
namespace
vecwise
{
namespace
server
{
class
VecServiceHandler
:
virtual
public
VecServiceIf
{
public:
VecServiceHandler
();
/**
* group interfaces
*
* @param group
*/
void
add_group
(
const
VecGroup
&
group
);
void
get_group
(
VecGroup
&
_return
,
const
std
::
string
&
group_id
);
void
del_group
(
const
std
::
string
&
group_id
);
/**
* vector interfaces
*
*
* @param group_id
* @param tensor
*/
int64_t
add_vector
(
const
std
::
string
&
group_id
,
const
VecTensor
&
tensor
);
void
add_vector_batch
(
VecTensorIdList
&
_return
,
const
std
::
string
&
group_id
,
const
VecTensorList
&
tensor_list
);
/**
* search interfaces
* if time_range_list is empty, engine will search without time limit
*
* @param group_id
* @param top_k
* @param tensor
* @param time_range_list
*/
void
search_vector
(
VecSearchResult
&
_return
,
const
std
::
string
&
group_id
,
const
int64_t
top_k
,
const
VecTensor
&
tensor
,
const
VecTimeRangeList
&
time_range_list
);
void
search_vector_batch
(
VecSearchResultList
&
_return
,
const
std
::
string
&
group_id
,
const
int64_t
top_k
,
const
VecTensorList
&
tensor_list
,
const
VecTimeRangeList
&
time_range_list
);
};
}
}
}
cpp/src/server/ServiceWrapper.cpp
→
cpp/src/server/
Vec
ServiceWrapper.cpp
浏览文件 @
21e51ff6
...
...
@@ -3,12 +3,12 @@
* Unauthorized copying of this file, via any medium is strictly prohibited.
* Proprietary and confidential.
******************************************************************************/
#include "ServiceWrapper.h"
#include "VecServiceWrapper.h"
#include "VecServiceHandler.h"
#include "ServerConfig.h"
#include "utils/Log.h"
#include "thrift/gen-cpp/VecService.h"
#include "thrift/gen-cpp/VectorService_types.h"
#include "thrift/gen-cpp/VectorService_constants.h"
...
...
@@ -35,78 +35,9 @@ using namespace ::apache::thrift::transport;
using
namespace
::
apache
::
thrift
::
server
;
using
namespace
::
apache
::
thrift
::
concurrency
;
class
VecServiceHandler
:
virtual
public
VecServiceIf
{
public:
VecServiceHandler
()
{
// Your initialization goes here
}
void
dummy
()
{
// Your implementation goes here
SERVER_LOG_INFO
<<
"dummy() called"
;
}
/**
* group interfaces
*
* @param group
*/
void
add_group
(
const
VecGroup
&
group
)
{
// Your implementation goes here
SERVER_LOG_INFO
<<
"add_group() called"
;
}
void
get_group
(
VecGroup
&
_return
,
const
std
::
string
&
group_id
)
{
// Your implementation goes here
SERVER_LOG_INFO
<<
"get_group() called"
;
}
void
del_group
(
const
std
::
string
&
group_id
)
{
// Your implementation goes here
SERVER_LOG_INFO
<<
"del_group() called"
;
}
/**
* vector interfaces
*
*
* @param group_id
* @param tensor
*/
int64_t
add_vector
(
const
std
::
string
&
group_id
,
const
VecTensor
&
tensor
)
{
// Your implementation goes here
SERVER_LOG_INFO
<<
"add_vector() called"
;
}
void
add_vector_batch
(
VecTensorIdList
&
_return
,
const
std
::
string
&
group_id
,
const
VecTensorList
&
tensor_list
)
{
// Your implementation goes here
SERVER_LOG_INFO
<<
"add_vector_batch() called"
;
}
/**
* search interfaces
* if time_range_list is empty, engine will search without time limit
*
* @param group_id
* @param top_k
* @param tensor
* @param time_range_list
*/
void
search_vector
(
VecSearchResult
&
_return
,
const
std
::
string
&
group_id
,
const
int64_t
top_k
,
const
VecTensor
&
tensor
,
const
VecTimeRangeList
&
time_range_list
)
{
// Your implementation goes here
SERVER_LOG_INFO
<<
"search_vector() called"
;
}
static
stdcxx
::
shared_ptr
<
TServer
>
s_server
;
void
search_vector_batch
(
VecSearchResultList
&
_return
,
const
std
::
string
&
group_id
,
const
int64_t
top_k
,
const
VecTensorList
&
tensor_list
,
const
VecTimeRangeList
&
time_range_list
)
{
// Your implementation goes here
SERVER_LOG_INFO
<<
"search_vector_batch() called"
;
}
};
static
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TServer
>
s_server
;
void
ServiceWrapper
::
StartService
()
{
void
VecServiceWrapper
::
StartService
()
{
if
(
s_server
!=
nullptr
){
StopService
();
}
...
...
@@ -119,26 +50,27 @@ void ServiceWrapper::StartService() {
std
::
string
protocol
=
server_config
.
GetValue
(
CONFIG_SERVER_PROTOCOL
,
"binary"
);
std
::
string
mode
=
server_config
.
GetValue
(
CONFIG_SERVER_MODE
,
"thread_pool"
);
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
VecServiceHandler
>
handler
(
new
VecServiceHandler
());
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TProcessor
>
processor
(
new
VecServiceProcessor
(
handler
));
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TServerTransport
>
server_transport
(
new
TServerSocket
(
address
,
port
));
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TTransportFactory
>
transport_factory
(
new
TBufferedTransportFactory
());
try
{
stdcxx
::
shared_ptr
<
VecServiceHandler
>
handler
(
new
VecServiceHandler
());
stdcxx
::
shared_ptr
<
TProcessor
>
processor
(
new
VecServiceProcessor
(
handler
));
stdcxx
::
shared_ptr
<
TServerTransport
>
server_transport
(
new
TServerSocket
(
address
,
port
));
stdcxx
::
shared_ptr
<
TTransportFactory
>
transport_factory
(
new
TBufferedTransportFactory
());
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TProtocolFactory
>
protocol_factory
;
if
(
protocol
==
"binary"
)
{
stdcxx
::
shared_ptr
<
TProtocolFactory
>
protocol_factory
;
if
(
protocol
==
"binary"
)
{
protocol_factory
.
reset
(
new
TBinaryProtocolFactory
());
}
else
if
(
protocol
==
"json"
)
{
}
else
if
(
protocol
==
"json"
)
{
protocol_factory
.
reset
(
new
TJSONProtocolFactory
());
}
else
if
(
protocol
==
"compact"
)
{
}
else
if
(
protocol
==
"compact"
)
{
protocol_factory
.
reset
(
new
TCompactProtocolFactory
());
}
else
if
(
protocol
==
"debug"
)
{
}
else
if
(
protocol
==
"debug"
)
{
protocol_factory
.
reset
(
new
TDebugProtocolFactory
());
}
else
{
SERVER_LOG_INFO
<<
"Service protocol: "
<<
protocol
<<
" is not supported currently"
;
return
;
}
if
(
mode
==
"simple"
)
{
if
(
mode
==
"simple"
)
{
s_server
.
reset
(
new
TSimpleServer
(
processor
,
server_transport
,
transport_factory
,
protocol_factory
));
s_server
->
serve
();
// } else if(mode == "non_blocking") {
...
...
@@ -152,9 +84,9 @@ void ServiceWrapper::StartService() {
// protocol_factory,
// nb_server_transport,
// threadManager));
}
else
if
(
mode
==
"thread_pool"
)
{
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
ThreadManager
>
threadManager
(
ThreadManager
::
newSimpleThreadManager
());
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
PosixThreadFactory
>
threadFactory
(
new
PosixThreadFactory
());
}
else
if
(
mode
==
"thread_pool"
)
{
stdcxx
::
shared_ptr
<
ThreadManager
>
threadManager
(
ThreadManager
::
newSimpleThreadManager
());
stdcxx
::
shared_ptr
<
PosixThreadFactory
>
threadFactory
(
new
PosixThreadFactory
());
threadManager
->
threadFactory
(
threadFactory
);
threadManager
->
start
();
...
...
@@ -168,9 +100,12 @@ void ServiceWrapper::StartService() {
SERVER_LOG_INFO
<<
"Service mode: "
<<
mode
<<
" is not supported currently"
;
return
;
}
}
catch
(
apache
::
thrift
::
TException
&
ex
)
{
SERVER_LOG_ERROR
<<
"Server encounter exception: "
<<
ex
.
what
();
}
}
void
ServiceWrapper
::
StopService
()
{
void
Vec
ServiceWrapper
::
StopService
()
{
auto
stop_server_worker
=
[
&
]{
if
(
s_server
!=
nullptr
)
{
s_server
->
stop
();
...
...
cpp/src/server/ServiceWrapper.h
→
cpp/src/server/
Vec
ServiceWrapper.h
浏览文件 @
21e51ff6
...
...
@@ -14,7 +14,7 @@ namespace zilliz {
namespace
vecwise
{
namespace
server
{
class
ServiceWrapper
{
class
Vec
ServiceWrapper
{
public:
static
void
StartService
();
static
void
StopService
();
...
...
cpp/src/thrift/VectorService.thrift
浏览文件 @
21e51ff6
...
...
@@ -66,7 +66,6 @@ struct VecTimeRangeList {
}
service VecService {
void dummy();
/**
* group interfaces
*/
...
...
cpp/src/thrift/gen-cpp/VecService.cpp
浏览文件 @
21e51ff6
...
...
@@ -9,141 +9,6 @@
VecService_dummy_args
::~
VecService_dummy_args
()
throw
()
{
}
uint32_t
VecService_dummy_args
::
read
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
)
{
::
apache
::
thrift
::
protocol
::
TInputRecursionTracker
tracker
(
*
iprot
);
uint32_t
xfer
=
0
;
std
::
string
fname
;
::
apache
::
thrift
::
protocol
::
TType
ftype
;
int16_t
fid
;
xfer
+=
iprot
->
readStructBegin
(
fname
);
using
::
apache
::
thrift
::
protocol
::
TProtocolException
;
while
(
true
)
{
xfer
+=
iprot
->
readFieldBegin
(
fname
,
ftype
,
fid
);
if
(
ftype
==
::
apache
::
thrift
::
protocol
::
T_STOP
)
{
break
;
}
xfer
+=
iprot
->
skip
(
ftype
);
xfer
+=
iprot
->
readFieldEnd
();
}
xfer
+=
iprot
->
readStructEnd
();
return
xfer
;
}
uint32_t
VecService_dummy_args
::
write
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
)
const
{
uint32_t
xfer
=
0
;
::
apache
::
thrift
::
protocol
::
TOutputRecursionTracker
tracker
(
*
oprot
);
xfer
+=
oprot
->
writeStructBegin
(
"VecService_dummy_args"
);
xfer
+=
oprot
->
writeFieldStop
();
xfer
+=
oprot
->
writeStructEnd
();
return
xfer
;
}
VecService_dummy_pargs
::~
VecService_dummy_pargs
()
throw
()
{
}
uint32_t
VecService_dummy_pargs
::
write
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
)
const
{
uint32_t
xfer
=
0
;
::
apache
::
thrift
::
protocol
::
TOutputRecursionTracker
tracker
(
*
oprot
);
xfer
+=
oprot
->
writeStructBegin
(
"VecService_dummy_pargs"
);
xfer
+=
oprot
->
writeFieldStop
();
xfer
+=
oprot
->
writeStructEnd
();
return
xfer
;
}
VecService_dummy_result
::~
VecService_dummy_result
()
throw
()
{
}
uint32_t
VecService_dummy_result
::
read
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
)
{
::
apache
::
thrift
::
protocol
::
TInputRecursionTracker
tracker
(
*
iprot
);
uint32_t
xfer
=
0
;
std
::
string
fname
;
::
apache
::
thrift
::
protocol
::
TType
ftype
;
int16_t
fid
;
xfer
+=
iprot
->
readStructBegin
(
fname
);
using
::
apache
::
thrift
::
protocol
::
TProtocolException
;
while
(
true
)
{
xfer
+=
iprot
->
readFieldBegin
(
fname
,
ftype
,
fid
);
if
(
ftype
==
::
apache
::
thrift
::
protocol
::
T_STOP
)
{
break
;
}
xfer
+=
iprot
->
skip
(
ftype
);
xfer
+=
iprot
->
readFieldEnd
();
}
xfer
+=
iprot
->
readStructEnd
();
return
xfer
;
}
uint32_t
VecService_dummy_result
::
write
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
)
const
{
uint32_t
xfer
=
0
;
xfer
+=
oprot
->
writeStructBegin
(
"VecService_dummy_result"
);
xfer
+=
oprot
->
writeFieldStop
();
xfer
+=
oprot
->
writeStructEnd
();
return
xfer
;
}
VecService_dummy_presult
::~
VecService_dummy_presult
()
throw
()
{
}
uint32_t
VecService_dummy_presult
::
read
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
)
{
::
apache
::
thrift
::
protocol
::
TInputRecursionTracker
tracker
(
*
iprot
);
uint32_t
xfer
=
0
;
std
::
string
fname
;
::
apache
::
thrift
::
protocol
::
TType
ftype
;
int16_t
fid
;
xfer
+=
iprot
->
readStructBegin
(
fname
);
using
::
apache
::
thrift
::
protocol
::
TProtocolException
;
while
(
true
)
{
xfer
+=
iprot
->
readFieldBegin
(
fname
,
ftype
,
fid
);
if
(
ftype
==
::
apache
::
thrift
::
protocol
::
T_STOP
)
{
break
;
}
xfer
+=
iprot
->
skip
(
ftype
);
xfer
+=
iprot
->
readFieldEnd
();
}
xfer
+=
iprot
->
readStructEnd
();
return
xfer
;
}
VecService_add_group_args
::~
VecService_add_group_args
()
throw
()
{
}
...
...
@@ -1680,58 +1545,6 @@ uint32_t VecService_search_vector_batch_presult::read(::apache::thrift::protocol
return
xfer
;
}
void
VecServiceClient
::
dummy
()
{
send_dummy
();
recv_dummy
();
}
void
VecServiceClient
::
send_dummy
()
{
int32_t
cseqid
=
0
;
oprot_
->
writeMessageBegin
(
"dummy"
,
::
apache
::
thrift
::
protocol
::
T_CALL
,
cseqid
);
VecService_dummy_pargs
args
;
args
.
write
(
oprot_
);
oprot_
->
writeMessageEnd
();
oprot_
->
getTransport
()
->
writeEnd
();
oprot_
->
getTransport
()
->
flush
();
}
void
VecServiceClient
::
recv_dummy
()
{
int32_t
rseqid
=
0
;
std
::
string
fname
;
::
apache
::
thrift
::
protocol
::
TMessageType
mtype
;
iprot_
->
readMessageBegin
(
fname
,
mtype
,
rseqid
);
if
(
mtype
==
::
apache
::
thrift
::
protocol
::
T_EXCEPTION
)
{
::
apache
::
thrift
::
TApplicationException
x
;
x
.
read
(
iprot_
);
iprot_
->
readMessageEnd
();
iprot_
->
getTransport
()
->
readEnd
();
throw
x
;
}
if
(
mtype
!=
::
apache
::
thrift
::
protocol
::
T_REPLY
)
{
iprot_
->
skip
(
::
apache
::
thrift
::
protocol
::
T_STRUCT
);
iprot_
->
readMessageEnd
();
iprot_
->
getTransport
()
->
readEnd
();
}
if
(
fname
.
compare
(
"dummy"
)
!=
0
)
{
iprot_
->
skip
(
::
apache
::
thrift
::
protocol
::
T_STRUCT
);
iprot_
->
readMessageEnd
();
iprot_
->
getTransport
()
->
readEnd
();
}
VecService_dummy_presult
result
;
result
.
read
(
iprot_
);
iprot_
->
readMessageEnd
();
iprot_
->
getTransport
()
->
readEnd
();
return
;
}
void
VecServiceClient
::
add_group
(
const
VecGroup
&
group
)
{
send_add_group
(
group
);
...
...
@@ -2176,59 +1989,6 @@ bool VecServiceProcessor::dispatchCall(::apache::thrift::protocol::TProtocol* ip
return
true
;
}
void
VecServiceProcessor
::
process_dummy
(
int32_t
seqid
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
,
void
*
callContext
)
{
void
*
ctx
=
NULL
;
if
(
this
->
eventHandler_
.
get
()
!=
NULL
)
{
ctx
=
this
->
eventHandler_
->
getContext
(
"VecService.dummy"
,
callContext
);
}
::
apache
::
thrift
::
TProcessorContextFreer
freer
(
this
->
eventHandler_
.
get
(),
ctx
,
"VecService.dummy"
);
if
(
this
->
eventHandler_
.
get
()
!=
NULL
)
{
this
->
eventHandler_
->
preRead
(
ctx
,
"VecService.dummy"
);
}
VecService_dummy_args
args
;
args
.
read
(
iprot
);
iprot
->
readMessageEnd
();
uint32_t
bytes
=
iprot
->
getTransport
()
->
readEnd
();
if
(
this
->
eventHandler_
.
get
()
!=
NULL
)
{
this
->
eventHandler_
->
postRead
(
ctx
,
"VecService.dummy"
,
bytes
);
}
VecService_dummy_result
result
;
try
{
iface_
->
dummy
();
}
catch
(
const
std
::
exception
&
e
)
{
if
(
this
->
eventHandler_
.
get
()
!=
NULL
)
{
this
->
eventHandler_
->
handlerError
(
ctx
,
"VecService.dummy"
);
}
::
apache
::
thrift
::
TApplicationException
x
(
e
.
what
());
oprot
->
writeMessageBegin
(
"dummy"
,
::
apache
::
thrift
::
protocol
::
T_EXCEPTION
,
seqid
);
x
.
write
(
oprot
);
oprot
->
writeMessageEnd
();
oprot
->
getTransport
()
->
writeEnd
();
oprot
->
getTransport
()
->
flush
();
return
;
}
if
(
this
->
eventHandler_
.
get
()
!=
NULL
)
{
this
->
eventHandler_
->
preWrite
(
ctx
,
"VecService.dummy"
);
}
oprot
->
writeMessageBegin
(
"dummy"
,
::
apache
::
thrift
::
protocol
::
T_REPLY
,
seqid
);
result
.
write
(
oprot
);
oprot
->
writeMessageEnd
();
bytes
=
oprot
->
getTransport
()
->
writeEnd
();
oprot
->
getTransport
()
->
flush
();
if
(
this
->
eventHandler_
.
get
()
!=
NULL
)
{
this
->
eventHandler_
->
postWrite
(
ctx
,
"VecService.dummy"
,
bytes
);
}
}
void
VecServiceProcessor
::
process_add_group
(
int32_t
seqid
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
,
void
*
callContext
)
{
void
*
ctx
=
NULL
;
...
...
@@ -2633,83 +2393,6 @@ void VecServiceProcessor::process_search_vector_batch(int32_t seqid, ::apache::t
return
processor
;
}
void
VecServiceConcurrentClient
::
dummy
()
{
int32_t
seqid
=
send_dummy
();
recv_dummy
(
seqid
);
}
int32_t
VecServiceConcurrentClient
::
send_dummy
()
{
int32_t
cseqid
=
this
->
sync_
.
generateSeqId
();
::
apache
::
thrift
::
async
::
TConcurrentSendSentry
sentry
(
&
this
->
sync_
);
oprot_
->
writeMessageBegin
(
"dummy"
,
::
apache
::
thrift
::
protocol
::
T_CALL
,
cseqid
);
VecService_dummy_pargs
args
;
args
.
write
(
oprot_
);
oprot_
->
writeMessageEnd
();
oprot_
->
getTransport
()
->
writeEnd
();
oprot_
->
getTransport
()
->
flush
();
sentry
.
commit
();
return
cseqid
;
}
void
VecServiceConcurrentClient
::
recv_dummy
(
const
int32_t
seqid
)
{
int32_t
rseqid
=
0
;
std
::
string
fname
;
::
apache
::
thrift
::
protocol
::
TMessageType
mtype
;
// the read mutex gets dropped and reacquired as part of waitForWork()
// The destructor of this sentry wakes up other clients
::
apache
::
thrift
::
async
::
TConcurrentRecvSentry
sentry
(
&
this
->
sync_
,
seqid
);
while
(
true
)
{
if
(
!
this
->
sync_
.
getPending
(
fname
,
mtype
,
rseqid
))
{
iprot_
->
readMessageBegin
(
fname
,
mtype
,
rseqid
);
}
if
(
seqid
==
rseqid
)
{
if
(
mtype
==
::
apache
::
thrift
::
protocol
::
T_EXCEPTION
)
{
::
apache
::
thrift
::
TApplicationException
x
;
x
.
read
(
iprot_
);
iprot_
->
readMessageEnd
();
iprot_
->
getTransport
()
->
readEnd
();
sentry
.
commit
();
throw
x
;
}
if
(
mtype
!=
::
apache
::
thrift
::
protocol
::
T_REPLY
)
{
iprot_
->
skip
(
::
apache
::
thrift
::
protocol
::
T_STRUCT
);
iprot_
->
readMessageEnd
();
iprot_
->
getTransport
()
->
readEnd
();
}
if
(
fname
.
compare
(
"dummy"
)
!=
0
)
{
iprot_
->
skip
(
::
apache
::
thrift
::
protocol
::
T_STRUCT
);
iprot_
->
readMessageEnd
();
iprot_
->
getTransport
()
->
readEnd
();
// in a bad state, don't commit
using
::
apache
::
thrift
::
protocol
::
TProtocolException
;
throw
TProtocolException
(
TProtocolException
::
INVALID_DATA
);
}
VecService_dummy_presult
result
;
result
.
read
(
iprot_
);
iprot_
->
readMessageEnd
();
iprot_
->
getTransport
()
->
readEnd
();
sentry
.
commit
();
return
;
}
// seqid != rseqid
this
->
sync_
.
updatePending
(
fname
,
mtype
,
rseqid
);
// this will temporarily unlock the readMutex, and let other clients get work done
this
->
sync_
.
waitForWork
(
seqid
);
}
// end while(true)
}
void
VecServiceConcurrentClient
::
add_group
(
const
VecGroup
&
group
)
{
int32_t
seqid
=
send_add_group
(
group
);
...
...
cpp/src/thrift/gen-cpp/VecService.h
浏览文件 @
21e51ff6
...
...
@@ -21,7 +21,6 @@
class
VecServiceIf
{
public:
virtual
~
VecServiceIf
()
{}
virtual
void
dummy
()
=
0
;
/**
* group interfaces
...
...
@@ -82,9 +81,6 @@ class VecServiceIfSingletonFactory : virtual public VecServiceIfFactory {
class
VecServiceNull
:
virtual
public
VecServiceIf
{
public:
virtual
~
VecServiceNull
()
{}
void
dummy
()
{
return
;
}
void
add_group
(
const
VecGroup
&
/* group */
)
{
return
;
}
...
...
@@ -109,80 +105,6 @@ class VecServiceNull : virtual public VecServiceIf {
}
};
class
VecService_dummy_args
{
public:
VecService_dummy_args
(
const
VecService_dummy_args
&
);
VecService_dummy_args
&
operator
=
(
const
VecService_dummy_args
&
);
VecService_dummy_args
()
{
}
virtual
~
VecService_dummy_args
()
throw
();
bool
operator
==
(
const
VecService_dummy_args
&
/* rhs */
)
const
{
return
true
;
}
bool
operator
!=
(
const
VecService_dummy_args
&
rhs
)
const
{
return
!
(
*
this
==
rhs
);
}
bool
operator
<
(
const
VecService_dummy_args
&
)
const
;
uint32_t
read
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
);
uint32_t
write
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
)
const
;
};
class
VecService_dummy_pargs
{
public:
virtual
~
VecService_dummy_pargs
()
throw
();
uint32_t
write
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
)
const
;
};
class
VecService_dummy_result
{
public:
VecService_dummy_result
(
const
VecService_dummy_result
&
);
VecService_dummy_result
&
operator
=
(
const
VecService_dummy_result
&
);
VecService_dummy_result
()
{
}
virtual
~
VecService_dummy_result
()
throw
();
bool
operator
==
(
const
VecService_dummy_result
&
/* rhs */
)
const
{
return
true
;
}
bool
operator
!=
(
const
VecService_dummy_result
&
rhs
)
const
{
return
!
(
*
this
==
rhs
);
}
bool
operator
<
(
const
VecService_dummy_result
&
)
const
;
uint32_t
read
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
);
uint32_t
write
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
)
const
;
};
class
VecService_dummy_presult
{
public:
virtual
~
VecService_dummy_presult
()
throw
();
uint32_t
read
(
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
);
};
typedef
struct
_VecService_add_group_args__isset
{
_VecService_add_group_args__isset
()
:
group
(
false
)
{}
bool
group
:
1
;
...
...
@@ -1032,9 +954,6 @@ class VecServiceClient : virtual public VecServiceIf {
apache
::
thrift
::
stdcxx
::
shared_ptr
<
::
apache
::
thrift
::
protocol
::
TProtocol
>
getOutputProtocol
()
{
return
poprot_
;
}
void
dummy
();
void
send_dummy
();
void
recv_dummy
();
void
add_group
(
const
VecGroup
&
group
);
void
send_add_group
(
const
VecGroup
&
group
);
void
recv_add_group
();
...
...
@@ -1071,7 +990,6 @@ class VecServiceProcessor : public ::apache::thrift::TDispatchProcessor {
typedef
void
(
VecServiceProcessor
::*
ProcessFunction
)(
int32_t
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
,
void
*
);
typedef
std
::
map
<
std
::
string
,
ProcessFunction
>
ProcessMap
;
ProcessMap
processMap_
;
void
process_dummy
(
int32_t
seqid
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
,
void
*
callContext
);
void
process_add_group
(
int32_t
seqid
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
,
void
*
callContext
);
void
process_get_group
(
int32_t
seqid
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
,
void
*
callContext
);
void
process_del_group
(
int32_t
seqid
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
iprot
,
::
apache
::
thrift
::
protocol
::
TProtocol
*
oprot
,
void
*
callContext
);
...
...
@@ -1082,7 +1000,6 @@ class VecServiceProcessor : public ::apache::thrift::TDispatchProcessor {
public:
VecServiceProcessor
(
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
VecServiceIf
>
iface
)
:
iface_
(
iface
)
{
processMap_
[
"dummy"
]
=
&
VecServiceProcessor
::
process_dummy
;
processMap_
[
"add_group"
]
=
&
VecServiceProcessor
::
process_add_group
;
processMap_
[
"get_group"
]
=
&
VecServiceProcessor
::
process_get_group
;
processMap_
[
"del_group"
]
=
&
VecServiceProcessor
::
process_del_group
;
...
...
@@ -1118,15 +1035,6 @@ class VecServiceMultiface : virtual public VecServiceIf {
ifaces_
.
push_back
(
iface
);
}
public:
void
dummy
()
{
size_t
sz
=
ifaces_
.
size
();
size_t
i
=
0
;
for
(;
i
<
(
sz
-
1
);
++
i
)
{
ifaces_
[
i
]
->
dummy
();
}
ifaces_
[
i
]
->
dummy
();
}
void
add_group
(
const
VecGroup
&
group
)
{
size_t
sz
=
ifaces_
.
size
();
size_t
i
=
0
;
...
...
@@ -1224,9 +1132,6 @@ class VecServiceConcurrentClient : virtual public VecServiceIf {
apache
::
thrift
::
stdcxx
::
shared_ptr
<
::
apache
::
thrift
::
protocol
::
TProtocol
>
getOutputProtocol
()
{
return
poprot_
;
}
void
dummy
();
int32_t
send_dummy
();
void
recv_dummy
(
const
int32_t
seqid
);
void
add_group
(
const
VecGroup
&
group
);
int32_t
send_add_group
(
const
VecGroup
&
group
);
void
recv_add_group
(
const
int32_t
seqid
);
...
...
cpp/src/thrift/gen-cpp/VecService_server.skeleton.cpp
浏览文件 @
21e51ff6
...
...
@@ -18,11 +18,6 @@ class VecServiceHandler : virtual public VecServiceIf {
// Your initialization goes here
}
void
dummy
()
{
// Your implementation goes here
printf
(
"dummy
\n
"
);
}
/**
* group interfaces
*
...
...
@@ -85,7 +80,7 @@ int main(int argc, char **argv) {
int
port
=
9090
;
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
VecServiceHandler
>
handler
(
new
VecServiceHandler
());
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TProcessor
>
processor
(
new
VecServiceProcessor
(
handler
));
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TServerTransport
>
serverTransport
(
new
TServerSocket
(
"localhost"
,
port
));
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TServerTransport
>
serverTransport
(
new
TServerSocket
(
port
));
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TTransportFactory
>
transportFactory
(
new
TBufferedTransportFactory
());
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TProtocolFactory
>
protocolFactory
(
new
TBinaryProtocolFactory
());
...
...
cpp/test_client/src/ClientApp.cpp
浏览文件 @
21e51ff6
...
...
@@ -47,9 +47,11 @@ void ClientApp::Run(const std::string &config_file) {
std
::
string
mode
=
server_config
.
GetValue
(
server
::
CONFIG_SERVER_MODE
,
"thread_pool"
);
CLIENT_LOG_INFO
<<
"Connect to server: "
<<
address
<<
":"
<<
std
::
to_string
(
port
);
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TSocket
>
socket_ptr
(
new
::
apache
::
thrift
::
transport
::
TSocket
(
address
,
port
));
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TTransport
>
transport_ptr
(
new
TBufferedTransport
(
socket_ptr
));
::
apache
::
thrift
::
stdcxx
::
shared_ptr
<
TProtocol
>
protocol_ptr
;
try
{
stdcxx
::
shared_ptr
<
TSocket
>
socket_ptr
(
new
transport
::
TSocket
(
address
,
port
));
stdcxx
::
shared_ptr
<
TTransport
>
transport_ptr
(
new
TBufferedTransport
(
socket_ptr
));
stdcxx
::
shared_ptr
<
TProtocol
>
protocol_ptr
;
if
(
protocol
==
"binary"
)
{
protocol_ptr
.
reset
(
new
TBinaryProtocol
(
transport_ptr
));
}
else
if
(
protocol
==
"json"
)
{
...
...
@@ -66,18 +68,22 @@ void ClientApp::Run(const std::string &config_file) {
transport_ptr
->
open
();
VecServiceClient
client
(
protocol_ptr
);
try
{
client
.
dummy
();
VecGroup
group
;
group
.
id
=
"test_group"
;
group
.
dimension
=
256
;
group
.
index_type
=
0
;
client
.
add_group
(
group
);
}
catch
(
apache
::
thrift
::
TException
&
ex
)
{
printf
(
"%s"
,
ex
.
what
());
}
transport_ptr
->
close
();
}
catch
(
apache
::
thrift
::
TException
&
ex
)
{
CLIENT_LOG_ERROR
<<
"Server encounter exception: "
<<
ex
.
what
();
}
CLIENT_LOG_INFO
<<
"Test finished"
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录