Commit 2e873f0
Merge main; reconcile sf rename with periodic sync
Merge main (PR #67, keep SF slot locked until manager worker quiesces,
plus its periodic-durability work) into the branch that renames
sf_max_bytes to sf_max_segment_bytes. The merge base is one commit
behind on each side, so every conflict is this branch's rename landing
on top of #67's edits; each was resolved by keeping main's semantic
change and re-applying the rename.
Conflict resolutions:
- Sender.java (3 spots): kept main's reworded comment and its new
actualSfSyncIntervalNanos argument threaded into the CursorSendEngine
constructor and startOrphanDrainers, with the identifiers renamed to
actualSfMaxSegmentBytes / sfMaxSegmentBytes.
- SegmentRing.java: took main's version wholesale. The only line this
branch changed here was a comment that #67's recover() rewrite
deleted, so main's file already reflects the intended state.
- SfFromConfigTest.java: kept main's four new testSfSyncInterval*
methods and renamed the trailing method to
testSfMaxSegmentBytesAcceptsSizeSuffixes.
- SegmentRingTest.java: kept main's Javadoc wording (it matches the
deterministic comparison-count assertion) and applied the rename.
Verified no conflict markers or stale sf_max_bytes spellings remain,
and that the merged call sites resolve against the five-argument
CursorSendEngine constructor and startOrphanDrainers overload.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>100 files changed
Lines changed: 23745 additions & 2050 deletions
File tree
- core/src
- main
- c
- windows
- java/io/questdb/client
- cutlass
- http/client
- qwp/client
- sf/cursor
- impl
- network
- std
- test/java/io/questdb/client/test
- cutlass/qwp
- client
- sf
- cursor
- websocket
- impl
- network
- std
- examples/src/main/java/com/example/sender
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
145 | | - | |
146 | | - | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
147 | 148 | | |
148 | 149 | | |
149 | 150 | | |
| |||
259 | 260 | | |
260 | 261 | | |
261 | 262 | | |
262 | | - | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
263 | 266 | | |
264 | 267 | | |
265 | 268 | | |
| |||
439 | 442 | | |
440 | 443 | | |
441 | 444 | | |
442 | | - | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
443 | 449 | | |
444 | 450 | | |
445 | 451 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
68 | 75 | | |
69 | 76 | | |
70 | 77 | | |
| |||
124 | 131 | | |
125 | 132 | | |
126 | 133 | | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
127 | 149 | | |
128 | 150 | | |
129 | 151 | | |
| |||
236 | 258 | | |
237 | 259 | | |
238 | 260 | | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
239 | 273 | | |
240 | 274 | | |
241 | 275 | | |
| |||
354 | 388 | | |
355 | 389 | | |
356 | 390 | | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
131 | 137 | | |
132 | 138 | | |
133 | 139 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
9 | 15 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
80 | | - | |
81 | 80 | | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
82 | 85 | | |
| 86 | + | |
83 | 87 | | |
84 | 88 | | |
| 89 | + | |
85 | 90 | | |
86 | 91 | | |
87 | 92 | | |
| |||
103 | 108 | | |
104 | 109 | | |
105 | 110 | | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
106 | 120 | | |
107 | 121 | | |
108 | 122 | | |
| |||
215 | 229 | | |
216 | 230 | | |
217 | 231 | | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
218 | 278 | | |
219 | 279 | | |
220 | 280 | | |
| |||
300 | 360 | | |
301 | 361 | | |
302 | 362 | | |
303 | | - | |
304 | 363 | | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
305 | 367 | | |
| 368 | + | |
306 | 369 | | |
307 | 370 | | |
| 371 | + | |
308 | 372 | | |
309 | 373 | | |
310 | | - | |
311 | 374 | | |
| 375 | + | |
312 | 376 | | |
| 377 | + | |
313 | 378 | | |
314 | 379 | | |
| 380 | + | |
315 | 381 | | |
316 | 382 | | |
317 | 383 | | |
| |||
331 | 397 | | |
332 | 398 | | |
333 | 399 | | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
334 | 414 | | |
335 | 415 | | |
336 | 416 | | |
| |||
340 | 420 | | |
341 | 421 | | |
342 | 422 | | |
343 | | - | |
344 | 423 | | |
| 424 | + | |
345 | 425 | | |
| 426 | + | |
346 | 427 | | |
347 | 428 | | |
| 429 | + | |
348 | 430 | | |
349 | 431 | | |
350 | 432 | | |
| |||
373 | 455 | | |
374 | 456 | | |
375 | 457 | | |
376 | | - | |
377 | 458 | | |
| 459 | + | |
378 | 460 | | |
| 461 | + | |
379 | 462 | | |
380 | 463 | | |
| 464 | + | |
381 | 465 | | |
382 | 466 | | |
383 | 467 | | |
| |||
395 | 479 | | |
396 | 480 | | |
397 | 481 | | |
398 | | - | |
399 | | - | |
400 | 482 | | |
| 483 | + | |
401 | 484 | | |
| 485 | + | |
| 486 | + | |
402 | 487 | | |
403 | 488 | | |
| 489 | + | |
| 490 | + | |
404 | 491 | | |
405 | 492 | | |
406 | 493 | | |
| |||
438 | 525 | | |
439 | 526 | | |
440 | 527 | | |
441 | | - | |
442 | 528 | | |
| 529 | + | |
443 | 530 | | |
| 531 | + | |
444 | 532 | | |
445 | 533 | | |
| 534 | + | |
446 | 535 | | |
447 | 536 | | |
448 | 537 | | |
449 | 538 | | |
450 | 539 | | |
451 | 540 | | |
452 | 541 | | |
453 | | - | |
454 | 542 | | |
| 543 | + | |
455 | 544 | | |
| 545 | + | |
456 | 546 | | |
457 | 547 | | |
458 | 548 | | |
| 549 | + | |
459 | 550 | | |
460 | 551 | | |
461 | 552 | | |
| |||
615 | 706 | | |
616 | 707 | | |
617 | 708 | | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
0 commit comments