[misc] minor performance improvement reading BIGINT with getInt() / g…

…etLong()
mariadb-corporation · Oct 12, 2016 · a69ab38 · a69ab38
1 parent df2bbb7
commit a69ab38
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java b/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java
@@ -3183,6 +3183,7 @@ private int parseInt(byte[] rawBytes, ColumnInformation columnInfo) throws SQLEx
                 case YEAR:
                 case INTEGER:
                 case MEDIUMINT:
+                case BIGINT:
                     long result = 0;
                     int length = rawBytes.length;
                     boolean negate = false;
@@ -3194,6 +3195,12 @@ private int parseInt(byte[] rawBytes, ColumnInformation columnInfo) throws SQLEx
                     for (; begin < length; begin++) {
                         result = result * 10 + rawBytes[begin] - 48;
                     }
+                    //specific for BIGINT : if value > Long.MAX_VALUE will become negative.
+                    if (result < 0) {
+                        throw new SQLException("Out of range value for column '" + columnInfo.getName() + "' : value "
+                                + new String(rawBytes, StandardCharsets.UTF_8)
+                                + " is not in Integer range", "22003", 1264);
+                    }
                     result = (negate ? -1 * result : result);
                     rangeCheck(Integer.class, Integer.MIN_VALUE, Integer.MAX_VALUE, result, columnInfo);
                     return (int) result;
@@ -3242,6 +3249,7 @@ private long parseLong(byte[] rawBytes, ColumnInformation columnInfo) throws SQL
                 case YEAR:
                 case INTEGER:
                 case MEDIUMINT:
+                case BIGINT:
                     long result = 0;
                     int length = rawBytes.length;
                     boolean negate = false;
@@ -3253,6 +3261,12 @@ private long parseLong(byte[] rawBytes, ColumnInformation columnInfo) throws SQL
                     for (; begin < length; begin++) {
                         result = result * 10 + rawBytes[begin] - 48;
                     }
+                    //specific for BIGINT : if value > Long.MAX_VALUE , will become negative until -1
+                    if (result < 0) {
+                        throw new SQLException("Out of range value for column '" + columnInfo.getName() + "' : value "
+                                + new String(rawBytes, StandardCharsets.UTF_8)
+                                + " is not in Long range", "22003", 1264);
+                    }
                     return (negate ? -1 * result : result);
                 default:
                     return Long.parseLong(new String(rawBytes, StandardCharsets.UTF_8));