Skip to content

Commit f3acc44

Browse files
committed
fix anonymizer test
Signed-off-by: Jialiang Liang <jiallian@amazon.com>
1 parent 6b0dc64 commit f3acc44

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,7 @@ public UnresolvedPlan visitRegexCommand(OpenSearchPPLParser.RegexCommandContext
967967
return new Regex(field, negated, pattern);
968968
}
969969

970+
@Override
970971
public UnresolvedPlan visitRexCommand(OpenSearchPPLParser.RexCommandContext ctx) {
971972
UnresolvedExpression field = internalVisitExpression(ctx.rexExpr().field);
972973
Literal pattern = (Literal) internalVisitExpression(ctx.rexExpr().pattern);

ppl/src/main/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,13 +460,11 @@ public String visitRex(Rex node, String context) {
460460
String pattern = "\"" + node.getPattern().toString() + "\"";
461461
StringBuilder command = new StringBuilder();
462462

463-
// Build the base command
464463
command.append(
465464
String.format(
466465
"%s | rex field=%s mode=%s %s",
467466
child, field, node.getMode().toString().toLowerCase(), pattern));
468467

469-
// Add optional parameters
470468
if (node.getMaxMatch().isPresent()) {
471469
command.append(" max_match=").append(node.getMaxMatch().get());
472470
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,11 +531,13 @@ public void testRegex() {
531531

532532
@Test
533533
public void testRexCommand() {
534+
when(settings.getSettingValue(Key.PPL_REX_MAX_MATCH_LIMIT)).thenReturn(10);
535+
534536
assertEquals(
535-
"source=t | rex field=message mode=extract \"(?<user>[A-Z]+)\"",
537+
"source=t | rex field=message mode=extract \"(?<user>[A-Z]+)\" max_match=1",
536538
anonymize("source=t | rex field=message \"(?<user>[A-Z]+)\""));
537539
assertEquals(
538-
"source=t | rex field=lastname mode=extract \"(?<initial>^[A-Z])\" | fields +"
540+
"source=t | rex field=lastname mode=extract \"(?<initial>^[A-Z])\" max_match=1 | fields +"
539541
+ " lastname,initial",
540542
anonymize(
541543
"source=t | rex field=lastname \"(?<initial>^[A-Z])\" | fields lastname, initial"));

0 commit comments

Comments
 (0)