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.

Sign up for GitHub

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

Jump to bottom

Skip query result from rewritten queries #4633

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Skip query result from rewritten queries #4633

wants to merge 2 commits into from

Conversation

ray6080
Copy link
Contributor

@ray6080 ray6080 commented Dec 14, 2024

Description

Query results from rewritten queries should only be kept as internal one, but not exposed as query result to users.

@ray6080 ray6080 requested a review from acquamarin December 14, 2024 06:55
@codecov Codecov
Copy link

codecov bot commented Dec 14, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 72.72727% with 3 lines in your changes missing coverage. Please review.

Project coverage is 86.53%. Comparing base (2bb28c2) to head (6db3be1).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
src/main/client_context.cpp 75.00% 2 Missing ⚠️
src/include/parser/statement.h 66.66% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #4633      +/-   ##
==========================================
- Coverage   87.46%   86.53%   -0.93%     
==========================================
  Files        1370     1369       -1     
  Lines       57912    57962      +50     
  Branches     7210     7210              
==========================================
- Hits        50651    50157     -494     
- Misses       7092     7637     +545     
+ Partials      169      168       -1

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

@github-actions GitHub Actions
Copy link

Benchmark Result

Master commit hash: 2bb28c28819a081c63229f651b447c7a2653fd54
Branch commit hash: e1aa3d53c267f05e79239444a68afabc2e8ff426

Query Group Query Name Mean Time - Commit (ms) Mean Time - Master (ms) Diff
aggregation q24 646.28 654.40 -8.13 (-1.24%)
aggregation q28 11998.74 12365.31 -366.57 (-2.96%)
filter q14 126.56 133.10 -6.54 (-4.91%)
filter q15 124.34 134.69 -10.36 (-7.69%)
filter q16 303.16 306.93 -3.76 (-1.23%)
filter q17 446.68 455.36 -8.68 (-1.91%)
filter q18 1945.29 1936.22 9.08 (0.47%)
filter zonemap-node 87.30 94.77 -7.47 (-7.88%)
filter zonemap-node-lhs-cast 86.13 94.88 -8.75 (-9.22%)
filter zonemap-rel 5702.04 5415.07 286.97 (5.30%)
fixed_size_expr_evaluator q07 569.04 578.82 -9.79 (-1.69%)
fixed_size_expr_evaluator q08 802.00 806.06 -4.06 (-0.50%)
fixed_size_expr_evaluator q09 803.51 809.88 -6.37 (-0.79%)
fixed_size_expr_evaluator q10 235.40 244.55 -9.14 (-3.74%)
fixed_size_expr_evaluator q11 227.87 237.48 -9.61 (-4.05%)
fixed_size_expr_evaluator q12 225.55 233.86 -8.30 (-3.55%)
fixed_size_expr_evaluator q13 1457.23 1485.24 -28.00 (-1.89%)
fixed_size_seq_scan q23 108.24 125.00 -16.76 (-13.41%)
join q29 600.18 639.31 -39.13 (-6.12%)
join q30 1469.17 1592.03 -122.86 (-7.72%)
join q31 5.64 4.68 0.95 (20.36%)
join SelectiveTwoHopJoin 53.44 55.08 -1.64 (-2.99%)
ldbc_snb_ic q35 2553.62 2663.93 -110.31 (-4.14%)
ldbc_snb_ic q36 557.33 519.73 37.60 (7.23%)
ldbc_snb_is q32 3.20 5.78 -2.58 (-44.61%)
ldbc_snb_is q33 12.84 13.62 -0.78 (-5.74%)
ldbc_snb_is q34 1.03 1.22 -0.19 (-15.40%)
multi-rel multi-rel-large-scan 1293.65 1405.14 -111.48 (-7.93%)
multi-rel multi-rel-lookup 20.71 31.58 -10.87 (-34.43%)
multi-rel multi-rel-small-scan 91.20 89.21 2.00 (2.24%)
order_by q25 132.07 137.18 -5.10 (-3.72%)
order_by q26 450.45 457.64 -7.19 (-1.57%)
order_by q27 1455.83 1465.38 -9.54 (-0.65%)
recursive_join recursive-join-bidirection 303.55 286.09 17.46 (6.10%)
recursive_join recursive-join-dense 7454.52 5568.82 1885.70 (33.86%)
recursive_join recursive-join-path 24221.14 23972.72 248.43 (1.04%)
recursive_join recursive-join-sparse 14906.29 14774.18 132.11 (0.89%)
recursive_join recursive-join-trail 7390.71 6285.52 1105.18 (17.58%)
scan_after_filter q01 169.17 178.31 -9.14 (-5.13%)
scan_after_filter q02 154.72 163.58 -8.86 (-5.42%)
shortest_path_ldbc100 q37 84.86 88.54 -3.68 (-4.15%)
shortest_path_ldbc100 q38 371.88 347.84 24.04 (6.91%)
shortest_path_ldbc100 q39 59.43 59.23 0.20 (0.34%)
shortest_path_ldbc100 q40 442.98 454.80 -11.83 (-2.60%)
var_size_expr_evaluator q03 2060.07 2070.25 -10.19 (-0.49%)
var_size_expr_evaluator q04 2230.04 2231.07 -1.03 (-0.05%)
var_size_expr_evaluator q05 2608.53 2617.03 -8.50 (-0.32%)
var_size_expr_evaluator q06 1350.55 1323.27 27.28 (2.06%)
var_size_seq_scan q19 1444.64 1451.24 -6.60 (-0.45%)
var_size_seq_scan q20 2720.13 2368.65 351.49 (14.84%)
var_size_seq_scan q21 2289.31 2268.49 20.82 (0.92%)
var_size_seq_scan q22 124.15 127.41 -3.26 (-2.56%)

