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

8326099: GZIPOutputStream should use Deflater.getBytesRead() instead of Deflater.getTotalIn() #17900

Closed
wants to merge 2 commits into from

Conversation

eirbjo
Copy link
Contributor

@eirbjo eirbjo commented Feb 17, 2024

Please review this cleanup PR in preparation for deprecating Deflater.getTotalIn() in JDK-8326096.

This PR replaces GZIPOutputStream.writeTrailer's call to Deflater.getTotalIn() with a call to Deflater.getBytesRead() followed by an explicit conversion to "modulo 2^32" (a cast to int) as described in RFC 1952:

 ISIZE (Input SIZE)
  This contains the size of the original (uncompressed) input
  data modulo 2^32.

Testing and verification: This should be trivially verifiable by code inspection. Nevertheless, I wrote a test which writes Integer.MAX_VALUE +1 bytes of uncompressed data and verified that the last four bytes written to the file was indeed as expected. (This test is not included in this PR because of its runtime and resource requirements).


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8326099: GZIPOutputStream should use Deflater.getBytesRead() instead of Deflater.getTotalIn() (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17900/head:pull/17900
$ git checkout pull/17900

Update a local copy of the PR:
$ git checkout pull/17900
$ git pull https://git.openjdk.org/jdk.git pull/17900/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17900

View PR using the GUI difftool:
$ git pr show -t 17900

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17900.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 17, 2024

👋 Welcome back eirbjo! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Feb 17, 2024

@eirbjo The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Feb 17, 2024
@eirbjo eirbjo marked this pull request as ready for review February 17, 2024 12:38
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 17, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 17, 2024

Webrevs

Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

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

Hello Eirik, the change looks OK to me.

For context, the getTotalIn() and getTotalOut() methods are being proposed for deprecation https://mail.openjdk.org/pipermail/core-libs-dev/2024-February/119321.html. getTotalIn() was doing the same (int) getBytesRead() internally, so this change should be OK.

@openjdk
Copy link

openjdk bot commented Feb 19, 2024

@eirbjo This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8326099: GZIPOutputStream should use Deflater.getBytesRead() instead of Deflater.getTotalIn()

Reviewed-by: jpai

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 186 new commits pushed to the master branch:

  • 099b744: 8326117: ProblemList serviceability/jvmti/vthread/SuspendWithInterruptLock/SuspendWithInterruptLock.java#default in Xcomp mode
  • 39627bc: 6510914: JScrollBar.getMinimumSize() breaks the contract of JComponent.setMinimumSize()
  • 7004c27: 8303972: (zipfs) Make test/jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java independent of the zip command line
  • c2d9fa2: 8326000: Remove obsolete comments for class sun.security.ssl.SunJSSE
  • f50df10: 8299023: TestPLABResize.java and TestPLABPromotion.java are failing intermittently
  • cf13086: 8317697: refactor-encapsulate x86 VM_Version::CpuidInfo
  • 3b76372: 8325687: SimpleJavaFileObject specification would benefit from implSpec
  • b5df2f4: 8323170: j2dbench is using outdated javac source/target to be able to build by itself
  • 267780b: 8324680: Replace NULL with nullptr in JVMTI generated code
  • f3073db: 8321408: Add Certainly roots R1 and E1
  • ... and 176 more: https://git.openjdk.org/jdk/compare/692c9f8821e220560927dd6bbedfea9ddfe312f6...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 19, 2024
@eirbjo
Copy link
Contributor Author

eirbjo commented Feb 19, 2024

Hello Eirik, the change looks OK to me.

Thanks for veryfying and adding helpful context!

I'll let this linger just a bit before integrating in case there is any non-correctness feedback, like about the added comment to clarify the modulo 2^32 aspect.

@eirbjo
Copy link
Contributor Author

eirbjo commented Feb 26, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Feb 26, 2024

Going to push as commit bb6b048.
Since your change was applied there have been 267 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 26, 2024
@openjdk openjdk bot closed this Feb 26, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 26, 2024
@openjdk
Copy link

openjdk bot commented Feb 26, 2024

@eirbjo Pushed as commit bb6b048.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants