aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxenoxeno <xeno@ydb.tech>2022-09-13 16:24:44 +0300
committerxenoxeno <xeno@ydb.tech>2022-09-13 16:24:44 +0300
commit7a6811338c33ec8523f9ecc907765ce343a3ef04 (patch)
tree44a0d7568ad2445653e84e5f2451f2695429e0ae
parent02f3bb30bf04f8307e92d56a874fad6194c55676 (diff)
downloadydb-7a6811338c33ec8523f9ecc907765ce343a3ef04.tar.gz
fix swagger description
-rw-r--r--ydb/core/viewer/json_nodes.h18
-rw-r--r--ydb/core/viewer/json_query.h2
2 files changed, 13 insertions, 7 deletions
diff --git a/ydb/core/viewer/json_nodes.h b/ydb/core/viewer/json_nodes.h
index 62043bf0860..5b2b983aa2f 100644
--- a/ydb/core/viewer/json_nodes.h
+++ b/ydb/core/viewer/json_nodes.h
@@ -44,7 +44,7 @@ class TJsonNodes : public TViewerPipeClient<TJsonNodes> {
std::unordered_set<TNodeId> PassedNodeIds;
std::vector<TNodeId> NodeIds;
std::optional<ui32> Offset;
- std::optional<ui32> MaxCount;
+ std::optional<ui32> Limit;
enum class EWith {
Everything,
@@ -105,8 +105,8 @@ public:
if (params.Has("offset")) {
Offset = FromStringWithDefault<ui32>(params.Get("offset"), 0);
}
- if (params.Has("max_count")) {
- MaxCount = FromStringWithDefault<ui32>(params.Get("max_count"), std::numeric_limits<ui32>::max());
+ if (params.Has("limit")) {
+ Limit = FromStringWithDefault<ui32>(params.Get("limit"), std::numeric_limits<ui32>::max());
}
if (params.Get("type") == "static") {
Type = EType::Static;
@@ -211,8 +211,8 @@ public:
return;
}
}
- if (SortedNodeList && MaxCount.has_value()) {
- if (NodeIds.size() >= MaxCount.value()) {
+ if (SortedNodeList && Limit.has_value()) {
+ if (NodeIds.size() >= Limit.value()) {
return;
}
}
@@ -595,7 +595,13 @@ struct TJsonRequestParameters<TJsonNodes> {
return R"___([{"name":"enums","in":"query","description":"convert enums to strings","required":false,"type":"boolean"},
{"name":"ui64","in":"query","description":"return ui64 as numbers","required":false,"type":"boolean"},
{"name":"tenant","in":"query","description":"tenant filter","required":false,"type":"string"},
- {"name":"with","in":"query","description":"filter groups by missing or space","required":false,"type":"string"},
+ {"name":"with","in":"query","description":"filter nodes by missing disks or space","required":false,"type":"string"},
+ {"name":"type","in":"query","description":"nodes type to get (static,dynamic,any)","required":false,"type":"string"},
+ {"name":"storage","in":"query","description":"return storage info","required":false,"type":"boolean"},
+ {"name":"tablets","in":"query","description":"return tablets info","required":false,"type":"boolean"},
+ {"name":"sort","in":"query","description":"sort by (NodeId,Host,DC,Version,Uptime,Memory,CPU,LoadAverage)","required":false,"type":"string"},
+ {"name":"offset","in":"query","description":"skip N nodes","required":false,"type":"integer"},
+ {"name":"limit","in":"query","description":"limit to N nodes","required":false,"type":"integer"},
{"name":"timeout","in":"query","description":"timeout in ms","required":false,"type":"integer"}])___";
}
};
diff --git a/ydb/core/viewer/json_query.h b/ydb/core/viewer/json_query.h
index 1a88425b7e7..1deb47d8111 100644
--- a/ydb/core/viewer/json_query.h
+++ b/ydb/core/viewer/json_query.h
@@ -321,7 +321,7 @@ private:
}
}
- if (Schema == "classic" && Stats.empty()) {
+ if (Schema == "classic" && Stats.empty() && (Action.empty() || Action == "execute")) {
jsonResponse = std::move(jsonResponse["result"]);
}