andyfengHKU
andyfengHKU approved these changes Dec 14, 2024
View reviewed changes
Copy link
Contributor

@andyfengHKU andyfengHKU left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests if possible.

src/include/parser/statement.h Outdated
@@ -38,6 +41,7 @@ class Statement {

private:
common::StatementType statementType;
bool skipResult_;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would call this internal_. And also comment, internal statements are those rewritten from input and whose result should not be rendered on client side.

@ray6080
Copy link
Contributor Author

ray6080 commented Dec 16, 2024

Add tests if possible.

There isn’t an easy way to test this at the moment. Currently, it has to go through the shell tests, which I don’t believe is the appropriate category for it. I’d like to refactor the end-to-end tests to execute via query while disabling encoded join and plan enumeration.

@github-actions GitHub Actions
Copy link

Benchmark Result

Master commit hash: 546024954d2d2e97d717c4867d553b139385e570
Branch commit hash: 5f26acc5713745f1c9299899450230d8fc6f9245

Query Group Query Name Mean Time - Commit (ms) Mean Time - Master (ms) Diff
aggregation q24 640.12 642.69 -2.57 (-0.40%)
aggregation q28 12283.02 11474.28 808.74 (7.05%)
filter q14 117.27 125.07 -7.80 (-6.24%)
filter q15 115.51 132.28 -16.77 (-12.68%)
filter q16 290.39 303.64 -13.25 (-4.36%)
filter q17 436.11 447.51 -11.40 (-2.55%)
filter q18 1936.49 1944.07 -7.58 (-0.39%)
filter zonemap-node 80.50 86.30 -5.80 (-6.72%)
filter zonemap-node-lhs-cast 78.05 86.70 -8.64 (-9.97%)
filter zonemap-rel 5694.31 5680.35 13.95 (0.25%)
fixed_size_expr_evaluator q07 565.19 571.89 -6.70 (-1.17%)
fixed_size_expr_evaluator q08 792.86 798.89 -6.03 (-0.76%)
fixed_size_expr_evaluator q09 793.67 799.58 -5.91 (-0.74%)
fixed_size_expr_evaluator q10 227.85 236.02 -8.17 (-3.46%)
fixed_size_expr_evaluator q11 220.65 228.71 -8.06 (-3.52%)
fixed_size_expr_evaluator q12 217.65 225.69 -8.03 (-3.56%)
fixed_size_expr_evaluator q13 1445.75 1455.11 -9.35 (-0.64%)
fixed_size_seq_scan q23 102.34 111.52 -9.19 (-8.24%)
join q29 616.30 638.68 -22.38 (-3.50%)
join q30 1531.52 1680.18 -148.66 (-8.85%)
join q31 4.74 4.32 0.42 (9.80%)
join SelectiveTwoHopJoin 49.41 47.73 1.68 (3.52%)
ldbc_snb_ic q35 2603.41 2572.49 30.91 (1.20%)
ldbc_snb_ic q36 574.52 536.67 37.85 (7.05%)
ldbc_snb_is q32 2.25 4.62 -2.37 (-51.38%)
ldbc_snb_is q33 13.24 13.35 -0.11 (-0.85%)
ldbc_snb_is q34 1.18 0.99 0.19 (19.54%)
multi-rel multi-rel-large-scan 1215.89 1210.72 5.17 (0.43%)
multi-rel multi-rel-lookup 5.37 5.81 -0.44 (-7.59%)
multi-rel multi-rel-small-scan 99.49 92.60 6.89 (7.44%)
order_by q25 119.84 130.48 -10.64 (-8.15%)
order_by q26 464.14 451.03 13.11 (2.91%)
order_by q27 1450.46 1464.89 -14.44 (-0.99%)
recursive_join recursive-join-bidirection 279.37 300.17 -20.80 (-6.93%)
recursive_join recursive-join-dense 7432.30 7431.18 1.13 (0.02%)
recursive_join recursive-join-path 23925.65 23905.50 20.15 (0.08%)
recursive_join recursive-join-sparse 14154.13 14398.28 -244.16 (-1.70%)
recursive_join recursive-join-trail 7378.14 7385.31 -7.17 (-0.10%)
scan_after_filter q01 160.56 171.08 -10.51 (-6.15%)
scan_after_filter q02 147.75 154.58 -6.83 (-4.42%)
shortest_path_ldbc100 q37 90.63 96.54 -5.91 (-6.12%)
shortest_path_ldbc100 q38 364.39 358.38 6.01 (1.68%)
shortest_path_ldbc100 q39 60.54 59.44 1.10 (1.85%)
shortest_path_ldbc100 q40 451.40 450.72 0.67 (0.15%)
var_size_expr_evaluator q03 2075.34 2082.53 -7.18 (-0.34%)
var_size_expr_evaluator q04 2234.64 2241.75 -7.11 (-0.32%)
var_size_expr_evaluator q05 2634.08 2752.47 -118.39 (-4.30%)
var_size_expr_evaluator q06 1319.04 1329.99 -10.95 (-0.82%)
var_size_seq_scan q19 1445.01 1441.34 3.67 (0.25%)
var_size_seq_scan q20 2711.00 2688.68 22.32 (0.83%)
var_size_seq_scan q21 2260.07 2272.37 -12.30 (-0.54%)
var_size_seq_scan q22 121.92 125.13 -3.21 (-2.57%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@acquamarin acquamarin acquamarin approved these changes

@andyfengHKU andyfengHKU andyfengHKU approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ray6080 @andyfengHKU @acquamarin