Skip to content

Commit 58d4f41

Browse files
committed
fixes
1 parent a42d963 commit 58d4f41

6 files changed

+191
-108
lines changed

ydb/core/kafka_proxy/actors/kafka_balance_actor_sql.cpp

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,19 @@ const TString UPDATE_GROUP = R"sql(
5858
AND consumer_group = $ConsumerGroup;
5959
)sql";
6060

61+
const TString UPDATE_GROUP_STATE = R"sql(
62+
--!syntax_v1
63+
DECLARE $ConsumerGroup AS Utf8;
64+
DECLARE $Database AS Utf8;
65+
DECLARE $State AS Uint64;
66+
67+
UPDATE `%s`
68+
SET
69+
state = $State
70+
WHERE database = $Database
71+
AND consumer_group = $ConsumerGroup;
72+
)sql";
73+
6174
const TString UPDATE_GROUP_STATE_AND_PROTOCOL = R"sql(
6275
--!syntax_v1
6376
DECLARE $ConsumerGroup AS Utf8;
@@ -184,16 +197,16 @@ const TString CHECK_DEAD_MEMBERS = R"sql(
184197
DECLARE $ConsumerGroup AS Utf8;
185198
DECLARE $Generation AS Uint64;
186199
DECLARE $Database AS Utf8;
187-
DECLARE $Deadline AS Datetime;
188200
DECLARE $MemberId AS Utf8;
189201
190-
SELECT COUNT(1) as cnt
202+
SELECT heartbeat_deadline
191203
FROM `%s`
192204
VIEW idx_group_generation_db_hb
193205
WHERE database = $Database
194-
AND consumer_group = $ConsumerGroup
195-
AND generation = $Generation
196-
AND heartbeat_deadline < $Deadline;
206+
AND consumer_group = $ConsumerGroup
207+
AND generation = $Generation
208+
ORDER BY heartbeat_deadline
209+
LIMIT 1;
197210
198211
SELECT session_timeout_ms
199212
FROM `%s`
@@ -246,8 +259,12 @@ const TString UPDATE_LASTHEARTBEAT_TO_LEAVE_GROUP = R"sql(
246259

247260
const TString CHECK_GROUPS_COUNT = R"sql(
248261
--!syntax_v1
262+
DECLARE $GroupsCountCheckDeadline AS Datetime;
263+
249264
SELECT COUNT(1) as groups_count
250265
FROM `%s`
266+
VIEW idx_last_hb
267+
WHERE last_heartbeat_time > $GroupsCountCheckDeadline;
251268
)sql";
252269

253270
} // namespace NKafka

0 commit comments

Comments
 (0)