remove useless change and resolve comment

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

core/src/main/java/org/opensearch/sql/ast/expression/SearchGroup.java

@@ -28,6 +28,9 @@ public String toQueryString() {
 
   @Override
   public String toAnonymizedString() {
+    if (expression instanceof SearchGroup) {
+      return expression.toAnonymizedString();
+    }
     return "(" + expression.toAnonymizedString() + ")";
   }
 

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

@@ -7,6 +7,7 @@
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;
+import javax.annotation.Nullable;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -27,7 +28,12 @@ public class Search extends UnresolvedPlan {
   @EqualsAndHashCode.Include private final UnresolvedPlan child;
   @EqualsAndHashCode.Include private final String queryString;
 
-  private final SearchExpression originalExpression;
+  // Currently it's only for anonymizer
+  private final @Nullable SearchExpression originalExpression;
+
+  public Search(UnresolvedPlan child, String queryString) {
+    this(child, queryString, null);
+  }
 
   @Override
   public List<UnresolvedPlan> getChild() {

core/src/test/java/org/opensearch/sql/ast/tree/SearchTest.java

@@ -29,7 +29,7 @@ public class SearchTest {
   public void setUp() {
     mockChild = mock(UnresolvedPlan.class);
     testQueryString = "field1:value1 AND field2:value2";
-    search = new Search(mockChild, testQueryString, null);
+    search = new Search(mockChild, testQueryString);
   }
 
   @Test
@@ -69,7 +69,7 @@ public void testAccept() {
   public void testEquals() {
     UnresolvedPlan sameChild = mockChild;
     String sameQueryString = testQueryString;
-    Search sameSearch = new Search(sameChild, sameQueryString, null);
+    Search sameSearch = new Search(sameChild, sameQueryString);
 
     assertEquals(search, sameSearch);
     assertEquals(search, search);
@@ -78,14 +78,14 @@ public void testEquals() {
   @Test
   public void testNotEqualsWithDifferentChild() {
     UnresolvedPlan differentChild = mock(UnresolvedPlan.class);
-    Search differentSearch = new Search(differentChild, testQueryString, null);
+    Search differentSearch = new Search(differentChild, testQueryString);
 
     assertNotEquals(search, differentSearch);
   }
 
   @Test
   public void testNotEqualsWithDifferentQueryString() {
-    Search differentSearch = new Search(mockChild, "different:query", null);
+    Search differentSearch = new Search(mockChild, "different:query");
 
     assertNotEquals(search, differentSearch);
   }
@@ -102,14 +102,14 @@ public void testNotEqualsWithDifferentClass() {
 
   @Test
   public void testHashCode() {
-    Search sameSearch = new Search(mockChild, testQueryString, null);
+    Search sameSearch = new Search(mockChild, testQueryString);
     assertEquals(search.hashCode(), sameSearch.hashCode());
   }
 
   @Test
   public void testHashCodeWithDifferentValues() {
     UnresolvedPlan differentChild = mock(UnresolvedPlan.class);
-    Search differentSearch = new Search(differentChild, "different:query", null);
+    Search differentSearch = new Search(differentChild, "different:query");
     assertNotEquals(search.hashCode(), differentSearch.hashCode());
   }
 
@@ -123,22 +123,22 @@ public void testToString() {
 
   @Test
   public void testWithEmptyQueryString() {
-    Search emptySearch = new Search(mockChild, "", null);
+    Search emptySearch = new Search(mockChild, "");
     assertEquals("", emptySearch.getQueryString());
     assertEquals(mockChild, emptySearch.getChild().get(0));
   }
 
   @Test
   public void testWithComplexQueryString() {
     String complexQuery = "(field1:value1 OR field2:value2) AND NOT field3:value3";
-    Search complexSearch = new Search(mockChild, complexQuery, null);
+    Search complexSearch = new Search(mockChild, complexQuery);
     assertEquals(complexQuery, complexSearch.getQueryString());
   }
 
   @Test
   public void testWithSpecialCharactersInQueryString() {
     String specialCharsQuery = "field:\"value with spaces\" AND field2:value*";
-    Search specialSearch = new Search(mockChild, specialCharsQuery, null);
+    Search specialSearch = new Search(mockChild, specialCharsQuery);
     assertEquals(specialCharsQuery, specialSearch.getQueryString());
   }
 }

core/src/test/java/org/opensearch/sql/calcite/CalciteRelNodeVisitorSearchSimpleTest.java

@@ -53,7 +53,7 @@ public void testSearchNodeStructure() {
     Relation relation = new Relation(AstDSL.qualifiedName("test_index"));
 
     // Act
-    Search searchNode = new Search(relation, queryString, null);
+    Search searchNode = new Search(relation, queryString);
 
     // Assert
     assertNotNull(searchNode);
@@ -70,7 +70,7 @@ public void testSearchWithEmptyQuery() {
     Relation relation = new Relation(AstDSL.qualifiedName("test_index"));
 
     // Act
-    Search searchNode = new Search(relation, queryString, null);
+    Search searchNode = new Search(relation, queryString);
 
     // Assert
     assertEquals("", searchNode.getQueryString());
@@ -84,7 +84,7 @@ public void testSearchWithComplexQuery() {
     Relation relation = new Relation(AstDSL.qualifiedName("test_index"));
 
     // Act
-    Search searchNode = new Search(relation, queryString, null);
+    Search searchNode = new Search(relation, queryString);
 
     // Assert
     assertEquals(queryString, searchNode.getQueryString());
@@ -97,7 +97,7 @@ public void testSearchWithSpecialCharacters() {
     Relation relation = new Relation(AstDSL.qualifiedName("test_index"));
 
     // Act
-    Search searchNode = new Search(relation, queryString, null);
+    Search searchNode = new Search(relation, queryString);
 
     // Assert
     assertEquals(queryString, searchNode.getQueryString());

ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java

@@ -80,8 +80,6 @@
 import org.opensearch.sql.ast.tree.Kmeans;
 import org.opensearch.sql.ast.tree.ML;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
-import org.opensearch.sql.ast.tree.Search;
-import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.common.setting.Settings.Key;
@@ -115,7 +113,7 @@ public void setup() {
 
   @Test
   public void testSearchCommand() {
-    assertSearchEqual("search source=t a=1", search(relation("t"), "a:1"));
+    assertEqual("search source=t a=1", search(relation("t"), "a:1"));
   }
 
   @Test
@@ -176,7 +174,7 @@ public void testSearchWithPrometheusQueryRangeWithNamedArguments() {
 
   @Test
   public void testSearchCommandString() {
-    assertSearchEqual("search source=t a=\"a\"", search(relation("t"), "a:a"));
+    assertEqual("search source=t a=\"a\"", search(relation("t"), "a:a"));
   }
 
   @Test
@@ -187,7 +185,7 @@ public void testSearchCommandWithoutSearch() {
 
   @Test
   public void testSearchCommandWithFilterBeforeSource() {
-    assertSearchEqual("search a=1 source=t", search(relation("t"), "a:1"));
+    assertEqual("search a=1 source=t", search(relation("t"), "a:1"));
   }
 
   @Test
@@ -1393,14 +1391,6 @@ protected void assertEqual(String query, Node expectedPlan) {
     assertEquals(expectedPlan, actualPlan);
   }
 
-  protected void assertSearchEqual(String query, UnresolvedPlan expectedPlan) {
-    Node actualPlan = plan(query);
-    assertTrue(actualPlan instanceof Search);
-    assertTrue(expectedPlan instanceof Search);
-    assertEquals(expectedPlan.getChild(), actualPlan.getChild());
-    assertEquals(((Search) expectedPlan).getQueryString(), ((Search) actualPlan).getQueryString());
-  }
-
   protected void assertEqual(String query, String expected) {
     Node expectedPlan = plan(expected);
     assertEqual(query, expectedPlan);

ppl/src/test/java/org/opensearch/sql/ppl/parser/AstExpressionBuilderTest.java

@@ -73,7 +73,7 @@ public void testLogicalNotExpr() {
     assertEqual(
         "source=t | where not a=1",
         filter(relation("t"), not(compare("=", field("a"), intLiteral(1)))));
-    assertSearchEqual("source=t not a=1", search(relation("t"), "NOT(a:1)"));
+    assertEqual("source=t not a=1", search(relation("t"), "NOT(a:1)"));
   }
 
   @Test
@@ -83,7 +83,7 @@ public void testLogicalOrExpr() {
         filter(
             relation("t"),
             or(compare("=", field("a"), intLiteral(1)), compare("=", field("b"), intLiteral(2)))));
-    assertSearchEqual("source=t a=1 or b=2", search(relation("t"), "(a:1 OR b:2)"));
+    assertEqual("source=t a=1 or b=2", search(relation("t"), "(a:1 OR b:2)"));
   }
 
   @Test
@@ -93,7 +93,7 @@ public void testLogicalAndExpr() {
         filter(
             relation("t"),
             and(compare("=", field("a"), intLiteral(1)), compare("=", field("b"), intLiteral(2)))));
-    assertSearchEqual("source=t a=1 and b=2", search(relation("t"), "(a:1 AND b:2)"));
+    assertEqual("source=t a=1 and b=2", search(relation("t"), "(a:1 AND b:2)"));
   }
 
   @Test
@@ -103,8 +103,8 @@ public void testLogicalAndExprWithoutKeywordAnd() {
         filter(
             relation("t"),
             and(compare("=", field("a"), intLiteral(1)), compare("=", field("b"), intLiteral(2)))));
-    assertSearchEqual("source=t a=1 b=2", search(relation("t"), "(a:1) AND (b:2)"));
-    assertSearchEqual(
+    assertEqual("source=t a=1 b=2", search(relation("t"), "(a:1) AND (b:2)"));
+    assertEqual(
         "source=t a=1 b=2 c=2 text", search(relation("t"), "(a:1) AND (b:2) AND (c:2) AND (text)"));
   }
 
@@ -130,7 +130,7 @@ public void testLogicalAndOr() {
                         compare("=", field("b"), intLiteral(2))),
                     compare("=", field("c"), intLiteral(3))),
                 compare("=", field("d"), intLiteral(4)))));
-    assertSearchEqual(
+    assertEqual(
         "source=t  a=1 and b=2 and c=3 or d=4",
         search(relation("t"), "((a:1 AND b:2) AND (c:3 OR d:4))"));
   }
@@ -149,7 +149,7 @@ public void testLogicalParenthetic() {
                     compare("=", field("c"), intLiteral(3)),
                     compare("=", field("d"), intLiteral(4))))));
 
-    assertSearchEqual(
+    assertEqual(
         "source=t (a=1 or b=2) and (c=3 or d=4)",
         search(relation("t"), "(((a:1 OR b:2)) AND ((c:3 OR d:4)))"));
   }
@@ -416,14 +416,14 @@ public void testCompareExpr() {
     assertEqual(
         "source=t | where a='b'",
         filter(relation("t"), compare("=", field("a"), stringLiteral("b"))));
-    assertSearchEqual("source=t a='b'", search(relation("t"), "a:b"));
+    assertEqual("source=t a='b'", search(relation("t"), "a:b"));
   }
 
   @Test
   public void testCompareFieldsExpr() {
     assertEqual(
         "source=t | where a>b", filter(relation("t"), compare(">", field("a"), field("b"))));
-    assertSearchEqual("source=t a>b", search(relation("t"), "a:>b"));
+    assertEqual("source=t a>b", search(relation("t"), "a:>b"));
   }
 
   @Test
@@ -455,7 +455,7 @@ public void testMixedEqualOperators() {
 
   @Test
   public void testInExpr() {
-    assertSearchEqual("source=t f in (1, 2, 3)", search(relation("t"), "f:( 1 OR 2 OR 3 )"));
+    assertEqual("source=t f in (1, 2, 3)", search(relation("t"), "f:( 1 OR 2 OR 3 )"));
 
     assertEqual(
         "source=t | where f in (1, 2, 3)",
@@ -914,7 +914,7 @@ public void testNestedFieldNameWithSpecialChars() {
 
   @Test
   public void testStringLiteralExpr() {
-    assertSearchEqual("source=t a=\"string\"", search(relation("t"), "a:string"));
+    assertEqual("source=t a=\"string\"", search(relation("t"), "a:string"));
     assertEqual(
         "source=t | where a=\"string\"",
         filter(relation("t"), compare("=", field("a"), stringLiteral("string"))));
@@ -930,12 +930,12 @@ public void testIntegerLiteralExpr() {
                 compare("=", field("a"), intLiteral(1)),
                 compare("=", field("b"), intLiteral(-1)))));
 
-    assertSearchEqual("source=t a=1 b=-1", search(relation("t"), "(a:1) AND (b:-1)"));
+    assertEqual("source=t a=1 b=-1", search(relation("t"), "(a:1) AND (b:-1)"));
   }
 
   @Test
   public void testLongLiteralExpr() {
-    assertSearchEqual(
+    assertEqual(
         "source=t a=1234567890123 b=-1234567890123",
         search(relation("t"), "(a:1234567890123) AND (b:-1234567890123)"));
 
@@ -950,39 +950,39 @@ public void testLongLiteralExpr() {
 
   @Test
   public void testDoubleLiteralExpr() {
-    assertSearchEqual("source=t b=0.1d", search(relation("t"), "b:0.1"));
+    assertEqual("source=t b=0.1d", search(relation("t"), "b:0.1"));
     assertEqual(
         "source=t | where b=0.1d",
         filter(relation("t"), compare("=", field("b"), doubleLiteral(0.1))));
   }
 
   @Test
   public void testFloatLiteralExpr() {
-    assertSearchEqual("source=t b=0.1f", search(relation("t"), "b:0.1"));
+    assertEqual("source=t b=0.1f", search(relation("t"), "b:0.1"));
     assertEqual(
         "source=t | where b=0.1f",
         filter(relation("t"), compare("=", field("b"), floatLiteral(0.1f))));
   }
 
   @Test
   public void testDecimalLiteralExpr() {
-    assertSearchEqual("source=t b=0.1", search(relation("t"), "b:0.1"));
+    assertEqual("source=t b=0.1", search(relation("t"), "b:0.1"));
     assertEqual(
         "source=t | where b=0.1",
         filter(relation("t"), compare("=", field("b"), decimalLiteral(0.1))));
   }
 
   @Test
   public void testBooleanLiteralExpr() {
-    assertSearchEqual("source=t a=true", search(relation("t"), "a:true"));
+    assertEqual("source=t a=true", search(relation("t"), "a:true"));
     assertEqual(
         "source=t | where a=true",
         filter(relation("t"), compare("=", field("a"), booleanLiteral(true))));
   }
 
   @Test
   public void testBackQuotedFieldNames() {
-    assertSearchEqual("source=t `first name`=true", search(relation("t"), "first\\ name:true"));
+    assertEqual("source=t `first name`=true", search(relation("t"), "first\\ name:true"));
     assertEqual(
         "source=t | where `first name`=true",
         filter(relation("t"), compare("=", field("first name"), booleanLiteral(true))));
@@ -1370,23 +1370,23 @@ public void testMedianAggFuncExpr() {
 
   @Test
   public void testTimeModifierEarliestWithNumericValue() {
-    assertSearchEqual("source=t earliest=1", search(relation("t"), "@timestamp:>=1000"));
+    assertEqual("source=t earliest=1", search(relation("t"), "@timestamp:>=1000"));
 
-    assertSearchEqual(
+    assertEqual(
         "source=t earliest=1754020061.123456",
         search(relation("t"), "@timestamp:>=1754020061123.456"));
   }
 
   @Test
   public void testTimeModifierLatestWithNowValue() {
-    assertSearchEqual(
+    assertEqual(
         "source=t earliest=now latest=now()",
         search(relation("t"), "(@timestamp:>=now) AND (@timestamp:<=now)"));
   }
 
   @Test
   public void testTimeModifierEarliestWithStringValue() {
-    assertSearchEqual(
+    assertEqual(
         "source=t earliest='2025-12-10 14:00:00'",
         search(relation("t"), "@timestamp:>=2025\\-12\\-10T14\\:00\\:00Z"));
   }