Merge branch 'master' into feature/FasterXML#220-do-not-use-Arrays.copyOf

Author: cowtowncoder

.github/workflows/main.yml

@@ -16,13 +16,12 @@ permissions:
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: 'ubuntu-22.04'
     strategy:
       fail-fast: false
       matrix:
         # With Woodstox 7.0 can finally test versions past 11
         java_version: ['8', '11', '17', '21']
-        os: ['ubuntu-20.04']
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:

release-notes/CREDITS

@@ -116,3 +116,8 @@ Philipp Nanz (@philippn)
  (7.1.0)
 * Contributed #211: Disable `resolveEntityReferences` by default for newly created SAX parsers
  (7.1.0)
+
+Winfried Gerlach (@winfriedgerlach)
+
+* Contributed #220: Switch to lookup tables in hotspots `isNameChar()`/`isNameStartChar()`
+ (7.1.1)

release-notes/VERSION

@@ -9,6 +9,8 @@ Project: woodstox
 #213: SAX: `Locator#getSystemId` and `Locator#getPublicId` are not
   available during `startDocument` event
  (fix contributed by Philipp N)
+#220: Switch to lookup tables in hotspots `isNameChar()`/`isNameStartChar()`
+ (contributed by @winfriedgerlach)
 
 7.1.0 (22-Oct-2024)
 

src/main/java/com/ctc/wstx/io/WstxInputData.java

@@ -17,6 +17,8 @@
 
 import com.ctc.wstx.util.XmlChars;
 
+import java.util.stream.IntStream;
+
 /**
  * Base class used by readers (specifically, by
  * {@link com.ctc.wstx.sr.StreamScanner}, and its sub-classes)
@@ -50,6 +52,25 @@ public class WstxInputData
      */
     public final static int MAX_UNICODE_CHAR = 0x10FFFF;
 
+    // @since 7.1.1
+    private static final boolean[] ASCII_NAME_START_CHARS = new boolean[128];
+    static {
+        IntStream.rangeClosed('a', 'z').forEach(i -> ASCII_NAME_START_CHARS[i] = true);
+        IntStream.rangeClosed('A', 'Z').forEach(i -> ASCII_NAME_START_CHARS[i] = true);
+        ASCII_NAME_START_CHARS['_'] = true;
+    }
+
+    // @since 7.1.1
+    private static final boolean[] ASCII_NAME_CHARS = new boolean[128];
+    static {
+        IntStream.rangeClosed('a', 'z').forEach(i -> ASCII_NAME_CHARS[i] = true);
+        IntStream.rangeClosed('A', 'Z').forEach(i -> ASCII_NAME_CHARS[i] = true);
+        IntStream.rangeClosed('0', '9').forEach(i -> ASCII_NAME_CHARS[i] = true);
+        ASCII_NAME_CHARS['.'] = true;
+        ASCII_NAME_CHARS['-'] = true;
+        ASCII_NAME_CHARS['_'] = true;
+    }
+
     /*
     ////////////////////////////////////////////////////
     // Configuration
@@ -153,14 +174,9 @@ protected final boolean isNameStartChar(char c)
         /* First, let's handle 7-bit ascii range (identical between xml
          * 1.0 and 1.1)
          */
