review comments

Alexandros Batsakis · Alexandros Batsakis · commit a4ff2c94b40c · 2023-09-11T07:48:20.000-07:00
diff --git a/docs/reference/esql/functions/signature/replace.svg b/docs/reference/esql/functions/signature/replace.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="516" height="46" viewbox="0 0 516 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m104 0h10m32 0h10m68 0h10m32 0h10m68 0h10m32 0h10m68 0h10m32 0h5"/><rect class="s" x="5" y="5" width="104" height="36"/><text class="k" x="15" y="31">REPLACE</text><rect class="s" x="119" y="5" width="32" height="36" rx="7"/><text class="syn" x="129" y="31">(</text><rect class="s" x="161" y="5" width="68" height="36" rx="7"/><text class="k" x="171" y="31">arg1</text><rect class="s" x="239" y="5" width="32" height="36" rx="7"/><text class="syn" x="249" y="31">,</text><rect class="s" x="281" y="5" width="68" height="36" rx="7"/><text class="k" x="291" y="31">arg2</text><rect class="s" x="359" y="5" width="32" height="36" rx="7"/><text class="syn" x="369" y="31">,</text><rect class="s" x="401" y="5" width="68" height="36" rx="7"/><text class="k" x="411" y="31">arg3</text><rect class="s" x="479" y="5" width="32" height="36" rx="7"/><text class="syn" x="489" y="31">)</text></svg>
diff --git a/docs/reference/esql/functions/types/replace.asciidoc b/docs/reference/esql/functions/types/replace.asciidoc
@@ -0,0 +1,5 @@
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+arg1 | arg2 | arg3 | result
+keyword | keyword | keyword | keyword
+|===
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/Replace.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/Replace.java
@@ -86,7 +86,7 @@ static BytesRef process(BytesRef str, @Fixed Pattern regex, BytesRef newStr) {
         }
 
         try {
-            return new BytesRef(str.utf8ToString().replaceAll(regex.pattern(), newStr.utf8ToString()));
+            return new BytesRef(regex.matcher(str.utf8ToString()).replaceAll(newStr.utf8ToString()));
         } catch (PatternSyntaxException ex) {
             // let's return the original string as if there is no match
             // we don't want to throw a runtime error

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ static BytesRef process(BytesRef str, @Fixed Pattern regex, BytesRef newStr) {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`try {`
`89`		`- return new BytesRef(str.utf8ToString().replaceAll(regex.pattern(), newStr.utf8ToString()));`
	`89`	`+ return new BytesRef(regex.matcher(str.utf8ToString()).replaceAll(newStr.utf8ToString()));`
`90`	`90`	`} catch (PatternSyntaxException ex) {`
`91`	`91`	`// let's return the original string as if there is no match`
`92`	`92`	`// we don't want to throw a runtime error`