chore: update data_substrate#159
Merged
thweetkomputer merged 1 commit intoeloqdata:eloq-10.6.10from Feb 9, 2026
Merged
Conversation
thweetkomputer
changed the title
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
WalkthroughBumped Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant Test as Test Script
participant DB as MySQL / Eloq Store
participant Log as Logger
rect rgba(200,200,255,0.5)
Test->>Log: disable logging
end
rect rgba(200,255,200,0.5)
Test->>DB: execute prepared COUNT(*) (query_get_value)
alt success (no errno)
DB-->>Test: return count
else errno 212 (transient conflict)
DB-->>Test: error 212
Test->>Test: decrement retry counter, sleep 0.5s, retry
loop up to 5 times
Test->>DB: retry COUNT(*)
end
alt exhausted
Test->>Test: abort with fatal error
end
end
end
rect rgba(255,200,200,0.5)
Test->>Log: re-enable logging
Test->>Test: echo final count and query
end
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
thweetkomputer
force-pushed
the
update-submodule-zc
branch
from
1ca76c6 to
808e6dc
Compare
thweetkomputer
force-pushed
the
update-submodule-zc
branch
from
410cbac to
a15a60e
Compare
thweetkomputer
changed the title
thweetkomputer
force-pushed
the
update-submodule-zc
branch
from
a15a60e to
bd46c66
Compare
thweetkomputer
changed the title
thweetkomputer
force-pushed
the
update-submodule-zc
branch
3 times, most recently
from
b40b233 to
7b94dbb
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Fix all issues with AI agents
In `@storage/eloq/mysql-test/mono_basic/t/range_split_keycache.test`:
- Around line 31-52: The retry loop currently checks query_get_value and then
has separate if blocks that cause the final if ($mysql_errno) to run even when
$mysql_errno == 212; change the flow in the block using $count_retry,
query_get_value($count_stmt,...), $mysql_errno so that the unexpected-error
branch excludes errno 212 (e.g. convert the final "if ($mysql_errno)" to "else
if ($mysql_errno && $mysql_errno != 212)" or simply make it an "else if" after
the 212-handling branch) and apply the same fix to the other retry blocks at
ranges 80-102, 130-152, and 178-200 to prevent immediate abort on retryable
errno 212.
In `@storage/eloq/mysql-test/mono_multi/t/range_split_keycache.test`:
- Around line 33-54: The retry loop treats errno 212 as an unexpected error
because the final "if ($mysql_errno)" branch runs even when $mysql_errno == 212;
change the logic so the unexpected-error branch excludes 212 (e.g., use "else if
($mysql_errno != 212)" or make it an "else if" after the 212-handling block) in
the loop around query_get_value/$count_stmt/$count_retry so the dec $count_retry
retry path for errno 212 can execute; apply the same change to the other retry
blocks referenced at the other ranges (lines ~82-104, ~132-154, ~180-202) that
use $mysql_errno, dec $*_retry and the unexpected-error die.
Comment on lines
+31
to
+52
| while($count_retry) | ||
| { | ||
| let $count_value= query_get_value($count_stmt, count(*), 1); | ||
| if (!$mysql_errno) | ||
| { | ||
| let $count_retry= 0; | ||
| } | ||
| if ($mysql_errno == 212) | ||
| { | ||
| dec $count_retry; | ||
| if (!$count_retry) | ||
| { | ||
| --enable_abort_on_error | ||
| --die "SELECT COUNT(*) failed with read/write conflict after 5 retries"; | ||
| } | ||
| --sleep 0.5 | ||
| } | ||
| if ($mysql_errno) | ||
| { | ||
| --enable_abort_on_error | ||
| --die "SELECT COUNT(*) failed with unexpected error"; | ||
| } |
There was a problem hiding this comment.
Retry loop still aborts immediately on errno 212.
The final if ($mysql_errno) triggers even when $mysql_errno == 212, so the script dies before any retry. Make the “unexpected error” branch exclude 212 (or convert to else if).
🔧 Suggested fix (apply to each retry block)
- if ($mysql_errno)
+ if ($mysql_errno && $mysql_errno != 212)
{
--enable_abort_on_error
--die "SELECT COUNT(*) failed with unexpected error";
}Also applies to: 80-102, 130-152, 178-200
🤖 Prompt for AI Agents
In `@storage/eloq/mysql-test/mono_basic/t/range_split_keycache.test` around lines
31 - 52, The retry loop currently checks query_get_value and then has separate
if blocks that cause the final if ($mysql_errno) to run even when $mysql_errno
== 212; change the flow in the block using $count_retry,
query_get_value($count_stmt,...), $mysql_errno so that the unexpected-error
branch excludes errno 212 (e.g. convert the final "if ($mysql_errno)" to "else
if ($mysql_errno && $mysql_errno != 212)" or simply make it an "else if" after
the 212-handling branch) and apply the same fix to the other retry blocks at
ranges 80-102, 130-152, and 178-200 to prevent immediate abort on retryable
errno 212.
Comment on lines
+33
to
+54
| while($count_retry) | ||
| { | ||
| let $count_value= query_get_value($count_stmt, count(*), 1); | ||
| if (!$mysql_errno) | ||
| { | ||
| let $count_retry= 0; | ||
| } | ||
| if ($mysql_errno == 212) | ||
| { | ||
| dec $count_retry; | ||
| if (!$count_retry) | ||
| { | ||
| --enable_abort_on_error | ||
| --die "SELECT COUNT(*) failed with read/write conflict after 5 retries"; | ||
| } | ||
| --sleep 0.5 | ||
| } | ||
| if ($mysql_errno) | ||
| { | ||
| --enable_abort_on_error | ||
| --die "SELECT COUNT(*) failed with unexpected error"; | ||
| } |
There was a problem hiding this comment.
Retry loop still aborts immediately on errno 212.
The generic error branch fires for 212, so the retry never occurs. Gate the “unexpected error” branch to exclude 212 (or use else if).
🔧 Suggested fix (apply to each retry block)
- if ($mysql_errno)
+ if ($mysql_errno && $mysql_errno != 212)
{
--enable_abort_on_error
--die "SELECT COUNT(*) failed with unexpected error";
}Also applies to: 82-104, 132-154, 180-202
🤖 Prompt for AI Agents
In `@storage/eloq/mysql-test/mono_multi/t/range_split_keycache.test` around lines
33 - 54, The retry loop treats errno 212 as an unexpected error because the
final "if ($mysql_errno)" branch runs even when $mysql_errno == 212; change the
logic so the unexpected-error branch excludes 212 (e.g., use "else if
($mysql_errno != 212)" or make it an "else if" after the 212-handling block) in
the loop around query_get_value/$count_stmt/$count_retry so the dec $count_retry
retry path for errno 212 can execute; apply the same change to the other retry
blocks referenced at the other ranges (lines ~82-104, ~132-154, ~180-202) that
use $mysql_errno, dec $*_retry and the unexpected-error die.
e8e70fa to
fc376a1
Compare
thweetkomputer
changed the title
liunyl
approved these changes
Feb 9, 2026
thweetkomputer
force-pushed
the
update-submodule-zc
branch
from
fc376a1 to
449e392
Compare
thweetkomputer
force-pushed
the
update-submodule-zc
branch
from
449e392 to
50e0a3a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit