Move some stuff around

Signed-off-by: Simeon Widdis <[email protected]>

Author: Swiddis

ppl/src/main/antlr/OpenSearchPPLParser.g4

@@ -306,7 +306,7 @@ topCommand
    ;
 
 rareCommand
-   : RARE (number = integerLiteral)? (COUNTFIELD EQUAL countfield = stringLiteral)? (SHOWCOUNT EQUAL showcount = booleanLiteral)? fieldList (byClause)?
+   : RARE ((LIMIT EQUAL)? number = integerLiteral)? (COUNTFIELD EQUAL countfield = stringLiteral)? (SHOWCOUNT EQUAL showcount = booleanLiteral)? fieldList (byClause)?
    ;
 
 grokCommand

ppl/src/test/java/org/opensearch/sql/ppl/AstPlanningTest.java renamed to ppl/src/test/java/org/opensearch/sql/ppl/AstPlanningTestBase.java

@@ -12,7 +12,7 @@
 import org.opensearch.sql.ppl.parser.AstBuilder;
 
 /** Base class for tests for the AST query planner. */
-public class AstPlanningTest {
+public class AstPlanningTestBase {
   protected final Settings settings = Mockito.mock(Settings.class);
   protected final PPLSyntaxParser parser = new PPLSyntaxParser();
 

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

@@ -76,10 +76,10 @@
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.common.setting.Settings.Key;
-import org.opensearch.sql.ppl.AstPlanningTest;
+import org.opensearch.sql.ppl.AstPlanningTestBase;
 import org.opensearch.sql.utils.SystemIndexUtils;
 
-public class AstBuilderTest extends AstPlanningTest {
+public class AstBuilderTest extends AstPlanningTestBase {
 
   @Rule public ExpectedException exceptionRule = ExpectedException.none();
 

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

@@ -8,9 +8,9 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.opensearch.sql.ppl.AstPlanningTest;
+import org.opensearch.sql.ppl.AstPlanningTestBase;
 
-public class AstEquivalenceTest extends AstPlanningTest {
+public class AstEquivalenceTest extends AstPlanningTestBase {
   @Test
   public void testSpathArgumentDeshuffle() {
     assertEquals(plan("source = t | spath path=a input=a"), plan("source = t | spath input=a a"));

ppl/src/test/java/org/opensearch/sql/ppl/utils/SPathRewriteTest.java renamed to ppl/src/test/java/org/opensearch/sql/ppl/rewrite/SpathRewriteTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.ppl.utils;
+package org.opensearch.sql.ppl.rewrite;
 
 import static org.junit.Assert.assertEquals;
 import static org.opensearch.sql.ast.dsl.AstDSL.eval;
@@ -17,9 +17,9 @@
 import org.junit.Test;
 import org.opensearch.sql.ast.tree.Eval;
 import org.opensearch.sql.ast.tree.SPath;
-import org.opensearch.sql.ppl.AstPlanningTest;
+import org.opensearch.sql.ppl.AstPlanningTestBase;
 
-public class SPathRewriteTest extends AstPlanningTest {
+public class SpathRewriteTest extends AstPlanningTestBase {
   // Control test to make sure something fundamental hasn't changed about the json_extract parsing
   @Test
   public void testEvalControl() {