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

HPCC-32649 Avoid writing any data to an empty compressed file #19108

Merged
merged 1 commit into from
Oct 22, 2024
Merged

HPCC-32649 Avoid writing any data to an empty compressed file #19108

merged 1 commit into from
Oct 22, 2024

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Sep 11, 2024 •
edited
Loading

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@ghalliday ghalliday requested a review from jakesmith September 11, 2024 15:15
@ghalliday
Copy link
Member Author

Push for regression testing.
NOTE: This cannot be merged until all systems that might read these files are upgraded to a compatible version.

@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32649

Jirabot Action Result:
Assigning user: [email protected]
Workflow Transition To: Merge Pending
Updated PR

jakesmith
jakesmith reviewed Sep 13, 2024
View reviewed changes
system/jlib/jlzw.cpp Outdated
trailer.crc = ~0U;
indexbuf.append(sizeof(trailer),&trailer);
//Avoid writing out a header/footer if the file is empty
if (indexbuf.length() != 0)
Copy link
Member

Choose a reason for hiding this comment

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

would testing trailer.expandedSize == 0 be better and mean can avoid call to flush() (on line 2458)

Copy link
Member Author

Choose a reason for hiding this comment

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

flush returns immediately, but I think you're right it would be clearer.

jakesmith
jakesmith reviewed Sep 13, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@ghalliday - 1 question.

Also, perhaps should add a configurable option now (disabled by default), so we can merge the code, but enable it later?

@ghalliday ghalliday changed the base branch from candidate-9.6.x to master September 23, 2024 10:20
@ghalliday ghalliday closed this Sep 23, 2024
@ghalliday ghalliday reopened this Sep 23, 2024
@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32649

Jirabot Action Result:
Workflow Transition To: Merge Pending

@ghalliday ghalliday requested a review from jakesmith October 18, 2024 09:36
@ghalliday
Copy link
Member Author

@jakesmith repushed and rebased.
It now allows the previous functionality to be supported by setting an expert option, but defaulting on for 9.10.x

jakesmith
jakesmith approved these changes Oct 18, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@ghalliday - looks good.

system/jlib/jlzw.cpp Outdated
}
catch (IException *e) // handle cases where config. not available
{
EXCLOG(e, "doRename");
Copy link
Member

Choose a reason for hiding this comment

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

"allowZeroSizeCompressedFiles" ?

@ghalliday ghalliday merged commit 00cb373 into hpcc-systems:master Oct 22, 2024
25 checks passed
@github-actions GitHub Actions
Copy link

Jirabot Action Result:
Added fix version: 9.10.0
Workflow Transition: 'Resolve issue'

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

@jakesmith jakesmith jakesmith 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.
2 participants
@ghalliday @jakesmith