Skip to content

Commit 2848978

Browse files
authored
bump up viewer/query version to 3 (#8315)
1 parent 072b721 commit 2848978

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

ydb/core/viewer/json_handlers.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ struct TJsonHandlers {
4848
}
4949
return it->second.get();
5050
}
51+
52+
int GetCapabilityVersion(const TString& name) const {
53+
auto it = Capabilities.find(name);
54+
if (it == Capabilities.end()) {
55+
return 0;
56+
}
57+
return it->second;
58+
}
5159
};
5260

5361
class TSimpleYamlBuilder {

ydb/core/viewer/json_handlers_viewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ void InitViewerWhoAmIJsonHandler(TJsonHandlers& handlers) {
227227
}
228228

229229
void InitViewerQueryJsonHandler(TJsonHandlers& handlers) {
230-
handlers.AddHandler("/viewer/query", new TJsonHandler<TJsonQuery>(TJsonQuery::GetSwagger()), 2);
230+
handlers.AddHandler("/viewer/query", new TJsonHandler<TJsonQuery>(TJsonQuery::GetSwagger()), 3);
231231
}
232232

233233
void InitViewerNetInfoJsonHandler(TJsonHandlers& handlers) {

ydb/core/viewer/viewer.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,11 @@ class TViewer : public TActorBootstrapped<TViewer>, public IViewer {
318318
return capabilities;
319319
}
320320

321+
int GetCapabilityVersion(const TString& name) override {
322+
std::lock_guard guard(JsonHandlersMutex);
323+
return JsonHandlers.GetCapabilityVersion(name);
324+
}
325+
321326
void RegisterVirtualHandler(
322327
NKikimrViewer::EObjectType parentObjectType,
323328
TVirtualHandlerType handler) override {

ydb/core/viewer/viewer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ class IViewer {
201201
virtual TActorId FindRunningQuery(const TString& queryId) = 0;
202202

203203
virtual NJson::TJsonValue GetCapabilities() = 0;
204+
virtual int GetCapabilityVersion(const TString& name) = 0;
204205
};
205206

206207
void SetupPQVirtualHandlers(IViewer* viewer);

ydb/core/viewer/viewer_query.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@ class TJsonQuery : public TViewerPipeClient {
434434
void HandleReply(NKqp::TEvKqp::TEvQueryResponse::TPtr& ev) {
435435
BLOG_TRACE("Query response received");
436436
NJson::TJsonValue jsonResponse;
437+
jsonResponse["version"] = Viewer->GetCapabilityVersion("/viewer/query");
437438
if (ev->Get()->Record.GetRef().GetYdbStatus() == Ydb::StatusIds::SUCCESS) {
438439
QueryResponse.Set(std::move(ev));
439440
MakeOkReply(jsonResponse, QueryResponse->Record.GetRef());

0 commit comments

Comments
 (0)