Rebase

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

Author: lostella

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

@@ -20,41 +20,8 @@
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.executor.QueryType;
 
+@RunWith(MockitoJUnitRunner.class)
 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 =
@@ -206,6 +173,6 @@ public void testJoinQuery() {
             .settings(testSettings)
             .build();
 
-    planner.plan("source = index | join on index.id = index2.id index2");
+    planner.plan("source = employees | join on employees.id = payslips.id payslips");
   }
 }

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

@@ -17,7 +17,6 @@
 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 */
@@ -32,7 +31,7 @@ public void setUp() {
         new AbstractSchema() {
           @Override
           protected Map<String, Table> getTableMap() {
-            return Map.of("employees", createEmployeesTable());
+            return Map.of("employees", createEmployeesTable(), "payslips", createPayslipsTable());
           }
         };
 
@@ -58,4 +57,18 @@ public RelDataType getRowType(RelDataTypeFactory typeFactory) {
       }
     };
   }
+
+  protected Table createPayslipsTable() {
+    return new AbstractTable() {
+      @Override
+      public RelDataType getRowType(RelDataTypeFactory typeFactory) {
+        return typeFactory.createStructType(
+            List.of(
+                typeFactory.createSqlType(SqlTypeName.INTEGER),
+                typeFactory.createSqlType(SqlTypeName.DATE),
+                typeFactory.createSqlType(SqlTypeName.FLOAT)),
+            List.of("id", "date", "salary"));
+      }
+    };
+  }
 }