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-29385 Allow incremental decompression from lz4 files #17557

Merged
merged 1 commit into from
Jul 6, 2023
Merged

HPCC-29385 Allow incremental decompression from lz4 files #17557

merged 1 commit into from
Jul 6, 2023

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Jul 6, 2023 •
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 July 6, 2023 08:44
@github-actions
Copy link

github-actions bot commented Jul 6, 2023

https://track.hpccsystems.com/browse/HPCC-29385
Jira not updated (user does not match)

jakesmith
jakesmith reviewed Jul 6, 2023
View reviewed changes
system/jlib/jfcmp.hpp Outdated
@@ -20,6 +20,7 @@

#include "platform.h"
#include "jlzw.hpp"
#include "jlzw.ipp"
Copy link
Member

Choose a reason for hiding this comment

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

minor: I don't like ipp's but looks odd that a hpp is including an ipp, could we move CFcmpExpander into the ipp and have that included where needed instead here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I agree, I'll refactor to avoid that.

system/jlib/jlz4.cpp Show resolved Hide resolved
jakesmith
jakesmith reviewed Jul 6, 2023
View reviewed changes
system/jlib/jlz4.cpp Show resolved Hide resolved
system/jlib/jlz4.cpp Show resolved Hide resolved
system/jlib/jlzw.cpp Outdated Show resolved Hide resolved
system/jlib/jlzw.cpp Outdated
//Preallocate the expansion target to the block size - to ensure it is the right size and
//avoid reallocation when expanding lz4
curblockbuf.reserve(trailer.blockSize);
curblockbuf.clear();
Copy link
Member

Choose a reason for hiding this comment

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

should the abobe 2 lines be ensureCapacity ?

Copy link
Member

Choose a reason for hiding this comment

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

blockSize is the compressed block size, but curblockbuf is used to expand into, so it won't be big enough.

Copy link
Member Author

Choose a reason for hiding this comment

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

It will be enough because LZ4 only compresses at most the block size into a single chunk.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, that would be better - I couldn't find that function...despite looking.

jakesmith
jakesmith reviewed Jul 6, 2023
View reviewed changes
system/jlib/jlzw.cpp Outdated
//Start decompressing again and avoid re-reading the data from disk
void * rawData;
if (fileio)
rawData = compressedInputBlock.mem();
Copy link
Member

Choose a reason for hiding this comment

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

could/should use a const void * here , and compressedInputBlock.get() ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I will change

@github-actions
Copy link

github-actions bot commented Jul 6, 2023

https://track.hpccsystems.com/browse/HPCC-29385
Jira updated

@ghalliday ghalliday requested review from arjunachala, mckellyln and jakesmith and removed request for arjunachala July 6, 2023 13:01
jakesmith
jakesmith reviewed Jul 6, 2023
View reviewed changes
system/jlib/jlz4.cpp Outdated
@@ -221,6 +222,66 @@ class jlib_decl CLZ4Expander : public CFcmpExpander
}
}

size32_t expandFirst(MemoryBuffer & target, const void * src)
Copy link
Member

Choose a reason for hiding this comment

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

this and expandNext should have 'virtual' and 'override'

jakesmith
jakesmith reviewed Jul 6, 2023
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 new trivial comment

jakesmith
jakesmith approved these changes Jul 6, 2023
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.

mckellyln
mckellyln approved these changes Jul 6, 2023
View reviewed changes
Copy link
Contributor

@mckellyln mckellyln left a comment

Choose a reason for hiding this comment

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

Looks good.

@ghalliday ghalliday merged commit 3588c80 into hpcc-systems:candidate-9.0.x Jul 6, 2023
7 checks passed
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

@mckellyln mckellyln mckellyln 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
@ghalliday @jakesmith @mckellyln