optimization for readLocalDate

alibaba · Jan 10, 2025 · 290342b · 290342b
1 parent fc96048
commit 290342b
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 79 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF16.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF16.java
@@ -4539,47 +4539,30 @@ public final LocalDate readLocalDate() {
                         && chars[offset + 7] == '-'
                         && chars[offset + 10] == quote
                 ) {
-                    char y0 = chars[offset];
-                    char y1 = chars[offset + 1];
-                    char y2 = chars[offset + 2];
-                    char y3 = chars[offset + 3];
-                    char m0 = chars[offset + 5];
-                    char m1 = chars[offset + 6];
-                    char d0 = chars[offset + 8];
-                    char d1 = chars[offset + 9];
-
-                    int year;
-                    int month;
-                    if (y0 >= '0' && y0 <= '9'
-                            && y1 >= '0' && y1 <= '9'
-                            && y2 >= '0' && y2 <= '9'
-                            && y3 >= '0' && y3 <= '9'
-                    ) {
-                        year = (y0 - '0') * 1000 + (y1 - '0') * 100 + (y2 - '0') * 10 + (y3 - '0');
-                        if (m0 >= '0' && m0 <= '9' && m1 >= '0' && m1 <= '9') {
-                            month = (m0 - '0') * 10 + (m1 - '0');
-                            int dom;
-                            if (d0 >= '0' && d0 <= '9' && d1 >= '0' && d1 <= '9') {
-                                dom = (d0 - '0') * 10 + (d1 - '0');
-
-                                LocalDate ldt;
-                                try {
-                                    ldt = year == 0 && month == 0 && dom == 0
-                                            ? null
-                                            : LocalDate.of(year, month, dom);
-                                } catch (DateTimeException ex) {
-                                    throw new JSONException(info("read date error"), ex);
-                                }
-
-                                this.offset = offset + 11;
-                                next();
-                                if (comma = (this.ch == ',')) {
-                                    next();
-                                }
-                                return ldt;
-                            }
-                        }
+                    int year = IOUtils.digit4(chars, offset);
+                    int month = IOUtils.digit2(chars, offset + 5);
+                    int dom = IOUtils.digit2(chars, offset + 8);
+
+
+                    if ((year | month | dom) < 0) {
+                        throw new JSONException(info("read date error"));
+                    }
+
+                    LocalDate ldt;
+                    try {
+                        ldt = year == 0 && month == 0 && dom == 0
+                                ? null
+                                : LocalDate.of(year, month, dom);
+                    } catch (DateTimeException ex) {
+                        throw new JSONException(info("read date error"), ex);
+                    }
+
+                    this.offset = offset + 11;
+                    next();
+                    if (comma = (this.ch == ',')) {
+                        next();
                     }
+                    return ldt;
                 }
 
                 int nextQuoteOffset = -1;

diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java
@@ -5680,47 +5680,30 @@ public final LocalDate readLocalDate() {
                         && bytes[offset + 7] == '-'
                         && bytes[offset + 10] == quote
                 ) {
-                    byte y0 = bytes[offset];
-                    byte y1 = bytes[offset + 1];
-                    byte y2 = bytes[offset + 2];
-                    byte y3 = bytes[offset + 3];
-                    byte m0 = bytes[offset + 5];
-                    byte m1 = bytes[offset + 6];
-                    byte d0 = bytes[offset + 8];
-                    byte d1 = bytes[offset + 9];
-
-                    int year;
-                    int month;
-                    if (y0 >= '0' && y0 <= '9'
-                            && y1 >= '0' && y1 <= '9'
-                            && y2 >= '0' && y2 <= '9'
-                            && y3 >= '0' && y3 <= '9'
-                    ) {
-                        year = (y0 - '0') * 1000 + (y1 - '0') * 100 + (y2 - '0') * 10 + (y3 - '0');
-                        if (m0 >= '0' && m0 <= '9' && m1 >= '0' && m1 <= '9') {
-                            month = (m0 - '0') * 10 + (m1 - '0');
-                            int dom;
-                            if (d0 >= '0' && d0 <= '9' && d1 >= '0' && d1 <= '9') {
-                                dom = (d0 - '0') * 10 + (d1 - '0');
-
-                                LocalDate ldt;
-                                try {
-                                    ldt = year == 0 && month == 0 && dom == 0
-                                            ? null
-                                            : LocalDate.of(year, month, dom);
-                                } catch (DateTimeException ex) {
-                                    throw new JSONException(info("read date error"), ex);
-                                }
+                    int year = IOUtils.digit4(bytes, offset);
+                    int month = IOUtils.digit2(bytes, offset + 5);
+                    int dom = IOUtils.digit2(bytes, offset + 8);
 
-                                this.offset = offset + 11;
-                                next();
-                                if (comma = (this.ch == ',')) {
-                                    next();
-                                }
-                                return ldt;
-                            }
-                        }
+
+                    if ((year | month | dom) < 0) {
+                        throw new JSONException(info("read date error"));
+                    }
+
+                    LocalDate ldt;
+                    try {
+                        ldt = year == 0 && month == 0 && dom == 0
+                                ? null
+                                : LocalDate.of(year, month, dom);
+                    } catch (DateTimeException ex) {
+                        throw new JSONException(info("read date error"), ex);
+                    }
+
+                    this.offset = offset + 11;
+                    next();
+                    if (comma = (this.ch == ',')) {
+                        next();
                     }
+                    return ldt;
                 }
 
                 int nextQuoteOffset = -1;