Skip to content

Commit dce13b4

Browse files
committed
fix some tests
Signed-off-by: Jialiang Liang <jiallian@amazon.com>
1 parent 96f8ec1 commit dce13b4

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

integ-test/src/test/java/org/opensearch/sql/security/CalciteCrossClusterSearchIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ public void testTimeBinCrossCluster() throws IOException {
240240
rows("2025-07-28 02:00:00", 9187));
241241
}
242242

243+
@Test
243244
public void testCrossClusterRegexBasic() throws IOException {
244245
JSONObject result =
245246
executeQuery(

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -428,11 +428,10 @@ public String visitRex(Rex node, String context) {
428428
StringBuilder command = new StringBuilder();
429429

430430
// Build the base command
431-
if (node.getMode() == Rex.RexMode.SED) {
432-
command.append(String.format("%s | rex field=%s mode=sed %s", child, field, pattern));
433-
} else {
434-
command.append(String.format("%s | rex field=%s %s", child, field, pattern));
435-
}
431+
command.append(
432+
String.format(
433+
"%s | rex field=%s mode=%s %s",
434+
child, field, node.getMode().toString().toLowerCase(), pattern));
436435

437436
// Add optional parameters
438437
if (node.getMaxMatch().isPresent()) {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,14 +514,15 @@ public void testPatterns() {
514514
@Test
515515
public void testRexCommand() {
516516
assertEquals(
517-
"source=t | rex field=message \"(?<user>[A-Z]+)\"",
517+
"source=t | rex field=message mode=extract \"(?<user>[A-Z]+)\"",
518518
anonymize("source=t | rex field=message \"(?<user>[A-Z]+)\""));
519519
assertEquals(
520-
"source=t | rex field=lastname \"(?<initial>^[A-Z])\" | fields + lastname,initial",
520+
"source=t | rex field=lastname mode=extract \"(?<initial>^[A-Z])\" | fields +"
521+
+ " lastname,initial",
521522
anonymize(
522523
"source=t | rex field=lastname \"(?<initial>^[A-Z])\" | fields lastname, initial"));
523524
assertEquals(
524-
"source=t | rex field=name \"(?<first>[A-Z])\" max_match=3",
525+
"source=t | rex field=name mode=extract \"(?<first>[A-Z])\" max_match=3",
525526
anonymize("source=t | rex field=name \"(?<first>[A-Z])\" max_match=3"));
526527
}
527528

@@ -538,7 +539,7 @@ public void testRexSedMode() {
538539
@Test
539540
public void testRexWithOffsetField() {
540541
assertEquals(
541-
"source=t | rex field=message \"(?<word>[a-z]+)\" offset_field=pos",
542+
"source=t | rex field=message mode=extract \"(?<word>[a-z]+)\" offset_field=pos",
542543
anonymize("source=t | rex field=message \"(?<word>[a-z]+)\" offset_field=pos"));
543544
}
544545

0 commit comments

Comments
 (0)