[#11967] Skip leading space when binding values

pinpoint-apm · Jan 22, 2025 · d31d099 · d31d099
1 parent d8163d2
commit d31d099
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/...filer/src/main/java/com/navercorp/pinpoint/common/profiler/sql/OutputParameterParser.java b/...filer/src/main/java/com/navercorp/pinpoint/common/profiler/sql/OutputParameterParser.java
@@ -40,10 +40,14 @@ public List<String> parseOutputParameter(String outputParams) {
         for (int index = 0; index < outputParams.length(); index++) {
             final char ch = outputParams.charAt(index);
             if (ch == SEPARATOR) {
-                if (lookAhead1(outputParams, index) == SEPARATOR) {
+                int ahead = lookAhead1(outputParams, index);
+                if (ahead == SEPARATOR) {
                     params.append(SEPARATOR);
                     index++;
                 } else {
+                    if (ahead == ' ') {
+                        index++;
+                    }
                     result.add(params.toString());
                     params = new StringBuilder();
                 }

diff --git a/...er/src/test/java/com/navercorp/pinpoint/common/profiler/sql/DefaultSqlNormalizerTest.java b/...er/src/test/java/com/navercorp/pinpoint/common/profiler/sql/DefaultSqlNormalizerTest.java
@@ -244,7 +244,13 @@ public void combineBindValue() {
 
         sql = "select * from table a = ? and b=? and c=? and d=?";
         expected = "select * from table a = '1' and b='50' and c=' foo ' and d='11'";
-        bindValues = parameterParser.parseOutputParameter("1,50, foo ,11");
+        bindValues = parameterParser.parseOutputParameter("1,50,  foo ,11");
+        result = sqlNormalizer.combineBindValues(sql, bindValues);
+        Assertions.assertEquals(expected, result);
+
+        sql = "select * from table a = ? and b=? and c=? and d=?";
+        expected = "select * from table a = '1' and b='50' and c='foo' and d='11'";
+        bindValues = parameterParser.parseOutputParameter("1, 50, foo, 11");
         result = sqlNormalizer.combineBindValues(sql, bindValues);
         Assertions.assertEquals(expected, result);
 

diff --git a/...r/src/test/java/com/navercorp/pinpoint/common/profiler/sql/OutputParameterParserTest.java b/...r/src/test/java/com/navercorp/pinpoint/common/profiler/sql/OutputParameterParserTest.java
@@ -45,6 +45,9 @@ public void testParseOutputParameter() throws Exception {
 
         assertOutputParameter("");
 
+        assertOutputParameter("1, 2, 3", "1", "2", "3");
+
+        assertOutputParameter("1 , 2,  3", "1 ", "2", " 3");
     }
 
     private void assertOutputParameter(String outputParam, String... params) {