Skip to content

Commit f8ccd84

Browse files
committed
changes for merge
1 parent 4affa94 commit f8ccd84

File tree

3 files changed

+352
-1749
lines changed

3 files changed

+352
-1749
lines changed

ydb/core/viewer/json_pipe_req.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ void TViewerPipeClient::BuildParamsFromJson(TStringBuf data) {
153153
}
154154
}
155155
}
156+
PostData = std::move(jsonData);
156157
}
157158
}
158159

@@ -362,6 +363,19 @@ TString TViewerPipeClient::GetError(const NSchemeShard::TEvSchemeShard::TEvDescr
362363
return NKikimrScheme::EStatus_Name(ev.GetRecord().GetStatus());
363364
}
364365

366+
bool TViewerPipeClient::IsSuccess(const TEvTxUserProxy::TEvProposeTransactionStatus& ev) {
367+
switch (ev.Record.GetStatus()) {
368+
case TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ExecComplete:
369+
case TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::ExecInProgress:
370+
return true;
371+
}
372+
return false;
373+
}
374+
375+
TString TViewerPipeClient::GetError(const TEvTxUserProxy::TEvProposeTransactionStatus& ev) {
376+
return TStringBuilder() << ev.Record.GetStatus();
377+
}
378+
365379
void TViewerPipeClient::RequestHiveDomainStats(NNodeWhiteboard::TTabletId hiveId) {
366380
TActorId pipeClient = ConnectTabletPipe(hiveId);
367381
THolder<TEvHive::TEvRequestHiveDomainStats> request = MakeHolder<TEvHive::TEvRequestHiveDomainStats>();

ydb/core/viewer/json_pipe_req.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
5555
NMon::TEvHttpInfo::TPtr Event;
5656
NHttp::TEvHttpProxy::TEvHttpIncomingRequest::TPtr HttpEvent;
5757
TCgiParameters Params;
58+
NJson::TJsonValue PostData;
5859
TJsonSettings JsonSettings;
5960
TProto2JsonConfig Proto2JsonConfig;
6061
TDuration Timeout = TDuration::Seconds(10);
@@ -274,6 +275,9 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
274275
static bool IsSuccess(const NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResult& ev);
275276
static TString GetError(const NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResult& ev);
276277

278+
static bool IsSuccess(const TEvTxUserProxy::TEvProposeTransactionStatus& ev);
279+
static TString GetError(const TEvTxUserProxy::TEvProposeTransactionStatus& ev);
280+
277281
void UpdateSharedCacheTablet(TTabletId tabletId, std::unique_ptr<IEventBase> request);
278282

279283
[[nodiscard]] TRequestResponse<TEvHive::TEvResponseHiveDomainStats> MakeRequestHiveDomainStats(TTabletId hiveId);

0 commit comments

Comments
 (0)