Skip to content

Commit 3fd9714

Browse files
committed
Merge remote-tracking branch 'origin/main' into issues/4636
# Conflicts: # core/src/main/java/org/opensearch/sql/calcite/CalcitePlanContext.java # core/src/main/java/org/opensearch/sql/calcite/DynamicFieldsHelper.java # core/src/main/java/org/opensearch/sql/expression/function/CollectionUDF/AppendFunctionImpl.java # core/src/main/java/org/opensearch/sql/expression/function/PPLBuiltinOperators.java # core/src/main/java/org/opensearch/sql/expression/function/PPLFuncImpTable.java # core/src/main/java/org/opensearch/sql/expression/function/jsonUDF/JsonExtractAllFunctionImpl.java # integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLSpathCommandIT.java # integ-test/src/test/resources/expectedOutput/calcite/big5/dedup_metrics_size_field.yaml # integ-test/src/test/resources/expectedOutput/calcite/clickbench/q29.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_complex_sort_expr_pushdown_for_smj_w_max_option.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_dedup_expr3.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_dedup_expr3_alternative.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_dedup_expr4.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_dedup_with_expr4_alternative.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_patterns_simple_pattern_agg_push.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_spath_with_dynamic_fields.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_spath_without_path.yaml # integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_spath_with_dynamic_fields.yaml # integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_spath_without_path.yaml # integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4866.yml # ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLFunctionTypeTest.java
2 parents 5723ced + c00b8b7 commit 3fd9714

199 files changed

Lines changed: 9667 additions & 5226 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coderabbit.yaml

Lines changed: 0 additions & 167 deletions
This file was deleted.

.github/workflows/coderabbit-feedback.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/pr_review.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: PR Review
3+
on:
4+
pull_request_target:
5+
types: [opened, synchronize, reopened]
6+
7+
jobs:
8+
Code-Diff-Analyzer:
9+
uses: opensearch-project/opensearch-build/.github/workflows/code-diff-analyzer.yml@main
10+
if: github.repository == 'opensearch-project/sql'
11+
permissions:
12+
id-token: write # github oidc to assume aws roles
13+
pull-requests: write # to create or update comment (peter-evans/create-or-update-comment)
14+
secrets:
15+
BEDROCK_ACCESS_ROLE: ${{ secrets.BEDROCK_ACCESS_ROLE }}
16+
with:
17+
skip_diff_analyzer_with_label_name: 'skip-diff-analyzer'
18+
update_pr_comment_with_analyzer_report: true
19+
20+
Code-Diff-Reviewer:
21+
uses: opensearch-project/opensearch-build/.github/workflows/code-diff-reviewer.yml@main
22+
needs: Code-Diff-Analyzer
23+
if: github.repository == 'opensearch-project/sql'
24+
permissions:
25+
id-token: write # github oidc to assume aws roles
26+
pull-requests: write # to create or update comment (peter-evans/create-or-update-comment)
27+
secrets:
28+
BEDROCK_ACCESS_ROLE: ${{ secrets.BEDROCK_ACCESS_ROLE }}
29+
with:
30+
skip_diff_reviewer_with_label_name: 'skip-diff-reviewer'

.rules/REVIEW_GUIDELINES.md

Lines changed: 0 additions & 132 deletions
This file was deleted.

async-query-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ configurations {
4343
}
4444

4545
dependencies {
46-
antlr "org.antlr:antlr4:4.7.1"
46+
antlr "org.antlr:antlr4:4.13.2"
4747

4848
implementation project(':core')
4949
implementation 'org.json:json:20231013'

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
buildscript {
88
ext {
9-
opensearch_version = System.getProperty("opensearch.version", "3.5.0-SNAPSHOT")
9+
opensearch_version = System.getProperty("opensearch.version", "3.6.0-SNAPSHOT")
1010
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
1111
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
1212
version_tokens = opensearch_version.tokenize('-')

common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ repositories {
3333
}
3434

3535
dependencies {
36-
api "org.antlr:antlr4-runtime:4.7.1"
36+
api "org.antlr:antlr4-runtime:4.13.2"
3737
api group: 'com.google.guava', name: 'guava', version: "${guava_version}"
3838
api group: 'org.apache.logging.log4j', name: 'log4j-core', version:"${versions.log4j}"
3939
api group: 'org.apache.commons', name: 'commons-lang3', version: "${commons_lang3_version}"

0 commit comments

Comments
 (0)