Changed logger levels in MaxResultBufferCounter and in MaxResultBuffe…

…rParser, added description to R_maxResultBufferPropertyDescription in SQLServerResource, added another string resource (R_maxResultBufferPropertyExceeded) in SQLServerResource
microsoft · Nov 25, 2020 · 2e5a03e · 2e5a03e
1 parent 8f2336d
commit 2e5a03e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/MaxResultBufferCounter.java b/src/main/java/com/microsoft/sqlserver/jdbc/MaxResultBufferCounter.java
@@ -37,14 +37,16 @@ public void resetCounter() {
 
     private void checkForMaxResultBufferOverflow(long number) throws SQLServerException {
         if (number > maxResultBuffer) {
-            logger.log(Level.WARNING, "MaxResultBuffer exceeded: {0}. Property was set to {1}.",
-                    new Object[] {number, maxResultBuffer});
+            if (logger.isLoggable(Level.SEVERE)) {
+                logger.log(Level.SEVERE, SQLServerException.getErrString("R_maxResultBufferPropertyExceeded"),
+                        new Object[] {number, maxResultBuffer});
+            }
             throwExceededMaxResultBufferException(counter, maxResultBuffer);
         }
     }
 
     private void throwExceededMaxResultBufferException(Object... arguments) throws SQLServerException {
-        MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_maxResultBufferPropertyDescription"));
+        MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_maxResultBufferPropertyExceeded"));
         throw new SQLServerException(form.format(arguments), null);
     }
 }
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/MaxResultBufferParser.java b/src/main/java/com/microsoft/sqlserver/jdbc/MaxResultBufferParser.java
@@ -46,7 +46,9 @@ public static long validateMaxResultBuffer(String input) throws SQLServerExcepti
             try {
                 number = Long.parseLong(input);
             } catch (NumberFormatException e) {
-                logger.log(Level.INFO, ERROR_MESSAGE, new Object[] {input});
+                if (logger.isLoggable(Level.SEVERE)) {
+                    logger.log(Level.SEVERE, ERROR_MESSAGE, new Object[] {input});
+                }
                 throwNewInvalidMaxResultBufferParameterException(e, input);
             }
             return adjustMemory(number, 1);
@@ -58,7 +60,9 @@ public static long validateMaxResultBuffer(String input) throws SQLServerExcepti
                     try {
                         number = Long.parseLong(numberString);
                     } catch (NumberFormatException e) {
-                        logger.log(Level.INFO, ERROR_MESSAGE, new Object[] {input});
+                        if (logger.isLoggable(Level.SEVERE)) {
+                            logger.log(Level.SEVERE, ERROR_MESSAGE, new Object[] {input});
+                        }
                         throwNewInvalidMaxResultBufferParameterException(e, numberString);
                     }
                     return adjustMemoryPercentage(number);
@@ -72,7 +76,9 @@ public static long validateMaxResultBuffer(String input) throws SQLServerExcepti
             try {
                 number = Long.parseLong(numberString);
             } catch (NumberFormatException e) {
-                logger.log(Level.INFO, ERROR_MESSAGE, new Object[] {input});
+                if (logger.isLoggable(Level.SEVERE)) {
+                    logger.log(Level.SEVERE, ERROR_MESSAGE, new Object[] {input});
+                }
                 throwNewInvalidMaxResultBufferParameterException(e, numberString);
             }
             return adjustMemory(number, multiplier);
@@ -84,8 +90,10 @@ private static void checkForNegativeValue(long value) throws SQLServerException
             Object[] objectToThrow = new Object[] {value};
             MessageFormat form = new MessageFormat(
                     SQLServerException.getErrString("R_maxResultBufferNegativeParameterValue"));
-            logger.log(Level.INFO, SQLServerException.getErrString("R_maxResultBufferNegativeParameterValue"),
-                    objectToThrow);
+            if (logger.isLoggable(Level.SEVERE)) {
+                logger.log(Level.SEVERE, SQLServerException.getErrString("R_maxResultBufferNegativeParameterValue"),
+                        objectToThrow);
+            }
             throw new SQLServerException(form.format(objectToThrow), new Throwable());
         }
     }
@@ -106,7 +114,9 @@ private static long getMultiplier(String input) throws SQLServerException {
                 multiplier = 1_000_000_000_000L;
                 break;
             default:
-                logger.log(Level.INFO, ERROR_MESSAGE, new Object[] {input});
+                if (logger.isLoggable(Level.SEVERE)) {
+                    logger.log(Level.SEVERE, ERROR_MESSAGE, new Object[] {input});
+                }
                 throwNewInvalidMaxResultBufferParameterException(null, input);
         }
         return multiplier;

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResource.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResource.java
@@ -654,7 +654,8 @@ protected Object[][] getContents() {
                     "Failed to parse the CSV file, verify that the fields are correctly enclosed in double quotes."},
             {"R_TokenRequireUrl", "Token credentials require a URL using the HTTPS protocol scheme."},
             {"R_maxResultBufferPropertyDescription",
-                    "MaxResultBuffer property exceeded: {0}. MaxResultBuffer was set to: {1}."},
+                    "Determines maximum amount of bytes that can be read during retrieval of result set"},
             {"R_maxResultBufferInvalidSyntax", "Invalid syntax: {0} in maxResultBuffer parameter."},
-            {"R_maxResultBufferNegativeParameterValue", "MaxResultBuffer must have positive value: {0}."},};
+            {"R_maxResultBufferNegativeParameterValue", "MaxResultBuffer must have positive value: {0}."},
+            {"R_maxResultBufferPropertyExceeded", "MaxResultBuffer property exceeded: {0}. MaxResultBuffer was set to: {1}."},};
 }