8297587: Upgrade JLine to 3.22.0 #12614

lahodaj · 2023-02-17T10:20:46Z

This is a proposal to upgrade the JLine inside JDK to 3.22.0. It was done by:
-for shared/classes, taking a diff between JLine 3.20.0 and the existing JDK version, copying the JLine 3.22.0 into the JDK, repackaing, re-appling the patch (including trailing space removal, UTF-8 characters replacement, addition of inputStreamWrapper), and adjusting TerminalProvider
-for Windows, mostly copying the JLine 3.22.0 code into the JDK, and adjusting based on old changes

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-8297587: Upgrade JLine to 3.22.0

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12614

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

Using diff file

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

bridgekeeper · 2023-02-17T10:22:01Z

👋 Welcome back jlahoda! 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 · 2023-02-17T10:23:45Z

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

core-libs
kulla

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.

mlbridge · 2023-02-17T10:36:54Z

Webrevs

00: Full (9bfb2f73)

vicente-romero-oracle

some nit comments for your consideration, approved

vicente-romero-oracle · 2023-02-28T20:33:32Z

src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java

        if (groupName) {
            Comparator<String> groupComparator = getGroupComparator();
-            Map<String, Map<String, Candidate>> sorted;
+            Map<String, Map<Object, Candidate>> sorted;


Candidate and String both implement Comparable, probably that could be used to provide a more specific common supertype

vicente-romero-oracle · 2023-02-28T22:04:55Z

src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/NonBlocking.java

@@ -151,21 +144,17 @@ public NonBlockingInputStreamReader(NonBlockingInputStream inputStream, Charset
        public NonBlockingInputStreamReader(NonBlockingInputStream input, CharsetDecoder decoder) {
            this.input = input;
            this.decoder = decoder;
-            this.bytes = ByteBuffer.allocate(4);
-            this.chars = CharBuffer.allocate(2);
+            this.bytes = ByteBuffer.allocate(2048);


wow, big difference in allocation size

openjdk · 2023-02-28T22:29:03Z

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

8297587: Upgrade JLine to 3.22.0

Reviewed-by: vromero

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

8815175: 8303216: Prefer ArrayList to LinkedList in sun.net.httpserver.ServerImpl
a10d5ac: 8303130: Document required Accessibility permissions on macOS
50dc041: 8303227: JniObjWithEnv should be NullablePointer compliant
61e8867: 8302040: Port fdlibm sqrt to Java
6423065: 8303261: JFR: jdk/jfr/api/consumer/streaming/TestJVMCrash.java doesn't retry
dc5ea6a: 8303350: Fix mistyped {@code}
4a415ad: 8303351: [IR Framework] Add missing cpu feature avx512bw after JDK-8302681
30302d1: 8303250: Call ct_max_alignment_constraint using the base class
e144783: 8299817: [s390] AES-CTR mode intrinsic fails with multiple short update() calls
5feb13b: 8301701: java/net/DatagramSocket/DatagramSocketMulticasting.java should be hardened
... and 179 more: https://git.openjdk.org/jdk/compare/26b111d714c3ee62bd10a5e2ab44be01c13ff42e...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.

lahodaj · 2023-03-02T08:26:51Z

/integrate

openjdk · 2023-03-02T08:27:54Z

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

99f5687: 8302144: Move ZeroTLABTest.java to tier3
dc08216: 8303186: Missing Classpath exception from Continuation.c
d10d40a: 8303077: JFR: Add example usage to jdk.jfr
394eac8: 8295425: Match the default priv exp length between SunPKCS11 and other JDK providers
6e19387: 8303070: Memory leak in DCmdArgument<char*>::parse_value
9fc518f: 8303401: Add a Vector API equalsIgnoreCase micro benchmark
05faa73: 8303232: java.util.Date.parse(String) and java.util.Date(String) don't declare thrown IllegalArgumentException
4c985e5: 8303183: Memory leak in Arguments::init_shared_archive_paths
6af17c1: 8303362: Serial: Move CardTableRS to serial directory
c1e77e0: 8303252: G1: Return early from Full-GC if no regions are selected for compaction.
... and 198 more: https://git.openjdk.org/jdk/compare/26b111d714c3ee62bd10a5e2ab44be01c13ff42e...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-03-02T08:28:08Z

@lahodaj Pushed as commit 4619e8b.

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

8297587: Upgrade JLine to 3.22.0

9bfb2f7

openjdk bot added the rfr Pull request is ready for review label Feb 17, 2023

openjdk bot added core-libs core-libs-dev@openjdk.org kulla kulla-dev@openjdk.org labels Feb 17, 2023

vicente-romero-oracle approved these changes Feb 28, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Feb 28, 2023

openjdk bot added the integrated Pull request has been integrated label Mar 2, 2023

openjdk bot closed this Mar 2, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8297587: Upgrade JLine to 3.22.0 #12614

8297587: Upgrade JLine to 3.22.0 #12614

Uh oh!

lahodaj commented Feb 17, 2023 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Feb 17, 2023

Uh oh!

openjdk bot commented Feb 17, 2023

Uh oh!

mlbridge bot commented Feb 17, 2023

Uh oh!

vicente-romero-oracle left a comment

Uh oh!

vicente-romero-oracle Feb 28, 2023

Uh oh!

vicente-romero-oracle Feb 28, 2023

Uh oh!

openjdk bot commented Feb 28, 2023

Uh oh!

lahodaj commented Mar 2, 2023

Uh oh!

openjdk bot commented Mar 2, 2023

Uh oh!

openjdk bot commented Mar 2, 2023

Uh oh!

Uh oh!

8297587: Upgrade JLine to 3.22.0 #12614

8297587: Upgrade JLine to 3.22.0 #12614

Uh oh!

Conversation

lahodaj commented Feb 17, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Feb 17, 2023

Uh oh!

openjdk bot commented Feb 17, 2023

Uh oh!

mlbridge bot commented Feb 17, 2023

Webrevs

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

vicente-romero-oracle Feb 28, 2023

Choose a reason for hiding this comment

Uh oh!

vicente-romero-oracle Feb 28, 2023

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Feb 28, 2023

Uh oh!

lahodaj commented Mar 2, 2023

Uh oh!

openjdk bot commented Mar 2, 2023

Uh oh!

openjdk bot commented Mar 2, 2023

Uh oh!

Uh oh!

lahodaj commented Feb 17, 2023 •

edited by openjdk bot

Loading