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

8265315: Support for CLDR version 41 #8150

Closed
wants to merge 22 commits into from
Closed

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented Apr 7, 2022

This is to upgrade the CLDR data from version 39 to version 41 which was released yesterday. The vast majority of the changes are basically replacing the CLDR data, along with tools/testcase alignments. Here is the link to CLDR v41's release notes: https://cldr.unicode.org/index/downloads/cldr-41


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8150/head:pull/8150
$ git checkout pull/8150

Update a local copy of the PR:
$ git checkout pull/8150
$ git pull https://git.openjdk.java.net/jdk pull/8150/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8150

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8150.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 7, 2022

👋 Welcome back naoto! 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 openjdk bot added the rfr Pull request is ready for review label Apr 7, 2022
@openjdk
Copy link

openjdk bot commented Apr 7, 2022

@naotoj The following labels will be automatically applied to this pull request:

  • build
  • core-libs
  • i18n

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

@openjdk openjdk bot added build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Apr 7, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 7, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 7, 2022

@naotoj 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:

8265315: Support for CLDR version 41

Reviewed-by: joehw, iris, ihse

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 2 new commits pushed to the master branch:

  • eab4c0c: 8283706: Add final or sealed modifier to appropriate javax.swing API classes
  • 3357d9a: 8284588: Remove GensrcCommonLangtools.gmk

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Apr 7, 2022
@magicus
Copy link
Member

magicus commented Apr 8, 2022

Have you checked if this update has any impact on the runtime of the CLDRConverter tool?

@naotoj
Copy link
Member Author

naotoj commented Apr 8, 2022

I measured the execution time of CLDRConverter. Each run measures an average execution time for 5 invocations of CLDRConverter.main(), and I ran it 5 times for java.base and jdk.localedata modules. All average values are in seconds.

  • Before the fix
    • java.base: 11.536 - 12.836
    • jdk.localedata: 19.764 - 22.584
  • After the fix
    • java.base: 11.666 - 12.833
    • jdk.localedata: 19.183 - 20.838

Looking at the results, I don't see any notable tool execution time difference with this change.

@magicus
Copy link
Member

magicus commented Apr 8, 2022

Great, thanks!

@openjdk
Copy link

openjdk bot commented Apr 8, 2022

@naotoj this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout cldr+
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Apr 8, 2022
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Apr 8, 2022
@naotoj
Copy link
Member Author

naotoj commented Apr 11, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Apr 11, 2022

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

  • abfd2f9: 8283710: JVMTI: Use BitSet for object marking
  • 7edd186: 8283507: Create a regression test for RFE 4287690
  • 74835f7: 8283719: java/util/logging/CheckZombieLockTest.java failing intermittently
  • 205cfb8: 8284093: Memory leak: X11SD_DisposeXImage should also free obdata
  • f4edb59: 8284567: Collapse identical catch branches in java.base
  • 40ddb75: 8284641: Doc errors in sun.security.ssl.SSLSessionContextImpl
  • 8ebea44: 8270090: C2: LCM may prioritize CheckCastPP nodes over projections
  • 755bfcb: 8284581: Serial: Remove unused GenCollectedHeap::collect_locked
  • 0c04bf8: 8284198: Undo JDK-8261137: Optimization of Box nodes in uncommon_trap
  • eb3ead9: 8284036: Make ConcurrentHashMap.CollectionView a sealed hierarchy
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/a8c87526027bed750e3dcab78139b49bc0a05f83...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 11, 2022

@naotoj Pushed as commit 523899e.

💡 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
build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants