Remove unused constructor, consolidate tests

Signed-off-by: Lorenzo Stella <stellalo@amazon.de>

Author: lostella

api/build.gradle

@@ -16,6 +16,7 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: "${hamcrest_version}"
     testImplementation group: 'org.mockito', name: 'mockito-core', version: "${mockito_version}"
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: "${mockito_version}"
     testImplementation group: 'org.apache.calcite', name: 'calcite-testkit', version: '1.41.0'
 }
 

api/src/main/java/org/opensearch/sql/api/UnifiedQueryPlanner.java

@@ -79,17 +79,6 @@ public UnifiedQueryPlanner(
       this.settings = settings;
   }
 
-  /**
-   * Constructs a UnifiedQueryPlanner for a given query type and schema root.
-   *
-   * @param queryType the query language type (e.g., PPL)
-   * @param rootSchema the root Calcite schema containing all catalogs and tables
-   * @param defaultPath dot-separated path of schema to set as default schema
-   */
-  public UnifiedQueryPlanner(QueryType queryType, SchemaPlus rootSchema, String defaultPath) {
-      this(queryType, rootSchema, defaultPath, null);
-  }
-
   /**
    * Parses and analyzes a query string into a Calcite logical plan (RelNode). TODO: Generate
    * optimal physical plan to fully unify query execution and leverage Calcite's optimizer.

api/src/test/java/org/opensearch/sql/api/CustomSettingsTest.java

@@ -7,16 +7,55 @@
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.when;
 
 import java.util.Map;
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.schema.Schema;
 import org.apache.calcite.schema.impl.AbstractSchema;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
+import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.executor.QueryType;
 
 public class UnifiedQueryPlannerTest extends UnifiedQueryTestBase {
+// @RunWith(MockitoJUnitRunner.class)
+// public class UnifiedQueryPlannerTest {
+
+//   /** Test schema consists of a test table with id and name columns */
+//   private final AbstractSchema testSchema =
+//       new AbstractSchema() {
+//         @Override
+//         protected Map<String, Table> getTableMap() {
+//           return Map.of(
+//               "index",
+//               new AbstractTable() {
+//                 @Override
+//                 public RelDataType getRowType(RelDataTypeFactory typeFactory) {
+//                   return typeFactory.createStructType(
+//                       List.of(
+//                           typeFactory.createSqlType(SqlTypeName.INTEGER),
+//                           typeFactory.createSqlType(SqlTypeName.VARCHAR)),
+//                       List.of("id", "name"));
+//                 }
+//               },
+//               "index2",
+//               new AbstractTable() {
+//                   @Override
+//                   public RelDataType getRowType(RelDataTypeFactory typeFactory) {
+//                   return typeFactory.createStructType(
+//                       List.of(
+//                           typeFactory.createSqlType(SqlTypeName.INTEGER),
+//                           typeFactory.createSqlType(SqlTypeName.FLOAT)),
+//                       List.of("id", "value"));
+//                   }
+//               }
+//             );
+//         }
+//       };
 
   /** Test catalog consists of test schema above */
   private final AbstractSchema testDeepSchema =
@@ -27,6 +66,8 @@ protected Map<String, Schema> getSubSchemaMap() {
         }
       };
 
+  @Mock private Settings testSettings;
+
   @Test
   public void testPPLQueryPlanning() {
     UnifiedQueryPlanner planner =
@@ -155,4 +196,21 @@ public void testPlanPropagatingSyntaxCheckException() {
 
     planner.plan("source = employees | eval"); // Trigger syntax error from parser
   }
+
+  @Test
+  public void testJoinQuery() {
+    when(testSettings.getSettingValue(Settings.Key.CALCITE_SUPPORT_ALL_JOIN_TYPES))
+      .thenReturn(true);
+
+    UnifiedQueryPlanner planner = UnifiedQueryPlanner.builder()
+      .language(QueryType.PPL)
+      .catalog("opensearch", testSchema)
+      .defaultNamespace("opensearch")
+      .settings(testSettings)
+      .build();
+
+    planner.plan(
+      "source = index | join on index.id = index2.id index2"
+    );
+  }
 }

api/src/test/java/org/opensearch/sql/api/UnifiedQueryPlannerTest.java

@@ -17,6 +17,7 @@
 import org.opensearch.sql.executor.QueryType;
 
 /** Base class for unified query tests providing common test schema and utilities. */
+@RunWith(MockitoJUnitRunner.class)
 public abstract class UnifiedQueryTestBase {
 
   /** Test schema containing sample tables for testing */