The SPath fix

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

Author: Swiddis

core/src/main/java/org/opensearch/sql/ast/tree/SPath.java

@@ -5,6 +5,8 @@
 
 package org.opensearch.sql.ast.tree;
 
+import static org.opensearch.sql.common.utils.StringUtils.unquoteIdentifier;
+
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 import lombok.AllArgsConstructor;
@@ -48,15 +50,16 @@ public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
 
   public Eval rewriteAsEval() {
     String outField = this.outField;
+    String unquotedPath = unquoteIdentifier(this.path);
     if (outField == null) {
-      outField = this.path;
+      outField = unquotedPath;
     }
 
     return AstDSL.eval(
         this.child,
         AstDSL.let(
             AstDSL.field(outField),
             AstDSL.function(
-                "json_extract", AstDSL.field(inField), AstDSL.stringLiteral(this.path))));
+                "json_extract", AstDSL.field(inField), AstDSL.stringLiteral(unquotedPath))));
   }
 }

ppl/src/test/java/org/opensearch/sql/ppl/utils/SPathRewriteTest.java

@@ -64,4 +64,13 @@ public void testSpathMissingPathArgumentHandling() {
   public void testSpathArgumentDeshuffle() {
     assertEquals(plan("source = t | spath path=a input=a"), plan("source = t | spath input=a a"));
   }
+
+  @Test
+  public void testSpathEscapedParse() {
+    SPath sp =
+        (SPath) plan("source = t | spath input=f output=o path=`attributes.['cluster.name']`");
+    Eval ev = (Eval) plan("source = t | eval o=json_extract(f, \"attributes.['cluster.name']\")");
+
+    assertEquals(ev, sp.rewriteAsEval());
+  }
 }