Skip to content

Commit be542fa

Browse files
StekPerepolnenStekPerepolnen
committed
added query script
1 parent 642e800 commit be542fa

26 files changed

+69
-132
lines changed

‎ydb/core/grpc_services/local_rpc/local_rpc.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@ void SetRequestSyncOperationMode(TRequest&) {
305305
template<typename TRpc>
306306
NThreading::TFuture<typename TRpc::TResponse> DoLocalRpc(typename TRpc::TRequest&& proto, const TString& database,
307307
const TMaybe<TString>& token, const TMaybe<TString>& requestType,
308-
TActorSystem* actorSystem, bool internalCall = false) {
308+
TActorSystem* actorSystem, bool internalCall = false)
309+
{
309310
auto promise = NThreading::NewPromise<typename TRpc::TResponse>();
310311

311312
SetRequestSyncOperationMode(proto);

‎ydb/core/viewer/json.json

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎ydb/core/viewer/json_local_rpc.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class TJsonLocalRpc : public TViewerPipeClient {
5656
TString name;
5757
name = field->name();
5858
TString value = params.Get(name);
59-
Cerr << "jjjjjjj name " << name << Endl;
6059
if (!value.empty()) {
6160
FieldDescriptor::CppType type = field->cpp_type();
6261
switch (type) {
@@ -120,7 +119,6 @@ class TJsonLocalRpc : public TViewerPipeClient {
120119
bool Params2Proto(TProtoRequest& request) {
121120
auto postData = Event->Get()->Request.GetPostContent();
122121
if (!postData.empty()) {
123-
Cerr << "jjjjjjjjj GET" << Endl;
124122
try {
125123
NProtobufJson::Json2Proto(postData, request);
126124
}
@@ -129,7 +127,6 @@ class TJsonLocalRpc : public TViewerPipeClient {
129127
return false;
130128
}
131129
} else {
132-
Cerr << "jjjjjjjjj POST" << Endl;
133130
const auto& params(Event->Get()->Request.GetParams());
134131
Params2Proto(params, request);
135132
}
@@ -171,7 +168,6 @@ class TJsonLocalRpc : public TViewerPipeClient {
171168
return ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "Method is not allowed"));
172169
}
173170
if (Database.empty()) {
174-
Cerr << "!!!! field 'database' is required" << Endl;
175171
return ReplyAndPassAway(GetHTTPBADREQUEST("text/plain", "field 'database' is required"));
176172
}
177173
if (TBase::NeedToRedirect()) {

‎ydb/core/viewer/json_pipe_req.cpp

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ TViewerPipeClient::TViewerPipeClient(IViewer* viewer, NMon::TEvHttpInfo::TPtr& e
2525
: Viewer(viewer)
2626
, Event(ev)
2727
{
28-
InitConfig();
28+
InitConfig(Event->Get()->Request.GetParams());
2929
NWilson::TTraceId traceId;
3030
TStringBuf traceparent = Event->Get()->Request.GetHeader("traceparent");
3131
if (traceparent) {
@@ -589,8 +589,7 @@ std::vector<TNodeId> TViewerPipeClient::GetNodesFromBoardReply(TEvStateStorage::
589589
return GetNodesFromBoardReply(*ev->Get());
590590
}
591591

592-
void TViewerPipeClient::InitConfig() {
593-
const TCgiParameters& params = Event->Get()->Request.GetParams();
592+
void TViewerPipeClient::InitConfig(const TCgiParameters& params) {
594593
Followers = FromStringWithDefault(params.Get("followers"), Followers);
595594
Metrics = FromStringWithDefault(params.Get("metrics"), Metrics);
596595
WithRetry = FromStringWithDefault(params.Get("with_retry"), WithRetry);
@@ -599,18 +598,6 @@ void TViewerPipeClient::InitConfig() {
599598
if (!Database) {
600599
Database = params.Get("tenant");
601600
}
602-
if (!Database) {
603-
auto postData = Event->Get()->Request.GetPostContent();
604-
Cerr << "jjjjjj postData: " << postData << Endl;
605-
static NJson::TJsonReaderConfig JsonConfig;
606-
NJson::TJsonValue requestData;
607-
bool success = NJson::ReadJsonTree(postData, &JsonConfig, &requestData);
608-
Cerr << "jjjjjj success: " << success << Endl;
609-
if (success) {
610-
Database = requestData["database"].GetStringRobust();
611-
Cerr << "jjjjjj Database from post data: " << Database << Endl;
612-
}
613-
}
614601
Direct = FromStringWithDefault<bool>(params.Get("direct"), Direct);
615602
JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), true);
616603
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), true);

‎ydb/core/viewer/json_pipe_req.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ class TViewerPipeClient : public TActorBootstrapped<TViewerPipeClient> {
268268
TRequestResponse<TEvStateStorage::TEvBoardInfo> MakeRequestStateStorageEndpointsLookup(const TString& path, ui64 cookie = 0);
269269
std::vector<TNodeId> GetNodesFromBoardReply(TEvStateStorage::TEvBoardInfo::TPtr& ev);
270270
std::vector<TNodeId> GetNodesFromBoardReply(const TEvStateStorage::TEvBoardInfo& ev);
271-
void InitConfig();
271+
void InitConfig(const TCgiParameters& params);
272272
void InitConfig(const TRequestSettings& settings);
273273
void ClosePipes();
274274
ui32 FailPipeConnect(TTabletId tabletId);

‎ydb/core/viewer/json_storage_base.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ class TJsonStorageBase : public TViewerPipeClient {
3838
using TThis = TJsonStorageBase;
3939

4040
using TNodeId = ui32;
41+
IViewer* Viewer;
4142
TActorId Initiator;
43+
NMon::TEvHttpInfo::TPtr Event;
4244
THolder<TEvInterconnect::TEvNodesInfo> NodesInfo;
4345
TMap<ui32, NKikimrWhiteboard::TEvVDiskStateResponse> VDiskInfo;
4446
TMap<ui32, NKikimrWhiteboard::TEvPDiskStateResponse> PDiskInfo;
@@ -110,13 +112,14 @@ class TJsonStorageBase : public TViewerPipeClient {
110112
THashMap<TString, TGroupRow> GroupRowsByGroupId;
111113

112114
TJsonStorageBase(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
113-
: TBase(viewer, ev)
114-
, Initiator(Event->Sender)
115+
: Viewer(viewer)
116+
, Initiator(ev->Sender)
117+
, Event(std::move(ev))
115118
{
116119
const auto& params(Event->Get()->Request.GetParams());
117120
JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), true);
118121
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), false);
119-
InitConfig();
122+
InitConfig(params);
120123
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
121124
FilterTenant = params.Get("tenant");
122125
TString filterStoragePool = params.Get("pool");

‎ydb/core/viewer/json_vdisk_req.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ class TJsonVDiskRequest : public TViewerPipeClient {
3737
using TThis = TJsonVDiskRequest<RequestType, ResponseType>;
3838
using TBase = TViewerPipeClient;
3939
using THelper = TJsonVDiskRequestHelper<RequestType, ResponseType>;
40+
IViewer* Viewer;
4041
TActorId Initiator;
42+
NMon::TEvHttpInfo::TPtr Event;
4143
TJsonSettings JsonSettings;
4244
bool AllEnums = false;
4345
ui32 Timeout = 0;
@@ -55,8 +57,9 @@ class TJsonVDiskRequest : public TViewerPipeClient {
5557

5658
public:
5759
TJsonVDiskRequest(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
58-
: TBase(viewer, ev)
60+
: Viewer(viewer)
5961
, Initiator(ev->Sender)
62+
, Event(ev)
6063
{}
6164

6265
void Bootstrap() override {
@@ -78,7 +81,7 @@ class TJsonVDiskRequest : public TViewerPipeClient {
7881
if (!NodeId) {
7982
NodeId = TlsActivationContext->ActorSystem()->NodeId;
8083
}
81-
TBase::InitConfig();
84+
TBase::InitConfig(params);
8285

8386

8487
JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), false);

‎ydb/core/viewer/pdisk_info.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class TPDiskInfo : public TViewerPipeClient {
5656
if (!NodeId) {
5757
NodeId = TlsActivationContext->ActorSystem()->NodeId;
5858
}
59-
TBase::InitConfig();
59+
TBase::InitConfig(params);
6060

6161
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
6262
Retries = FromStringWithDefault<ui32>(params.Get("retries"), 3);

‎ydb/core/viewer/pdisk_restart.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class TJsonPDiskRestart : public TViewerPipeClient {
2424
protected:
2525
using TThis = TJsonPDiskRestart;
2626
using TBase = TViewerPipeClient;
27+
IViewer* Viewer;
28+
NMon::TEvHttpInfo::TPtr Event;
2729
ui32 Timeout = 0;
2830
ui32 ActualRetries = 0;
2931
ui32 Retries = 0;
@@ -37,7 +39,8 @@ class TJsonPDiskRestart : public TViewerPipeClient {
3739

3840
public:
3941
TJsonPDiskRestart(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
40-
: TBase(viewer, ev)
42+
: Viewer(viewer)
43+
, Event(ev)
4144
{}
4245

4346
void Bootstrap() override {
@@ -66,7 +69,7 @@ class TJsonPDiskRestart : public TViewerPipeClient {
6669
if (!NodeId) {
6770
NodeId = TlsActivationContext->ActorSystem()->NodeId;
6871
}
69-
TBase::InitConfig();
72+
TBase::InitConfig(params);
7073

7174
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
7275
Retries = FromStringWithDefault<ui32>(params.Get("retries"), 0);

‎ydb/core/viewer/pdisk_status.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ class TPDiskStatus : public TViewerPipeClient {
1313
protected:
1414
using TThis = TPDiskStatus;
1515
using TBase = TViewerPipeClient;
16+
IViewer* Viewer;
17+
NMon::TEvHttpInfo::TPtr Event;
1618
ui32 Timeout = 0;
1719

1820
std::unique_ptr<TEvBlobStorage::TEvControllerConfigResponse> Response;
@@ -22,7 +24,8 @@ class TPDiskStatus : public TViewerPipeClient {
2224

2325
public:
2426
TPDiskStatus(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
25-
: TBase(viewer, ev)
27+
: Viewer(viewer)
28+
, Event(ev)
2629
{}
2730

2831
void Bootstrap() override {
@@ -86,7 +89,7 @@ class TPDiskStatus : public TViewerPipeClient {
8689
return PassAway();
8790
}
8891

89-
TBase::InitConfig();
92+
TBase::InitConfig(params);
9093

9194
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
9295

‎ydb/core/viewer/vdisk_evict.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class TJsonVDiskEvict : public TViewerPipeClient {
2424
protected:
2525
using TThis = TJsonVDiskEvict;
2626
using TBase = TViewerPipeClient;
27+
IViewer* Viewer;
28+
NMon::TEvHttpInfo::TPtr Event;
2729
ui32 Timeout = 0;
2830
ui32 ActualRetries = 0;
2931
ui32 Retries = 0;
@@ -40,7 +42,8 @@ class TJsonVDiskEvict : public TViewerPipeClient {
4042

4143
public:
4244
TJsonVDiskEvict(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
43-
: TBase(viewer, ev)
45+
: Viewer(viewer)
46+
, Event(ev)
4447
{}
4548

4649
inline ui32 GetRequiredParam(const TCgiParameters& params, const std::string& name, ui32& obj) {
@@ -87,7 +90,7 @@ class TJsonVDiskEvict : public TViewerPipeClient {
8790
0, NMon::IEvHttpInfoRes::EContentType::Custom));
8891
return PassAway();
8992
}
90-
TBase::InitConfig();
93+
TBase::InitConfig(params);
9194

9295
Force = FromStringWithDefault<bool>(params.Get("force"), false);
9396
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);

‎ydb/core/viewer/viewer_autocomplete.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TJsonAutocomplete : public TViewerPipeClient {
5050
: TBase(viewer, ev)
5151
{
5252
const auto& params(Event->Get()->Request.GetParams());
53-
InitConfig();
53+
InitConfig(params);
5454
ParseCgiParameters(params);
5555
if (IsPostContent()) {
5656
TStringBuf content = Event->Get()->Request.GetPostContent();

‎ydb/core/viewer/viewer_bscontrollerinfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TJsonBSControllerInfo : public TViewerPipeClient {
2525
JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), false);
2626
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), false);
2727
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
28-
InitConfig();
28+
InitConfig(params);
2929
RequestBSControllerInfo();
3030
Become(&TThis::StateRequestedInfo, TDuration::MilliSeconds(Timeout), new TEvents::TEvWakeup());
3131
}

‎ydb/core/viewer/viewer_cluster.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class TJsonCluster : public TViewerPipeClient {
9898
const auto& params(Event->Get()->Request.GetParams());
9999
JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), true);
100100
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), false);
101-
InitConfig();
101+
InitConfig(params);
102102
Tablets = FromStringWithDefault<bool>(params.Get("tablets"), false);
103103
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
104104
OffloadMerge = FromStringWithDefault<bool>(params.Get("offload_merge"), OffloadMerge);

‎ydb/core/viewer/viewer_compute.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ using namespace NActors;
1414
class TJsonCompute : public TViewerPipeClient {
1515
using TThis = TJsonCompute;
1616
using TBase = TViewerPipeClient;
17+
IViewer* Viewer;
1718
THashMap<TString, NKikimrViewer::TTenant> TenantByPath;
1819
THashMap<TPathId, NKikimrViewer::TTenant> TenantBySubDomainKey;
1920
THashMap<TPathId, TTabletId> HiveBySubDomainKey;
@@ -24,6 +25,7 @@ class TJsonCompute : public TViewerPipeClient {
2425
THashMap<TNodeId, TVector<const NKikimrWhiteboard::TTabletStateInfo*>> TabletInfoIndex;
2526
THashMap<TNodeId, const NKikimrHive::THiveNodeStats*> HiveNodeStatsIndex;
2627
THashMap<TNodeId, TString> TenantPathByNodeId;
28+
NMon::TEvHttpInfo::TPtr Event;
2729
TVector<TNodeId> NodeIds;
2830
THashSet<TNodeId> PassedNodeIds;
2931
THashSet<TNodeId> FoundNodeIds;
@@ -68,7 +70,8 @@ class TJsonCompute : public TViewerPipeClient {
6870

6971
public:
7072
TJsonCompute(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)
71-
: TBase(viewer, ev)
73+
: Viewer(viewer)
74+
, Event(ev)
7275
{}
7376

7477
TString GetDomainId(TPathId pathId) {
@@ -95,7 +98,7 @@ class TJsonCompute : public TViewerPipeClient {
9598
const auto& params(Event->Get()->Request.GetParams());
9699
JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), true);
97100
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), false);
98-
InitConfig();
101+
InitConfig(params);
99102
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
100103
Tablets = FromStringWithDefault<bool>(params.Get("tablets"), Tablets);
101104
Path = params.Get("path");

‎ydb/core/viewer/viewer_describe.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class TJsonDescribe : public TViewerPipeClient {
5353
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), false);
5454
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
5555
ExpandSubElements = FromStringWithDefault<ui32>(params.Get("subs"), ExpandSubElements);
56-
InitConfig();
56+
InitConfig(params);
5757

5858
if (params.Has("schemeshard_id")) {
5959
THolder<TEvSchemeShard::TEvDescribeScheme> request = MakeHolder<TEvSchemeShard::TEvDescribeScheme>();

‎ydb/core/viewer/viewer_hiveinfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class TJsonHiveInfo : public TViewerPipeClient {
2828
JsonSettings.UI64AsString = !FromStringWithDefault<bool>(params.Get("ui64"), false);
2929
Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
3030
NodeId = FromStringWithDefault<TNodeId>(params.Get("node"), 0);
31-
InitConfig();
31+
InitConfig(params);
3232
if (hiveId != 0 ) {
3333
TAutoPtr<TEvHive::TEvRequestHiveInfo> request = new TEvHive::TEvRequestHiveInfo();
3434
if (params.Has("tablet_id")) {

0 commit comments

Comments
 (0)