remove unused code

Author: wenshao

core/src/main/java/com/alibaba/fastjson2/JSONReaderASCII.java

@@ -1431,13 +1431,13 @@ public final String readString() {
             int valueLength;
             boolean valueEscape = false;
 
-            int index = IOUtils.indexOfChar(bytes, quote, offset, end);
+            int index = IOUtils.indexOfQuote(bytes, quote, offset, end);
             if (index == -1) {
                 throw error("invalid escape character EOI");
             }
             int slashIndex = nextEscapeIndex;
             if (slashIndex == ESCAPE_INDEX_NOT_SET || (slashIndex != -1 && slashIndex < offset)) {
-                nextEscapeIndex = slashIndex = IOUtils.indexOfChar(bytes, '\\', offset, end);
+                nextEscapeIndex = slashIndex = IOUtils.indexOfSlash(bytes, offset, end);
             }
             if (slashIndex == -1 || slashIndex > index) {
                 valueLength = index - offset;

core/src/main/java/com/alibaba/fastjson2/util/IOUtils.java

@@ -1621,19 +1621,23 @@ public static int digit1(byte[] bytes, int off) {
         return d >= 0 && d <= 9 ? d : -1;
     }
 
-    public static int indexOfChar(byte[] value, int ch, int fromIndex) {
-        return indexOfChar(value, ch, fromIndex, value.length);
+    public static int indexOfQuote(byte[] value, int quote, int fromIndex, int max) {
+        int i = fromIndex;
+        int upperBound = fromIndex + ((max - fromIndex) & ~7);
+        long vectorQuote = quote == '\'' ? 0x2727_2727_2727_2727L : 0x2222_2222_2222_2222L;
+        while (i < upperBound && notContains(getLongLE(value, i), vectorQuote)) {
+            i += 8;
+        }
+        return indexOfChar0(value, quote, i, max);
     }
 
-    public static int indexOfChar(byte[] value, int ch, int fromIndex, int max) {
-        if (INDEX_OF_CHAR_LATIN1 == null) {
-            return indexOfChar0(value, ch, fromIndex, max);
-        }
-        try {
-            return (int) INDEX_OF_CHAR_LATIN1.invokeExact(value, ch, fromIndex, max);
-        } catch (Throwable e) {
-            throw new JSONException(e.getMessage());
+    public static int indexOfSlash(byte[] value, int fromIndex, int max) {
+        int i = fromIndex;
+        int upperBound = fromIndex + ((max - fromIndex) & ~7);
+        while (i < upperBound && notContains(getLongLE(value, i), 0x5C5C5C5C5C5C5C5CL)) {
+            i += 8;
         }
+        return indexOfChar0(value, '\\', i, max);
     }
 
     private static int indexOfChar0(byte[] value, int ch, int fromIndex, int max) {
@@ -1645,6 +1649,21 @@ private static int indexOfChar0(byte[] value, int ch, int fromIndex, int max) {
         return -1;
     }
 
+    private static boolean notContains(long v, long quote) {
+        /*
+          for (int i = 0; i < 8; ++i) {
+            byte c = (byte) v;
+            if (c == quote) {
+                return true;
+            }
+            v >>>= 8;
+          }
+          return false;
+         */
+        long x = v ^ quote;
+        return (((x - 0x0101010101010101L) & ~x) & 0x8080808080808080L) == 0;
+    }
+
     public static int hexDigit4(byte[] bytes, int offset) {
         int v = getIntLE(bytes, offset);
         v = (v & 0x0F0F0F0F) + ((((v & 0x40404040) >> 2) | ((v & 0x40404040) << 1)) >>> 4);
@@ -1661,10 +1680,6 @@ public static boolean isDigit(int ch) {
         return ch >= '0' && ch <= '9';
     }
 
-    public static short getShortUnaligned(byte[] bytes, int offset) {
-        return UNSAFE.getShort(bytes, ARRAY_BYTE_BASE_OFFSET + offset);
-    }
-
     public static short getShortBE(byte[] bytes, int offset) {
         return convEndian(true,
                 UNSAFE.getShort(bytes, ARRAY_BYTE_BASE_OFFSET + offset));

core/src/main/java/com/alibaba/fastjson2/util/JDKUtils.java

@@ -59,7 +59,6 @@ public class JDKUtils {
 
     public static final MethodHandle METHOD_HANDLE_HAS_NEGATIVE;
     public static final Predicate<byte[]> PREDICATE_IS_ASCII;
-    public static final MethodHandle INDEX_OF_CHAR_LATIN1;
 
     static final MethodHandles.Lookup IMPL_LOOKUP;
     static volatile MethodHandle CONSTRUCTOR_LOOKUP;
@@ -338,21 +337,6 @@ public class JDKUtils {
             METHOD_HANDLE_HAS_NEGATIVE = handle;
         }
 
-        MethodHandle indexOfCharLatin1 = null;
-        if (JVM_VERSION > 9) {
-            try {
-                Class<?> cStringLatin1 = Class.forName("java.lang.StringLatin1");
-                MethodHandles.Lookup lookup = trustedLookup(cStringLatin1);
-                indexOfCharLatin1 = lookup.findStatic(
-                        cStringLatin1,
-                        "indexOfChar",
-                        MethodType.methodType(int.class, byte[].class, int.class, int.class, int.class));
-            } catch (Throwable ignored) {
-                // ignore
-            }
-        }
-        INDEX_OF_CHAR_LATIN1 = indexOfCharLatin1;
-
         Boolean compact_strings = null;
         try {
             if (JVM_VERSION == 8) {

core/src/test/java/com/alibaba/fastjson2/util/IOUtilsTest.java

@@ -365,17 +365,45 @@ static int hexDigit4(byte[] bytes, int offset) {
     }
 
     @Test
-    public void indexOf() throws Throwable {
-        byte[] bytes = "abcda".getBytes(StandardCharsets.UTF_8);
+    public void indexOf() {
+        byte[] bytes = "'b'd'".getBytes(StandardCharsets.UTF_8);
         assertEquals(2,
-                IOUtils.indexOfChar(
-                        bytes, 'c', 0));
+                IOUtils.indexOfQuote(
+                        bytes, '\'', 1, bytes.length));
         assertEquals(0,
-                IOUtils.indexOfChar(
-                        bytes, 'a', 0));
+                IOUtils.indexOfQuote(
+                        bytes, '\'', 0, bytes.length));
         assertEquals(4,
-                IOUtils.indexOfChar(
-                        bytes, 'a', 1));
+                IOUtils.indexOfQuote(
+                        bytes, '\'', 3, bytes.length));
+    }
+
+    @Test
+    public void indexOf1() {
+        byte[] bytes = "\"b\"d\"".getBytes(StandardCharsets.UTF_8);
+        assertEquals(2,
+                IOUtils.indexOfQuote(
+                        bytes, '"', 1, bytes.length));
+        assertEquals(0,
+                IOUtils.indexOfQuote(
+                        bytes, '"', 0, bytes.length));
+        assertEquals(4,
+                IOUtils.indexOfQuote(
+                        bytes, '"', 3, bytes.length));
+    }
+
+    @Test
+    public void indexOfSlash() {
+        byte[] bytes = "\\b\\d\\".getBytes(StandardCharsets.UTF_8);
+        assertEquals(2,
+                IOUtils.indexOfSlash(
+                        bytes, 1, bytes.length));
+        assertEquals(0,
+                IOUtils.indexOfSlash(
+                        bytes, 0, bytes.length));
+        assertEquals(4,
+                IOUtils.indexOfSlash(
+                        bytes, 3, bytes.length));
     }
 
     @Test