Skip to content

Conversation

@igraves
Copy link
Member

@igraves igraves commented Feb 18, 2022

Proposed change in behavior to correct inconsistencies between \w and \b metacharacters


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed
  • Change requires a CSR request to be approved

Issues

  • JDK-8264160: Regex \b is not consistent with \w without UNICODE_CHARACTER_CLASS
  • JDK-8282129: Regex \b is not consistent with \w without UNICODE_CHARACTER_CLASS (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7539

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

Using diff file

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

@igraves
Copy link
Member Author

igraves commented Feb 18, 2022

/csr

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 18, 2022

👋 Welcome back igraves! 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 csr Pull request needs approved CSR before integration label Feb 18, 2022
@openjdk
Copy link

openjdk bot commented Feb 18, 2022

@igraves has indicated that a compatibility and specification (CSR) request is needed for this pull request.
@igraves please create a CSR request for issue JDK-8264160. This pull request cannot be integrated until the CSR request is approved.

@openjdk
Copy link

openjdk bot commented Feb 18, 2022

@igraves 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 18, 2022
@openjdk
Copy link

openjdk bot commented Mar 7, 2022

@igraves 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 bug-8264160
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 the merge-conflict Pull request has merge conflict with target branch label Mar 7, 2022
@openjdk openjdk bot added rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch labels Mar 8, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 8, 2022

Webrevs

Copy link
Contributor

@LanceAndersen LanceAndersen left a comment

Choose a reason for hiding this comment

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

Have not gone through the javadoc changes in detail yet but plan to, only scanned it just now

On a quick skim of the test, it could use some TLC which you might consider doing now or later.

It would be really good for future maintainers if there was a comment which introduced each test as to what it was trying to exercise (not just a bug number). Same with some of the private helper methods.

You probably want to include your bug number in the @bug declaration which starts on line 27

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Mar 8, 2022
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Mar 8, 2022
Copy link
Contributor

@LanceAndersen LanceAndersen left a comment

Choose a reason for hiding this comment

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

The changes to Pattern seem OK pending the final CSR approval.

Looks like your CSR is not quite ready for review as their is no info in the compatibility section.

Copy link
Contributor

@LanceAndersen LanceAndersen left a comment

Choose a reason for hiding this comment

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

Thank you for the cleanup.

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Mar 10, 2022

⚠️ @igraves This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@igraves
Copy link
Member Author

igraves commented Mar 10, 2022

Something very odd is going on with this PR. I am looking into it.

@igraves
Copy link
Member Author

igraves commented Mar 10, 2022

Apologies for the force push. I had a very odd rebase happen that I did not intend. This push rolled it all back out to it's prior state plus a minor change clarifying a regex in the spec.

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Mar 28, 2022
@openjdk
Copy link

openjdk bot commented Mar 28, 2022

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

8264160: Regex \b is not consistent with \w without UNICODE_CHARACTER_CLASS

Reviewed-by: lancea, bpb, naoto

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

  • 634800a: 8283806: [BACKOUT] JDK 19 L10n resource files update - msgdrop 10
  • 9b49900: 8283603: Remove redundant qualifier in Windows specific Attach Operation
  • d8fd222: 8282538: PKCS11 tests fail on CentOS Stream 9
  • d472c01: 8283711: Remove redundant 'new String' calls after concatenation
  • c0aecd1: 8280400: JDK 19 L10n resource files update - msgdrop 10
  • f0282d7: 8279488: ProcessBuilder inherits contextClassLoader when spawning a process reaper thread
  • a577656: 8282943: Unused weird key in compiler.properties
  • 7f2a3ca: 8281561: Disable http DIGEST mechanism with MD5 and SHA-1 by default
  • 0c472c8: 8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
  • d6fa8b0: 8283469: Don't use memset to initialize members in FileMapInfo and fix memory leak
  • ... and 197 more: https://git.openjdk.java.net/jdk/compare/3fc009be8a49f9edb8059d8612ef6ed7f048f242...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 Mar 28, 2022
@igraves
Copy link
Member Author

igraves commented Mar 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 29, 2022

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

  • 634800a: 8283806: [BACKOUT] JDK 19 L10n resource files update - msgdrop 10
  • 9b49900: 8283603: Remove redundant qualifier in Windows specific Attach Operation
  • d8fd222: 8282538: PKCS11 tests fail on CentOS Stream 9
  • d472c01: 8283711: Remove redundant 'new String' calls after concatenation
  • c0aecd1: 8280400: JDK 19 L10n resource files update - msgdrop 10
  • f0282d7: 8279488: ProcessBuilder inherits contextClassLoader when spawning a process reaper thread
  • a577656: 8282943: Unused weird key in compiler.properties
  • 7f2a3ca: 8281561: Disable http DIGEST mechanism with MD5 and SHA-1 by default
  • 0c472c8: 8283756: (zipfs) ZipFSOutputStreamTest.testOutputStream should only check inflated bytes
  • d6fa8b0: 8283469: Don't use memset to initialize members in FileMapInfo and fix memory leak
  • ... and 197 more: https://git.openjdk.java.net/jdk/compare/3fc009be8a49f9edb8059d8612ef6ed7f048f242...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 29, 2022

@igraves Pushed as commit f01cce2.

💡 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.

4 participants