-
Notifications
You must be signed in to change notification settings - Fork 697
add viewer query script handlers #9423
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
StekPerepolnen
merged 3 commits into
ydb-platform:main
from
StekPerepolnen:query-script
Sep 26, 2024
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #include "json_handlers.h" | ||
| #include "query_execute_script.h" | ||
| #include "query_fetch_script.h" | ||
|
|
||
| namespace NKikimr::NViewer { | ||
|
|
||
| void InitQueryExecuteScriptJsonHandler(TJsonHandlers& handlers) { | ||
| handlers.AddHandler("/query/script/execute", new TJsonHandler<TQueryExecuteScript>(TQueryExecuteScript::GetSwagger())); | ||
| } | ||
|
|
||
| void InitQueryFetchScriptJsonHandler(TJsonHandlers& handlers) { | ||
| handlers.AddHandler("/query/script/fetch", new TJsonHandler<TQueryFetchScript>(TQueryFetchScript::GetSwagger())); | ||
| } | ||
|
|
||
| void InitQueryJsonHandlers(TJsonHandlers& jsonHandlers) { | ||
| InitQueryExecuteScriptJsonHandler(jsonHandlers); | ||
| InitQueryFetchScriptJsonHandler(jsonHandlers); | ||
| } | ||
|
|
||
| } // namespace NKikimr::NViewer |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| #pragma once | ||
| #include "json_local_rpc.h" | ||
| #include <ydb/core/grpc_services/rpc_calls.h> | ||
| #include <ydb/core/viewer/yaml/yaml.h> | ||
| #include <ydb/public/api/grpc/ydb_query_v1.grpc.pb.h> | ||
| #include <ydb/public/api/grpc/ydb_operation_v1.grpc.pb.h> | ||
|
|
||
| namespace NKikimr { | ||
|
|
||
| namespace NRpcService { | ||
|
|
||
| template<> | ||
| void SetRequestSyncOperationMode<Ydb::Query::ExecuteScriptRequest>(Ydb::Query::ExecuteScriptRequest& request) { | ||
| request.mutable_operation_params()->set_operation_mode(Ydb::Operations::OperationParams::ASYNC); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| namespace NViewer { | ||
|
|
||
| using TQueryExecuteScriptRpc = TJsonLocalRpc<Ydb::Query::ExecuteScriptRequest, | ||
| Ydb::Operations::Operation, | ||
| Ydb::Operations::Operation, | ||
| Ydb::Query::V1::QueryService, | ||
| NKikimr::NGRpcService::TGrpcRequestNoOperationCall<Ydb::Query::ExecuteScriptRequest, Ydb::Operations::Operation>>; | ||
|
|
||
| class TQueryExecuteScript : public TQueryExecuteScriptRpc { | ||
| public: | ||
| using TBase = TQueryExecuteScriptRpc; | ||
|
|
||
| TQueryExecuteScript(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev) | ||
| : TBase(viewer, ev) | ||
| { | ||
| AllowedMethods = {HTTP_METHOD_POST}; | ||
| } | ||
|
|
||
| static YAML::Node GetSwagger() { | ||
| YAML::Node node = YAML::Load(R"___( | ||
| post: | ||
| tags: | ||
| - script query | ||
| summary: Execute script | ||
| description: Execute script | ||
| requestBody: | ||
| required: true | ||
| content: | ||
| application/json: | ||
| schema: | ||
| type: object | ||
| properties: | ||
| database: | ||
| type: string | ||
| required: true | ||
| script_content: | ||
| type: object | ||
| properties: | ||
| text: | ||
| type: string | ||
| description: query text | ||
| required: true | ||
| syntax: | ||
| type: string | ||
| description: | | ||
| syntax: | ||
| * `SYNTAX_YQL_V1` | ||
| * `SYNTAX_PG` | ||
| required: false | ||
| exec_mode: | ||
| type: string | ||
| description: | | ||
| exec_mode: | ||
| * `EXEC_MODE_PARSE` | ||
| * `EXEC_MODE_VALIDATE` | ||
| * `EXEC_MODE_EXPLAIN` | ||
| * `EXEC_MODE_EXECUTE` | ||
| required: true | ||
| responses: | ||
| 200: | ||
| description: OK | ||
| content: | ||
| application/json: | ||
| schema: {} | ||
| 400: | ||
| description: Bad Request | ||
| 403: | ||
| description: Forbidden | ||
| 504: | ||
| description: Gateway Timeout | ||
| )___"); | ||
| node["get"]["responses"]["200"]["content"]["application/json"]["schema"] = TProtoToYaml::ProtoToYamlSchema<Ydb::Operations::Operation>(); | ||
| return node; | ||
| } | ||
| }; | ||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| #pragma once | ||
| #include "json_local_rpc.h" | ||
| #include <ydb/core/grpc_services/rpc_calls.h> | ||
| #include <ydb/core/viewer/yaml/yaml.h> | ||
| #include <ydb/public/api/grpc/ydb_query_v1.grpc.pb.h> | ||
|
|
||
| namespace NKikimr::NViewer { | ||
|
|
||
| using TQueryFetchScriptRpc = TJsonLocalRpc<Ydb::Query::FetchScriptResultsRequest, | ||
| Ydb::Query::FetchScriptResultsResponse, | ||
| Ydb::Query::FetchScriptResultsResponse, | ||
| Ydb::Query::V1::QueryService, | ||
| NKikimr::NGRpcService::TGrpcRequestNoOperationCall<Ydb::Query::FetchScriptResultsRequest, Ydb::Query::FetchScriptResultsResponse>>; | ||
|
|
||
| class TQueryFetchScript : public TQueryFetchScriptRpc { | ||
| public: | ||
| using TBase = TQueryFetchScriptRpc; | ||
|
|
||
| TQueryFetchScript(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev) | ||
| : TBase(viewer, ev) | ||
| { | ||
| AllowedMethods = {HTTP_METHOD_GET}; | ||
| } | ||
|
|
||
| static YAML::Node GetSwagger() { | ||
| YAML::Node node = YAML::Load(R"___( | ||
| get: | ||
| tags: | ||
| - script query | ||
| summary: Get operation | ||
| description: Check status for a given operation | ||
| parameters: | ||
| - name: database | ||
| in: query | ||
| description: database name | ||
| required: true | ||
| type: string | ||
| - name: operation_id | ||
| in: query | ||
| description: operation id | ||
| required: true | ||
| type: string | ||
| - name: result_set_index | ||
| in: query | ||
| description: result set index | ||
| required: false | ||
| type: string | ||
| - name: fetch_token | ||
| in: query | ||
| description: fetch token | ||
| required: false | ||
| type: string | ||
| - name: rows_limit | ||
| in: query | ||
| description: rows limit (less than 1000 allowed) | ||
| required: false | ||
| type: string | ||
StekPerepolnen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| responses: | ||
| 200: | ||
| description: OK | ||
| content: | ||
| application/json: | ||
| schema: {} | ||
| 400: | ||
| description: Bad Request | ||
| 403: | ||
| description: Forbidden | ||
| 504: | ||
| description: Gateway Timeout | ||
| )___"); | ||
| node["get"]["responses"]["200"]["content"]["application/json"]["schema"] = TProtoToYaml::ProtoToYamlSchema<Ydb::Query::FetchScriptResultsResponse>(); | ||
| return node; | ||
| } | ||
| }; | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dcherednik have you seen this?