Sql benchmark sync updated queries

[Omega359]

Which issue does this PR close?

• Part of [EPIC] Add SQL based benchmarking #21706

Rationale for this change

Updated sql queries to match existing benchmark queries, mostly #22885 and #24050

What changes are included in this PR?

sql benchmark query updates.

Are these changes tested?

Yes

Are there any user-facing changes?

No

[codecov-commenter]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.38%. Comparing base (5134a1a) to head (f934bed).

Additional details and impacted files

@@            Coverage Diff             @@
##             main   #24583      +/-   ##
==========================================
- Coverage   81.38%   81.38%   -0.01%     
==========================================
  Files        1116     1116              
  Lines      397960   397960              
  Branches   397960   397960              
==========================================
- Hits       323880   323875       -5     
- Misses      55120    55124       +4     
- Partials    18960    18961       +1     

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

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.