Allow join types for now

Signed-off-by: Tomoyuki Morita <[email protected]>
opensearch-project · Sep 20, 2024 · 683126e · 683126e
1 parent d31bdc8
commit 683126e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/...-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java b/...-core/src/main/java/org/opensearch/sql/spark/validator/S3GlueGrammarElementValidator.java
@@ -55,11 +55,6 @@ public class S3GlueGrammarElementValidator extends DenyListGrammarElementValidat
               HINTS,
               INLINE_TABLE,
               FILE,
-              CROSS_JOIN,
-              LEFT_SEMI_JOIN,
-              RIGHT_OUTER_JOIN,
-              FULL_OUTER_JOIN,
-              LEFT_ANTI_JOIN,
               TABLESAMPLE,
               TABLE_VALUED_FUNCTION,
               TRANSFORM,

diff --git a/...src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java b/...src/main/java/org/opensearch/sql/spark/validator/SecurityLakeGrammarElementValidator.java
@@ -81,11 +81,6 @@ public class SecurityLakeGrammarElementValidator extends DenyListGrammarElementV
               HINTS,
               INLINE_TABLE,
               FILE,
-              CROSS_JOIN,
-              LEFT_SEMI_JOIN,
-              RIGHT_OUTER_JOIN,
-              FULL_OUTER_JOIN,
-              LEFT_ANTI_JOIN,
               TABLESAMPLE,
               TABLE_VALUED_FUNCTION,
               TRANSFORM,

diff --git a/async-query-core/src/test/java/org/opensearch/sql/spark/validator/SQLQueryValidatorTest.java b/async-query-core/src/test/java/org/opensearch/sql/spark/validator/SQLQueryValidatorTest.java
@@ -370,12 +370,12 @@ void testS3glueQueries() {
     v.ng(TestElement.INLINE_TABLE);
     v.ng(TestElement.FILE);
     v.ok(TestElement.INNER_JOIN);
-    v.ng(TestElement.CROSS_JOIN);
+    v.ok(TestElement.CROSS_JOIN);
     v.ok(TestElement.LEFT_OUTER_JOIN);
-    v.ng(TestElement.LEFT_SEMI_JOIN);
-    v.ng(TestElement.RIGHT_OUTER_JOIN);
-    v.ng(TestElement.FULL_OUTER_JOIN);
-    v.ng(TestElement.LEFT_ANTI_JOIN);
+    v.ok(TestElement.LEFT_SEMI_JOIN);
+    v.ok(TestElement.RIGHT_OUTER_JOIN);
+    v.ok(TestElement.FULL_OUTER_JOIN);
+    v.ok(TestElement.LEFT_ANTI_JOIN);
     v.ok(TestElement.LIKE_PREDICATE);
     v.ok(TestElement.LIMIT_CLAUSE);
     v.ok(TestElement.OFFSET_CLAUSE);
@@ -487,12 +487,12 @@ void testSecurityLakeQueries() {
     v.ng(TestElement.INLINE_TABLE);
     v.ng(TestElement.FILE);
     v.ok(TestElement.INNER_JOIN);
-    v.ng(TestElement.CROSS_JOIN);
+    v.ok(TestElement.CROSS_JOIN);
     v.ok(TestElement.LEFT_OUTER_JOIN);
-    v.ng(TestElement.LEFT_SEMI_JOIN);
-    v.ng(TestElement.RIGHT_OUTER_JOIN);
-    v.ng(TestElement.FULL_OUTER_JOIN);
-    v.ng(TestElement.LEFT_ANTI_JOIN);
+    v.ok(TestElement.LEFT_SEMI_JOIN);
+    v.ok(TestElement.RIGHT_OUTER_JOIN);
+    v.ok(TestElement.FULL_OUTER_JOIN);
+    v.ok(TestElement.LEFT_ANTI_JOIN);
     v.ok(TestElement.LIKE_PREDICATE);
     v.ok(TestElement.LIMIT_CLAUSE);
     v.ok(TestElement.OFFSET_CLAUSE);