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

cats: fixes BigSqlQuery header fetching #1746

Merged
merged 3 commits into from Mar 27, 2024
Merged

Conversation

joergsteffens
Copy link
Member

@joergsteffens joergsteffens commented Mar 25, 2024

BigSqlQuery fetches data in 100 row chunks.
This change makes sure, that subsequent chunks
also have valid header information.

Fixes: https://bugs.bareos.org/view.php?id=1007 JSON API: 'list files' returns malformed json

OP#5753

Thank you for contributing to the Bareos Project!

Backport of PR #0000 to bareos-2x (remove this line if this is no backport; for backport use cherry-pick -x)

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
    Check backport line
  • Required backport PRs have been created
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR
Tests
  • Decision taken that a test is required (if not, then remove this paragraph)
  • The choice of the type of test (unit test or systemtest) is reasonable
  • Testname matches exactly what is being tested
  • On a fail, output of the test leads quickly to the origin of the fault

Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

Great work! I requested some changes below. I think we can also easily add a test for this.

Having the tmp/file-list contain tmp/data twice is enough to get over the 100 file mark. Afterwards we can check if a list files outputs the correct headers.

core/src/cats/postgresql.cc Outdated Show resolved Hide resolved
core/src/cats/postgresql.cc Outdated Show resolved Hide resolved
core/src/cats/postgresql.cc Outdated Show resolved Hide resolved
Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

I added some feedback to your test.

systemtests/tests/python-bareos/test_list_command.py Outdated Show resolved Hide resolved
Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

Thanks for your work. I added some comments. Feel free to ignore them.

systemtests/tests/python-bareos/test_list_command.py Outdated Show resolved Hide resolved
core/src/cats/sql.cc Outdated Show resolved Hide resolved
joergsteffens and others added 3 commits March 27, 2024 15:00
BigSqlQuery fetches data in 100 row chunks.
This change makes sure, that subsequent chunks
also have valid header information.

Fixes: #1007: JSON API: 'list files' returns malformed json

Co-authored-by: Sebastian Sura <124262655+sebsura@users.noreply.github.com>
Co-authored-by: Sebastian Sura <124262655+sebsura@users.noreply.github.com>
@BareosBot BareosBot merged commit faec48b into master Mar 27, 2024
@BareosBot BareosBot deleted the dev/joergs/master/listfiles branch March 27, 2024 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants