Skip to content

Commit 13b048e

Browse files
committed
Fixed kqprun HasResults flag
1 parent d58adb2 commit 13b048e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

ydb/core/kqp/workload_service/common/helpers.h

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ namespace NKikimr::NKqp::NWorkload {
2525
#define LOG_C(stream) LOG_CRIT_S(*TlsActivationContext, NKikimrServices::KQP_WORKLOAD_SERVICE, "[WorkloadService] " << LogPrefix() << stream)
2626

2727

28-
2928
template <typename TDerived>
3029
class TSchemeActorBase : public NActors::TActorBootstrapped<TDerived> {
3130
using TRetryPolicy = IRetryPolicy<bool>;

ydb/tests/tools/kqprun/kqprun.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ struct TExecutionOptions {
5151
}
5252

5353
for (size_t i = 0; i < ExecutionCases.size(); ++i) {
54-
if (i < ScriptQueryActions.size() && ScriptQueryActions[i] != NKikimrKqp::EQueryAction::QUERY_ACTION_EXECUTE) {
54+
if (GetScriptQueryAction(i) != NKikimrKqp::EQueryAction::QUERY_ACTION_EXECUTE) {
5555
continue;
5656
}
5757
if (ExecutionCases[i] != EExecutionCase::AsyncQuery) {
@@ -65,6 +65,10 @@ struct TExecutionOptions {
6565
return GetValue(index, ExecutionCases, EExecutionCase::GenericScript);
6666
}
6767

68+
NKikimrKqp::EQueryAction GetScriptQueryAction(size_t index) const {
69+
return GetValue(index, ScriptQueryActions, NKikimrKqp::EQueryAction::QUERY_ACTION_EXECUTE);
70+
}
71+
6872
NKqpRun::TRequestOptions GetSchemeQueryOptions() const {
6973
return {
7074
.Query = SchemeQuery,
@@ -79,7 +83,7 @@ struct TExecutionOptions {
7983
Y_ABORT_UNLESS(index < ScriptQueries.size());
8084
return {
8185
.Query = ScriptQueries[index],
82-
.Action = GetValue(index, ScriptQueryActions, NKikimrKqp::EQueryAction::QUERY_ACTION_EXECUTE),
86+
.Action = GetScriptQueryAction(index),
8387
.TraceId = TStringBuilder() << GetValue(index, TraceIds, DefaultTraceId) << "-" << startTime.ToString(),
8488
.PoolId = GetValue(index, PoolIds, TString()),
8589
.UserSID = GetValue(index, UserSIDs, TString(BUILTIN_ACL_ROOT))

0 commit comments

Comments
 (0)