Commit f47f855
committed
Merge origin/main into qwip_go
Brings in the mainline QWP work (#66 connect-string key consolidation,
#67 connection recycle) on top of the qwip_go feature branch (delta symbol
dictionary, NACK policy v2, the QuestDB facade, durable-ack).
Conflict resolution notes:
- NACK policy: kept v2 (PolicyRetriable/Terminal + poison-frame detector);
main's PolicyHalt/DropAndContinue is superseded and undefined post-merge.
- Config keys: adopted main's #66 policy per request — sf_max_segment_bytes
rename, canonicalConfigKey aliases, duplicate-key rejection, transaction /
UDP-key handling, and the strict QWP key vocabulary (gorilla,
in_flight_window, token_x/token_y, protocol_version, egress auth are
rejected/removed). Kept ours' orthogonal features (facade pool keys,
durable-ack, connection-listener storage, delta symbol dictionary).
- connect_timeout: combined both branches' edge-case fixes (reject negatives,
floor sub-millisecond positives to 1ms).
- README: dropped the duplicated legacy QWP section in favour of the
reorganized facade-first structure.
go build ./..., go vet ./..., and the unit suite all pass.26 files changed
Lines changed: 713 additions & 525 deletions
File tree
- examples/qwp/sf
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
153 | 154 | | |
154 | 155 | | |
155 | 156 | | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | 157 | | |
174 | 158 | | |
175 | 159 | | |
| |||
210 | 194 | | |
211 | 195 | | |
212 | 196 | | |
213 | | - | |
| 197 | + | |
214 | 198 | | |
215 | 199 | | |
216 | 200 | | |
| |||
295 | 279 | | |
296 | 280 | | |
297 | 281 | | |
298 | | - | |
299 | | - | |
300 | | - | |
301 | | - | |
302 | 282 | | |
303 | 283 | | |
304 | 284 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
396 | 396 | | |
397 | 397 | | |
398 | 398 | | |
399 | | - | |
400 | | - | |
401 | 399 | | |
402 | 400 | | |
403 | 401 | | |
| |||
471 | 469 | | |
472 | 470 | | |
473 | 471 | | |
474 | | - | |
| 472 | + | |
475 | 473 | | |
476 | 474 | | |
477 | 475 | | |
| |||
486 | 484 | | |
487 | 485 | | |
488 | 486 | | |
489 | | - | |
| 487 | + | |
490 | 488 | | |
491 | 489 | | |
492 | 490 | | |
| |||
0 commit comments