Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ApiTest.Interrupt #4789

Merged
merged 3 commits into from
Jan 26, 2025
Merged

Fix ApiTest.Interrupt #4789

merged 3 commits into from
Jan 26, 2025

Conversation

royi-luo
Copy link
Collaborator

Description

It's possible for the connection thread to not start until after interrupt() is called, which clears the interrupt flag. Add a new thread that repeatedly calls interrupt() until the query terminates.

Fixes #4431

Contributor agreement

@royi-luo royi-luo self-assigned this Jan 24, 2025
Copy link

codecov bot commented Jan 24, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.34%. Comparing base (95759e1) to head (0cbb093).
Report is 5 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4789      +/-   ##
==========================================
+ Coverage   86.33%   86.34%   +0.01%     
==========================================
  Files        1399     1399              
  Lines       60296    60412     +116     
  Branches     7417     7429      +12     
==========================================
+ Hits        52057    52165     +108     
- Misses       8073     8081       +8     
  Partials      166      166              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

Benchmark Result

Master commit hash: a365e5b4da27dcab5f679946e6630dc6e2bf0dc6
Branch commit hash: ad3dd2922efb870c4a0dd332d58303d36f570305

Query Group Query Name Mean Time - Commit (ms) Mean Time - Master (ms) Diff
aggregation q24 688.38 699.28 -10.90 (-1.56%)
aggregation q28 6118.17 6093.27 24.90 (0.41%)
filter q14 128.74 126.01 2.73 (2.17%)
filter q15 129.18 123.58 5.61 (4.54%)
filter q16 306.62 309.69 -3.07 (-0.99%)
filter q17 446.67 444.83 1.84 (0.41%)
filter q18 1953.34 1950.48 2.86 (0.15%)
filter zonemap-node 89.10 89.76 -0.66 (-0.73%)
filter zonemap-node-lhs-cast 89.63 88.83 0.80 (0.90%)
filter zonemap-node-null 86.29 85.98 0.31 (0.36%)
filter zonemap-rel 5744.63 5742.45 2.19 (0.04%)
fixed_size_expr_evaluator q07 572.65 574.38 -1.72 (-0.30%)
fixed_size_expr_evaluator q08 803.37 802.20 1.17 (0.15%)
fixed_size_expr_evaluator q09 801.07 803.79 -2.71 (-0.34%)
fixed_size_expr_evaluator q10 237.05 237.68 -0.63 (-0.27%)
fixed_size_expr_evaluator q11 230.03 231.10 -1.07 (-0.46%)
fixed_size_expr_evaluator q12 225.72 229.81 -4.09 (-1.78%)
fixed_size_expr_evaluator q13 1452.01 1450.71 1.30 (0.09%)
fixed_size_seq_scan q23 112.73 109.82 2.91 (2.65%)
join q29 624.97 573.25 51.72 (9.02%)
join q30 10006.52 10836.25 -829.73 (-7.66%)
join q31 4.81 7.79 -2.97 (-38.19%)
join SelectiveTwoHopJoin 45.24 59.50 -14.26 (-23.97%)
ldbc_snb_ic q35 2595.22 2587.33 7.89 (0.31%)
ldbc_snb_ic q36 459.27 474.32 -15.05 (-3.17%)
ldbc_snb_is q32 5.48 4.37 1.11 (25.29%)
ldbc_snb_is q33 16.27 11.78 4.49 (38.09%)
ldbc_snb_is q34 1.31 1.48 -0.16 (-11.12%)
multi-rel multi-rel-large-scan 1331.19 1500.82 -169.63 (-11.30%)
multi-rel multi-rel-lookup 31.13 42.07 -10.94 (-26.01%)
multi-rel multi-rel-small-scan 90.99 91.33 -0.34 (-0.37%)
order_by q25 134.13 133.90 0.22 (0.17%)
order_by q26 450.51 450.30 0.21 (0.05%)
order_by q27 1484.96 1485.91 -0.94 (-0.06%)
recursive_join recursive-join-bidirection 308.97 308.18 0.79 (0.26%)
recursive_join recursive-join-dense 7473.91 7517.04 -43.13 (-0.57%)
recursive_join recursive-join-path 23765.52 23821.20 -55.69 (-0.23%)
recursive_join recursive-join-sparse 1054.39 1059.91 -5.51 (-0.52%)
recursive_join recursive-join-trail 7462.12 7416.03 46.10 (0.62%)
scan_after_filter q01 171.49 170.55 0.94 (0.55%)
scan_after_filter q02 157.63 157.44 0.19 (0.12%)
shortest_path_ldbc100 q37 94.37 91.69 2.68 (2.92%)
shortest_path_ldbc100 q38 376.51 391.14 -14.62 (-3.74%)
shortest_path_ldbc100 q39 66.40 66.88 -0.48 (-0.72%)
shortest_path_ldbc100 q40 458.35 403.44 54.90 (13.61%)
var_size_expr_evaluator q03 2135.70 2105.19 30.52 (1.45%)
var_size_expr_evaluator q04 2241.95 2246.36 -4.40 (-0.20%)
var_size_expr_evaluator q05 2635.52 2632.18 3.34 (0.13%)
var_size_expr_evaluator q06 1359.55 1356.76 2.79 (0.21%)
var_size_seq_scan q19 1474.12 1476.61 -2.50 (-0.17%)
var_size_seq_scan q20 2634.98 2631.76 3.22 (0.12%)
var_size_seq_scan q21 2305.09 2289.13 15.96 (0.70%)
var_size_seq_scan q22 128.63 128.94 -0.30 (-0.23%)

