Skip to content

Commit 6d7e7a5

Browse files
committed
Fixes
1 parent dfe426d commit 6d7e7a5

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

ydb/core/grpc_services/query/rpc_execute_query.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
260260
.SetUseCancelAfter(false)
261261
.SetSyntax(syntax)
262262
.SetSupportStreamTrailingResult(true)
263-
.SetOutputChunkMaxSize(req->response_part_limit_bytes());
263+
.SetOutputChunkMaxSize(req->response_part_limit_bytes())
264+
.SetCollectFullDiagnostics(req->Getcollect_full_diagnostics());
264265

265266
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>(
266267
QueryAction,
@@ -276,8 +277,7 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
276277
cachePolicy,
277278
nullptr, // operationParams
278279
settings,
279-
req->pool_id(),
280-
req->Getcollect_full_diagnostics());
280+
req->pool_id());
281281

282282
if (!ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, 0, Span_.GetTraceId())) {
283283
NYql::TIssues issues;

ydb/core/grpc_services/rpc_execute_data_query.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,7 @@ class TExecuteDataQueryRPC : public TRpcKqpRequestActor<TExecuteDataQueryRPC, TE
146146
req->collect_stats(),
147147
req->has_query_cache_policy() ? &req->query_cache_policy() : nullptr,
148148
req->has_operation_params() ? &req->operation_params() : nullptr,
149-
NKqp::NPrivateEvents::TQueryRequestSettings(),
150-
"",
151-
req->Getcollect_full_diagnostics());
149+
NKqp::NPrivateEvents::TQueryRequestSettings().SetCollectFullDiagnostics(req->Getcollect_full_diagnostics()));
152150

153151
ReportCostInfo_ = req->operation_params().report_cost_info() == Ydb::FeatureFlag::ENABLED;
154152

ydb/core/kqp/common/events/query.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,17 @@ struct TQueryRequestSettings {
4545
return *this;
4646
}
4747

48+
TQueryRequestSettings& SetCollectFullDiagnostics(bool flag) {
49+
CollectFullDiagnostics = flag;
50+
return *this;
51+
}
52+
4853
ui64 OutputChunkMaxSize = 0;
4954
bool KeepSession = false;
5055
bool UseCancelAfter = true;
5156
::Ydb::Query::Syntax Syntax = Ydb::Query::Syntax::SYNTAX_UNSPECIFIED;
5257
bool SupportsStreamTrailingResult = false;
58+
bool CollectFullDiagnostics = false;
5359
};
5460

5561
struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents::EvQueryRequest> {
@@ -68,8 +74,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
6874
const ::Ydb::Table::QueryCachePolicy* queryCachePolicy,
6975
const ::Ydb::Operations::OperationParams* operationParams,
7076
const TQueryRequestSettings& querySettings = TQueryRequestSettings(),
71-
const TString& poolId = "",
72-
std::optional<bool> collectFullDiagnostics = std::nullopt);
77+
const TString& poolId = "");
7378

7479
TEvQueryRequest() {
7580
Record.MutableRequest()->SetUsePublicResponseDataFormat(true);
@@ -283,7 +288,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
283288
}
284289

285290
bool GetCollectDiagnostics() const {
286-
return CollectFullDiagnostics.has_value() ? CollectFullDiagnostics.value() : Record.GetRequest().GetCollectDiagnostics();
291+
return QuerySettings.CollectFullDiagnostics;
287292
}
288293

289294
ui32 CalculateSerializedSize() const override {
@@ -396,7 +401,6 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
396401
TIntrusivePtr<TUserRequestContext> UserRequestContext;
397402
TDuration ProgressStatsPeriod;
398403
std::optional<NResourcePool::TPoolSettings> PoolConfig;
399-
std::optional<bool> CollectFullDiagnostics = std::nullopt;
400404
};
401405

402406
struct TEvDataQueryStreamPart: public TEventPB<TEvDataQueryStreamPart,

ydb/core/kqp/common/kqp_event_impl.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ TEvKqp::TEvQueryRequest::TEvQueryRequest(
1919
const ::Ydb::Table::QueryCachePolicy* queryCachePolicy,
2020
const ::Ydb::Operations::OperationParams* operationParams,
2121
const TQueryRequestSettings& querySettings,
22-
const TString& poolId,
23-
std::optional<bool> collectFullDiagnostics)
22+
const TString& poolId)
2423
: RequestCtx(ctx)
2524
, RequestActorId(requestActorId)
2625
, Database(CanonizePath(ctx->GetDatabaseName().GetOrElse("")))
@@ -36,7 +35,6 @@ TEvKqp::TEvQueryRequest::TEvQueryRequest(
3635
, QueryCachePolicy(queryCachePolicy)
3736
, HasOperationParams(operationParams)
3837
, QuerySettings(querySettings)
39-
, CollectFullDiagnostics(collectFullDiagnostics)
4038
{
4139
if (HasOperationParams) {
4240
OperationTimeout = GetDuration(operationParams->operation_timeout());
@@ -109,9 +107,7 @@ void TEvKqp::TEvQueryRequest::PrepareRemote() const {
109107
Record.MutableRequest()->SetIsInternalCall(RequestCtx->IsInternalCall());
110108
Record.MutableRequest()->SetOutputChunkMaxSize(QuerySettings.OutputChunkMaxSize);
111109

112-
if (CollectFullDiagnostics.has_value()) {
113-
Record.MutableRequest()->SetCollectDiagnostics(CollectFullDiagnostics.value());
114-
}
110+
Record.MutableRequest()->SetCollectDiagnostics(QuerySettings.CollectFullDiagnostics);
115111

116112
RequestCtx.reset();
117113
}

0 commit comments

Comments
 (0)