Merge branch 'main' into feature/headtop-limit

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

Author: Swiddis

.gitignore

@@ -52,5 +52,7 @@ http-client.env.json
 /doctest/opensearch-job-scheduler/
 .factorypath
 
-# Claude Code files
-.claude/
+# Coding agent files (could be symlinks)
+.claude
+.clinerules
+memory-bank

common/src/main/java/org/opensearch/sql/common/setting/Settings.java

@@ -37,6 +37,7 @@ public enum Key {
     CALCITE_PUSHDOWN_ENABLED("plugins.calcite.pushdown.enabled"),
     CALCITE_PUSHDOWN_ROWCOUNT_ESTIMATION_FACTOR(
         "plugins.calcite.pushdown.rowcount.estimation.factor"),
+    CALCITE_SUPPORT_ALL_JOIN_TYPES("plugins.calcite.all_join_types.allowed"),
 
     /** Query Settings. */
     FIELD_TYPE_TOLERANCE("plugins.query.field_type_tolerance"),

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

@@ -39,15 +39,24 @@ public static class ArgumentMap {
     private final Map<String, Literal> map;
 
     public ArgumentMap(List<Argument> arguments) {
-      this.map =
-          arguments.stream()
-              .collect(java.util.stream.Collectors.toMap(Argument::getArgName, Argument::getValue));
+      if (arguments == null || arguments.isEmpty()) {
+        this.map = Map.of();
+      } else {
+        this.map =
+            arguments.stream()
+                .collect(
+                    java.util.stream.Collectors.toMap(Argument::getArgName, Argument::getValue));
+      }
     }
 
     public static ArgumentMap of(List<Argument> arguments) {
       return new ArgumentMap(arguments);
     }
 
+    public static ArgumentMap empty() {
+      return new ArgumentMap(null);
+    }
+
     /**
      * Get argument value by name.
      *

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

@@ -46,4 +46,8 @@ public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
   public String toString() {
     return String.valueOf(value);
   }
+
+  public static Literal TRUE = new Literal(true, DataType.BOOLEAN);
+  public static Literal FALSE = new Literal(false, DataType.BOOLEAN);
+  public static Literal ZERO = new Literal(Integer.valueOf("0"), DataType.INTEGER);
 }

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

@@ -15,6 +15,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.expression.Argument;
+import org.opensearch.sql.ast.expression.Field;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
 @ToString
@@ -28,20 +30,26 @@ public class Join extends UnresolvedPlan {
   private final JoinType joinType;
   private final Optional<UnresolvedExpression> joinCondition;
   private final JoinHint joinHint;
+  private final Optional<List<Field>> joinFields;
+  private final Argument.ArgumentMap argumentMap;
 
   public Join(
       UnresolvedPlan right,
       Optional<String> leftAlias,
       Optional<String> rightAlias,
       JoinType joinType,
       Optional<UnresolvedExpression> joinCondition,
-      JoinHint joinHint) {
+      JoinHint joinHint,
+      Optional<List<Field>> joinFields,
+      Argument.ArgumentMap argumentMap) {
     this.right = right;
     this.leftAlias = leftAlias;
     this.rightAlias = rightAlias;
     this.joinType = joinType;
     this.joinCondition = joinCondition;
     this.joinHint = joinHint;
+    this.joinFields = joinFields;
+    this.argumentMap = argumentMap;
   }
 
   @Override
@@ -89,6 +97,11 @@ public enum JoinType {
     FULL
   }
 
+  /** RIGHT, CROSS, FULL are performance sensitive join types */
+  public static List<JoinType> highCostJoinTypes() {
+    return List.of(JoinType.RIGHT, JoinType.CROSS, JoinType.FULL);
+  }
+
   @Getter
   @RequiredArgsConstructor
   public static class JoinHint {