@royi-luo royi-luo requested a review from mewim January 24, 2025 20:00
Copy link

Benchmark Result

Master commit hash: b50f21551983bd60f3836d541c475ee7511af80b
Branch commit hash: 2fa4283891c53ae23e2353e868d0ce9f4e749033

Query Group Query Name Mean Time - Commit (ms) Mean Time - Master (ms) Diff
aggregation q24 689.04 690.77 -1.73 (-0.25%)
aggregation q28 6081.48 6087.34 -5.86 (-0.10%)
filter q14 125.73 127.56 -1.83 (-1.43%)
filter q15 130.88 126.75 4.13 (3.26%)
filter q16 303.84 303.59 0.25 (0.08%)
filter q17 452.69 449.26 3.43 (0.76%)
filter q18 1920.18 1924.67 -4.50 (-0.23%)
filter zonemap-node 88.55 89.07 -0.51 (-0.58%)
filter zonemap-node-lhs-cast 88.75 91.11 -2.36 (-2.59%)
filter zonemap-node-null 85.23 86.47 -1.24 (-1.43%)
filter zonemap-rel 5751.70 5752.83 -1.13 (-0.02%)
fixed_size_expr_evaluator q07 572.06 572.02 0.04 (0.01%)
fixed_size_expr_evaluator q08 803.35 799.23 4.12 (0.52%)
fixed_size_expr_evaluator q09 801.42 803.03 -1.61 (-0.20%)
fixed_size_expr_evaluator q10 236.93 284.50 -47.58 (-16.72%)
fixed_size_expr_evaluator q11 229.68 230.19 -0.51 (-0.22%)
fixed_size_expr_evaluator q12 226.84 226.72 0.12 (0.05%)
fixed_size_expr_evaluator q13 1459.04 1459.61 -0.57 (-0.04%)
fixed_size_seq_scan q23 114.27 109.09 5.18 (4.75%)
join q29 644.78 592.99 51.78 (8.73%)
join q30 10050.63 10144.82 -94.19 (-0.93%)
join q31 6.87 5.92 0.94 (15.89%)
join SelectiveTwoHopJoin 51.56 55.12 -3.56 (-6.45%)
ldbc_snb_ic q35 2525.53 2587.62 -62.09 (-2.40%)
ldbc_snb_ic q36 455.54 464.75 -9.21 (-1.98%)
ldbc_snb_is q32 5.52 5.93 -0.41 (-6.94%)
ldbc_snb_is q33 12.45 14.90 -2.45 (-16.43%)
ldbc_snb_is q34 1.30 1.49 -0.19 (-12.54%)
multi-rel multi-rel-large-scan 1299.89 1461.80 -161.92 (-11.08%)
multi-rel multi-rel-lookup 17.68 18.62 -0.94 (-5.05%)
multi-rel multi-rel-small-scan 63.92 104.59 -40.67 (-38.88%)
order_by q25 138.83 137.67 1.16 (0.84%)
order_by q26 458.60 456.69 1.91 (0.42%)
order_by q27 1468.21 1460.87 7.35 (0.50%)
recursive_join recursive-join-bidirection 290.52 294.94 -4.42 (-1.50%)
recursive_join recursive-join-dense 7342.68 7306.98 35.70 (0.49%)
recursive_join recursive-join-path 23701.30 23732.76 -31.45 (-0.13%)
recursive_join recursive-join-sparse 1057.69 1060.79 -3.10 (-0.29%)
recursive_join recursive-join-trail 7284.55 7282.06 2.50 (0.03%)
scan_after_filter q01 172.29 169.72 2.58 (1.52%)
scan_after_filter q02 158.75 156.09 2.66 (1.70%)
shortest_path_ldbc100 q37 82.74 87.44 -4.70 (-5.37%)
shortest_path_ldbc100 q38 380.13 353.20 26.93 (7.63%)
shortest_path_ldbc100 q39 61.77 69.41 -7.64 (-11.00%)
shortest_path_ldbc100 q40 475.10 421.92 53.18 (12.60%)
var_size_expr_evaluator q03 2103.96 2107.91 -3.95 (-0.19%)
var_size_expr_evaluator q04 2219.90 2219.67 0.23 (0.01%)
var_size_expr_evaluator q05 2658.35 2651.49 6.86 (0.26%)
var_size_expr_evaluator q06 1337.99 1337.24 0.75 (0.06%)
var_size_seq_scan q19 1460.28 1457.04 3.24 (0.22%)
var_size_seq_scan q20 2661.70 2659.56 2.14 (0.08%)
var_size_seq_scan q21 2283.19 2274.17 9.02 (0.40%)
var_size_seq_scan q22 124.63 125.57 -0.94 (-0.75%)

@royi-luo royi-luo merged commit b6b27ab into master Jan 26, 2025
24 of 25 checks passed
@royi-luo royi-luo deleted the royi/fix-api-interrupt-test branch January 26, 2025 01:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: API Interrupt test fails on CI
3 participants