From 79ebf6319d01b3655eefd726324ecefb2b9929e7 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 11:41:47 -0700
Subject: [PATCH] [Backport 2.x] Correct regular expression range (#2910)

(cherry picked from commit 7022a0946015c41cbd02888e3c712c6b67123982)

Signed-off-by: Lantao Jin <ltjin@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../java/org/opensearch/sql/common/grok/GrokCompiler.java     | 2 +-
 .../main/java/org/opensearch/sql/common/grok/GrokUtils.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java b/common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java
index aba96ad4cb..05fdbd57ed 100644
--- a/common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java
+++ b/common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java
@@ -29,7 +29,7 @@
 public class GrokCompiler implements Serializable {
 
   // We don't want \n and commented line
-  private static final Pattern patternLinePattern = Pattern.compile("^([A-z0-9_]+)\\s+(.*)$");
+  private static final Pattern patternLinePattern = Pattern.compile("^([a-zA-Z0-9_]+)\\s+(.*)$");
 
   /** {@code Grok} patterns definitions. */
   private final Map<String, String> grokPatternDefinitions = new HashMap<>();
diff --git a/common/src/main/java/org/opensearch/sql/common/grok/GrokUtils.java b/common/src/main/java/org/opensearch/sql/common/grok/GrokUtils.java
index 4b145bbbe8..2a309bba8f 100644
--- a/common/src/main/java/org/opensearch/sql/common/grok/GrokUtils.java
+++ b/common/src/main/java/org/opensearch/sql/common/grok/GrokUtils.java
@@ -24,8 +24,8 @@ public class GrokUtils {
       Pattern.compile(
           "%\\{"
               + "(?<name>"
-              + "(?<pattern>[A-z0-9]+)"
-              + "(?::(?<subname>[A-z0-9_:;,\\-\\/\\s\\.']+))?"
+              + "(?<pattern>[a-zA-Z0-9_]+)"
+              + "(?::(?<subname>[a-zA-Z0-9_:;,\\-\\/\\s\\.']+))?"
               + ")"
               + "(?:=(?<definition>"
               + "(?:"