8285081: Improve XPath operators count accuracy #9022

JoeWang-Java · 2022-06-03T18:17:55Z

Adjust how XPath operators are counted to improve accuracy. This change does not affect how XPath works.

Test:
Tier2 passed;
JCK XML tests passed.

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-8285081: Improve XPath operators count accuracy

Reviewers

Naoto Sato (@naotoj - Reviewer)
Lance Andersen (@LanceAndersen - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9022

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

Using diff file

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

bridgekeeper · 2022-06-03T18:19:28Z

👋 Welcome back joehw! 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 · 2022-06-03T18:21:34Z

@JoeWang-Java 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.

mlbridge · 2022-06-03T18:26:06Z

Webrevs

naotoj · 2022-06-03T21:08:04Z

src/java.xml/share/classes/com/sun/java_cup/internal/runtime/lr_parser.java

@@ -149,6 +149,7 @@ public abstract class lr_parser {
    private int grpCount = 0;
    private int opCount = 0;
    private int totalOpCount = 0;
+    private int lastSym;


lastSym is never initialized. It's OK for the first time, but should this be reset for the next use (if any), e.g. somewhere around line 595?

Right, -1 would be appropriate as 0 indicates EOF.

naotoj · 2022-06-03T21:11:20Z

src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java

+  public static final int[] OPERATORS = {GT, GE, EQ, NE, LT, LE, SLASH, DSLASH,
+      DOT, DDOT, ATSIGN, DCOLON, PLUS, MINUS, STAR, DIV, MOD, AND, OR, LPAREN,
+      LBRACK, VBAR, DOLLAR, NODE, TEXT, PI, PIPARAM};


Any reason for re-shuffling the order of operators? I'd expect new ones are appended to the existing ones, or appear in the order of their declarations above?
(or is this automatically generated, as described in the comment?)

The order is not significant for this process as the lexer takes care of creating the right symbol. I re-grouped them to put operators of the same category together so that it's easier to see what might be missing.

naotoj · 2022-06-03T21:15:39Z

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java

@@ -443,6 +473,11 @@ else if (null != targetStrings)
    m_processor.m_queueMark = 0;
  }

+  private void incrementCount(char c) {


c is not used.

Will remove it.

naotoj · 2022-06-03T21:43:23Z

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java

+        else if ((Token.LPAREN == c))
+        {
+          nesting++;
+          if (!isLiteral) {


if (isLiteral) { might be more readable.

naotoj · 2022-06-03T21:52:08Z

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java

+        // ',' is part of a function
+        else if ((Token.LPAREN != c) && (Token.LBRACK != c) && (Token.RPAREN != c)
+                && (Token.RBRACK != c) && (Token.COLON != c) && (Token.COMMA != c)) {
+            if (Token.STAR == c) {


Could be

if (Token.STAR != c || !isAxis) { incrementCount(c); }

Thanks Naoto! Updated as commented.

naotoj

LGTM

openjdk · 2022-06-06T21:15:00Z

@JoeWang-Java 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:

8285081: Improve XPath operators count accuracy

Reviewed-by: naoto, lancea

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

74be2d9: 8286983: rename jdb -trackvthreads and debug agent enumeratevthreads options and clarify "Preview Feature" nature of these options
8e10c2b: 8287877: Exclude vmTestbase/nsk/jvmti/AttachOnDemand/attach022/TestDescription.java until JDK-8277573 is fixed
9ec27d0: 8287872: Disable concurrent execution of hotspot docker tests
91e6bf6: 8287919: ProblemList java/lang/CompressExpandTest.java
3da7e39: 8287840: Dead copy region node blocks IfNode's fold-compares
c41a283: 8273853: Update the Java manpage for automatic CDS archive updating
41d5809: 8287811: JFR: jfr configure error message should not print stack trace
5d4ea9b: 8273346: Expand library mappings to IEEE 754 operations
96641c0: 8287745: jni/nullCaller/NullCallerTest.java fails with "exitValue = 1"
67f1bd7: 8286620: Create regression test for verifying setMargin() of JRadioButton
... and 51 more: https://git.openjdk.java.net/jdk/compare/a0219da966f3a1cd12d402a816bdd79be778085e...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.

JoeWang-Java · 2022-06-07T20:48:44Z

/integrate

openjdk · 2022-06-07T20:49:57Z

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

b12e7f1: 8279358: vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/TestDescription.java fails with usage tracker
1aa87e0: 8287148: Avoid redundant HashMap.containsKey calls in ExtendedKeyCodes.getExtendedKeyCodeForChar
74be2d9: 8286983: rename jdb -trackvthreads and debug agent enumeratevthreads options and clarify "Preview Feature" nature of these options
8e10c2b: 8287877: Exclude vmTestbase/nsk/jvmti/AttachOnDemand/attach022/TestDescription.java until JDK-8277573 is fixed
9ec27d0: 8287872: Disable concurrent execution of hotspot docker tests
91e6bf6: 8287919: ProblemList java/lang/CompressExpandTest.java
3da7e39: 8287840: Dead copy region node blocks IfNode's fold-compares
c41a283: 8273853: Update the Java manpage for automatic CDS archive updating
41d5809: 8287811: JFR: jfr configure error message should not print stack trace
5d4ea9b: 8273346: Expand library mappings to IEEE 754 operations
... and 53 more: https://git.openjdk.java.net/jdk/compare/a0219da966f3a1cd12d402a816bdd79be778085e...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-06-07T20:50:11Z

@JoeWang-Java Pushed as commit 8e07839.

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

8285081: Improve XPath operators count accuracy

f840e84

openjdk bot added the rfr Pull request is ready for review label Jun 3, 2022

openjdk bot added the core-libs core-libs-dev@openjdk.org label Jun 3, 2022

naotoj reviewed Jun 3, 2022

View reviewed changes

JoeWang-Java added 2 commits June 3, 2022 23:12

review update

e1e3deb

remove unused parameter

6dc1cc2

naotoj approved these changes Jun 6, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 6, 2022

LanceAndersen approved these changes Jun 7, 2022

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jun 7, 2022

openjdk bot closed this Jun 7, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 7, 2022

JoeWang-Java deleted the JDK-8285081 branch June 7, 2022 21:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8285081: Improve XPath operators count accuracy #9022

8285081: Improve XPath operators count accuracy #9022

JoeWang-Java commented Jun 3, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jun 3, 2022

openjdk bot commented Jun 3, 2022

mlbridge bot commented Jun 3, 2022 •

edited

Loading

naotoj Jun 3, 2022

JoeWang-Java Jun 3, 2022

naotoj Jun 3, 2022

JoeWang-Java Jun 3, 2022

naotoj Jun 3, 2022

JoeWang-Java Jun 3, 2022

naotoj Jun 3, 2022

naotoj Jun 3, 2022

JoeWang-Java Jun 3, 2022

naotoj left a comment

openjdk bot commented Jun 6, 2022 •

edited

Loading

JoeWang-Java commented Jun 7, 2022

openjdk bot commented Jun 7, 2022

openjdk bot commented Jun 7, 2022

8285081: Improve XPath operators count accuracy #9022

8285081: Improve XPath operators count accuracy #9022

Conversation

JoeWang-Java commented Jun 3, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jun 3, 2022

openjdk bot commented Jun 3, 2022

mlbridge bot commented Jun 3, 2022 • edited Loading

Webrevs

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

naotoj left a comment

Choose a reason for hiding this comment

openjdk bot commented Jun 6, 2022 • edited Loading

JoeWang-Java commented Jun 7, 2022

openjdk bot commented Jun 7, 2022

openjdk bot commented Jun 7, 2022

JoeWang-Java commented Jun 3, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 3, 2022 •

edited

Loading

openjdk bot commented Jun 6, 2022 •

edited

Loading