Skip to content

Commit 62d298b

Browse files
added query script
1 parent 642e800 commit 62d298b

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

ydb/core/grpc_services/local_rpc/local_rpc.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,12 @@ concept TRequestWithOperationParams = requires(TRequest& request) {
293293
};
294294

295295
template<TRequestWithOperationParams TRequest>
296-
void SetRequestSyncOperationMode(TRequest& request) {
297-
request.mutable_operation_params()->set_operation_mode(Ydb::Operations::OperationParams::SYNC);
296+
void SetRequestSyncOperationMode(TRequest& request, Ydb::Operations::OperationParams::OperationMode operationMode = Ydb::Operations::OperationParams::SYNC) {
297+
request.mutable_operation_params()->set_operation_mode(operationMode);
298298
}
299299

300300
template<class TRequest>
301-
void SetRequestSyncOperationMode(TRequest&) {
301+
void SetRequestSyncOperationMode(TRequest&, Ydb::Operations::OperationParams::OperationMode) {
302302
// nothing
303303
}
304304

@@ -308,7 +308,7 @@ NThreading::TFuture<typename TRpc::TResponse> DoLocalRpc(typename TRpc::TRequest
308308
TActorSystem* actorSystem, bool internalCall = false) {
309309
auto promise = NThreading::NewPromise<typename TRpc::TResponse>();
310310

311-
SetRequestSyncOperationMode(proto);
311+
SetRequestSyncOperationMode(proto, operationMode);
312312

313313
using TCbWrapper = TPromiseWrapper<typename TRpc::TResponse>;
314314
auto req = new TLocalRpcCtx<TRpc, TCbWrapper>(std::move(proto), TCbWrapper(promise), database, token, requestType, internalCall);
@@ -319,8 +319,8 @@ NThreading::TFuture<typename TRpc::TResponse> DoLocalRpc(typename TRpc::TRequest
319319
}
320320

321321
template<typename TRpc>
322-
NThreading::TFuture<typename TRpc::TResponse> DoLocalRpc(typename TRpc::TRequest&& proto, const TString& database, const TMaybe<TString>& token, TActorSystem* actorSystem, bool internalCall = false) {
323-
return DoLocalRpc<TRpc>(std::move(proto), database, token, Nothing(), actorSystem, internalCall);
322+
NThreading::TFuture<typename TRpc::TResponse> DoLocalRpc(typename TRpc::TRequest&& proto, const TString& database, const TMaybe<TString>& token, TActorSystem* actorSystem, bool internalCall = false, Ydb::Operations::OperationParams::OperationMode operationMode = Ydb::Operations::OperationParams::SYNC) {
323+
return DoLocalRpc<TRpc>(std::move(proto), database, token, Nothing(), actorSystem, internalCall, operationMode);
324324
}
325325

326326
template<typename TRpc>

ydb/core/viewer/json_local_rpc.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class TJsonLocalRpc : public TViewerPipeClient {
3333
std::vector<HTTP_METHOD> AllowedMethods = {};
3434
TAutoPtr<TEvLocalRpcPrivate::TEvGrpcRequestResult<TProtoResult>> Result;
3535
NThreading::TFuture<TProtoResponse> RpcFuture;
36+
Ydb::Operations::OperationParams::OperationMode OperationMode = Ydb::Operations::OperationParams::SYNC;
3637

3738
public:
3839
static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
@@ -142,6 +143,7 @@ class TJsonLocalRpc : public TViewerPipeClient {
142143
void SendGrpcRequest(TProtoRequest&& request) {
143144
// TODO(xenoxeno): pass trace id
144145
RpcFuture = NRpcService::DoLocalRpc<TRpcEv>(std::move(request), Database, Event->Get()->UserToken, TlsActivationContext->ActorSystem());
146+
145147
RpcFuture.Subscribe([actorId = TBase::SelfId(), actorSystem = TlsActivationContext->ActorSystem()]
146148
(const NThreading::TFuture<TProtoResponse>& future) {
147149
auto& response = future.GetValueSync();

ydb/core/viewer/viewer_ut.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1885,7 +1885,6 @@ Y_UNIT_TEST_SUITE(Viewer) {
18851885
}
18861886

18871887
Y_UNIT_TEST(QueryExecuteScript) {
1888-
Cerr << "iiiiiii 0 " << Endl;
18891888
TPortManager tp;
18901889
ui16 port = tp.GetPort(2134);
18911890
ui16 grpcPort = tp.GetPort(2135);

0 commit comments

Comments
 (0)