Commit 5b93645
committed
feat(session): Step 4.A — remove the GENAI:/LLM: query-prefix escape hatches
Per decision Q2 in the GenAI plugin carve-out design doc, the in-line
MySQL-protocol prefixes that bypassed routing, ACLs, and the query
processor are removed. Users reach GenAI features through MCP, admin
SQL, or the REST endpoint -- as the rest of the carve-out finishes,
nothing else needs the in-core GENAI:/LLM: handlers.
Removals:
lib/MySQL_Session.cpp (-933 lines)
- handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_COM_QUERY___genai
- handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_COM_QUERY___llm
- handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___genai_send_async
- handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___handle_genai_response
- genai_cleanup_request
- check_genai_events
- The COM_QUERY prefix-detection block that dispatched to those
handlers
- The check_genai_events poll-loop hook in WAITING_CLIENT_DATA
include/MySQL_Session.h (-67 lines)
- All matching method declarations, with their doxygen
include/Base_Session.h (-15 lines)
- GenAI_PendingRequest struct
- pending_genai_requests_ map
- next_genai_request_id_ counter
- genai_epoll_fd_ per-session epoll fd
lib/Base_Session.cpp (-9 lines)
- The init block that created the per-session genai_epoll_fd_
LLM: was deleted alongside GENAI: even though only GENAI: is named in
the design. They share the same `#ifdef PROXYSQLGENAI` gate, the same
async-genai socketpair plumbing, and the same rationale. Leaving LLM:
behind would have left a half-block referencing functions that no
longer exist; if we want LLM: back later the plugin can re-implement
it (or a more general request-multiplexer ABI extension can land).
The async-genai socketpair protocol (GenAI_RequestHeader /
GenAI_ResponseHeader, defined in include/GenAI_Thread.h) is now
unreferenced from outside lib/GenAI_Thread.cpp itself; those structs
disappear when GenAI_Thread moves to plugins/genai/ in Step 5.
Verified:
- clean rebuild of libproxysql.a + proxysql + ProxySQL_GenAI_Plugin.so
- all 60 unit-test binaries pass
- smoke test: daemon starts, SELECT through admin works, SIGTERM
shuts down cleanly
Net diff: -1010 / +28 lines. Largest deletion of the carve-out so far.1 parent 1656c24 commit 5b93645
4 files changed
Lines changed: 28 additions & 1010 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
116 | 106 | | |
117 | 107 | | |
118 | 108 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
304 | 304 | | |
305 | 305 | | |
306 | 306 | | |
307 | | - | |
308 | | - | |
309 | | - | |
310 | | - | |
311 | | - | |
312 | | - | |
313 | | - | |
314 | | - | |
315 | | - | |
316 | | - | |
317 | | - | |
318 | | - | |
319 | | - | |
320 | | - | |
321 | | - | |
322 | | - | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
323 | 315 | | |
324 | | - | |
325 | | - | |
326 | | - | |
327 | | - | |
328 | | - | |
329 | | - | |
330 | | - | |
331 | | - | |
332 | | - | |
333 | | - | |
334 | | - | |
335 | | - | |
336 | | - | |
337 | | - | |
338 | | - | |
339 | | - | |
340 | | - | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
345 | | - | |
346 | | - | |
347 | | - | |
348 | | - | |
349 | | - | |
350 | | - | |
351 | | - | |
352 | | - | |
353 | | - | |
354 | | - | |
355 | | - | |
356 | | - | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
361 | | - | |
362 | | - | |
363 | | - | |
364 | | - | |
365 | | - | |
366 | | - | |
367 | | - | |
368 | | - | |
369 | | - | |
370 | | - | |
371 | | - | |
372 | | - | |
373 | | - | |
374 | | - | |
375 | 316 | | |
376 | 317 | | |
377 | 318 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
98 | 92 | | |
99 | 93 | | |
100 | 94 | | |
| |||
0 commit comments