-        if (c <= 0x7A) { // 'z' or earlier
-            if (c >= 0x61) { // 'a' - 'z' are ok
-                return true;
-            }
-            if (c < 0x41) { // before 'A' just white space
-                return false;
-            }
-            return (c <= 0x5A) || (c == '_'); // 'A' - 'Z' and '_' are ok
+        if (c < 128) {
+            // this is performance critical, so we use a lookup table instead of if-branches
+            return ASCII_NAME_START_CHARS[c];
         }
         /* Ok, otherwise need to use a big honking bit sets... which
          * differ between 1.0 and 1.1
@@ -178,18 +194,9 @@ protected final boolean isNameStartChar(char c)
     protected final boolean isNameChar(char c)
     {
         // First, let's handle 7-bit ascii range
-        if (c <= 0x7A) { // 'z' or earlier
-            if (c >= 0x61) { // 'a' - 'z' are ok
-                return true;
-            }
-            if (c <= 0x5A) {
-                if (c >= 0x41) { // 'A' - 'Z' ok too
-                    return true;
-                }
-                // As are 0-9, '.' and '-'
-                return (c >= 0x30 && c <= 0x39) || (c == '.') || (c == '-');
-            }
-            return (c == 0x5F); // '_' is ok too
+        if (c < 128) {
+            // this is performance critical, so we use a lookup table instead of if-branches
+            return ASCII_NAME_CHARS[c];
         }
         return mXml11 ? XmlChars.is11NameChar(c) : XmlChars.is10NameChar(c);
     }

src/test/java/com/ctc/wstx/io/WstxInputDataTest.java

@@ -0,0 +1,77 @@
+package com.ctc.wstx.io;
+
+import com.ctc.wstx.util.XmlChars;
+import junit.framework.TestCase;
+import org.junit.Test;
+
+import java.util.stream.IntStream;
+
+public class WstxInputDataTest extends TestCase {
+
+    @Test
+    public void testIsNameStartCharBehavesSameAsBranchyVersion() {
+        WstxInputData wstxInputDataXml10 = new WstxInputData();
+        WstxInputData wstxInputDataXml11 = new WstxInputData();
+        wstxInputDataXml11.mXml11 = true;
+
+        // include all 7-bit ASCII characters plus some left and right
+        IntStream.range(-10, 138).forEach(i -> {
+            char c = (char) i;
+            assertEquals(isNameStartCharBranchy(c, false), wstxInputDataXml10.isNameStartChar(c));
+            assertEquals(isNameStartCharBranchy(c, true), wstxInputDataXml11.isNameStartChar(c));
+        });
+    }
+
+    // previous implementation with branches
+    private final boolean isNameStartCharBranchy(char c, boolean mXml11) {
+        /* First, let's handle 7-bit ascii range (identical between xml
+         * 1.0 and 1.1)
+         */
+        if (c <= 0x7A) { // 'z' or earlier
+            if (c >= 0x61) { // 'a' - 'z' are ok
+                return true;
+            }
+            if (c < 0x41) { // before 'A' just white space
+                return false;
+            }
+            return (c <= 0x5A) || (c == '_'); // 'A' - 'Z' and '_' are ok
+        }
+        /* Ok, otherwise need to use a big honking bit sets... which
+         * differ between 1.0 and 1.1
+         */
+        return mXml11 ? XmlChars.is11NameStartChar(c) : XmlChars.is10NameStartChar(c);
+    }
+
+    @Test
+    public void testIsNameCharBehavesSameAsBranchyVersion() {
+        WstxInputData wstxInputDataXml10 = new WstxInputData();
+        WstxInputData wstxInputDataXml11 = new WstxInputData();
+        wstxInputDataXml11.mXml11 = true;
+
+        // include all 7-bit ASCII characters plus some left and right
+        IntStream.range(-10, 138).forEach(i -> {
+            char c = (char) i;
+            assertEquals(isNameCharBranchy(c, false), wstxInputDataXml10.isNameChar(c));
+            assertEquals(isNameCharBranchy(c, true), wstxInputDataXml11.isNameChar(c));
+        });
+    }
+
+    // previous implementation with branches
+    private final boolean isNameCharBranchy(char c, boolean mXml11) {
+        // First, let's handle 7-bit ascii range
+        if (c <= 0x7A) { // 'z' or earlier
+            if (c >= 0x61) { // 'a' - 'z' are ok
+                return true;
+            }
+            if (c <= 0x5A) {
+                if (c >= 0x41) { // 'A' - 'Z' ok too
+                    return true;
+                }
+                // As are 0-9, '.' and '-'
+                return (c >= 0x30 && c <= 0x39) || (c == '.') || (c == '-');
+            }
+            return (c == 0x5F); // '_' is ok too
+        }
+        return mXml11 ? XmlChars.is11NameChar(c) : XmlChars.is10NameChar(c);
+    }
+}