Skip to content

Commit a4a6e4e

Browse files
songkant-awssongkant-aws
committed
Merge branch 'main' into udaf-script-pushdown
2 parents fc205cf + c00b8b7 commit a4a6e4e

235 files changed

Lines changed: 12161 additions & 4040 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 & 189 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 & 88 deletions
This file was deleted.

api/src/test/java/org/opensearch/sql/api/UnifiedQueryTestBase.java renamed to api/src/testFixtures/java/org/opensearch/sql/api/UnifiedQueryTestBase.java

File renamed without changes.

‎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'

‎benchmarks/README.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,18 @@ The microbenchmark suite is also handy for ad-hoc microbenchmarks but please rem
1010

1111
## Getting Started
1212

13-
Just run `./gradlew :benchmarks:jmh` from the project root directory or run specific benchmark via your IDE. It will build all microbenchmarks, execute them and print the result.
13+
Run all benchmarks from the project root directory:
14+
15+
```bash
16+
./gradlew :benchmarks:jmh
17+
```
18+
19+
Run specific benchmarks using the `-Pjmh.includes` parameter:
20+
21+
```bash
22+
./gradlew :benchmarks:jmh -Pjmh.includes='UnifiedQueryBenchmark'
23+
./gradlew :benchmarks:jmh -Pjmh.includes='UnifiedQueryBenchmark.plan.*'
24+
```
1425

1526
## Adding Microbenchmarks
1627

‎benchmarks/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
plugins {
77
id 'java-library'
8+
id "io.freefair.lombok"
89
id "me.champeau.jmh" version "0.7.3"
910
}
1011

@@ -15,6 +16,8 @@ repositories {
1516
dependencies {
1617
implementation project(':core')
1718
implementation project(':opensearch')
19+
implementation project(':api')
20+
jmhImplementation testFixtures(project(':api'))
1821

1922
// Dependencies required by JMH micro benchmark
2023
api group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.36'
@@ -30,4 +33,9 @@ spotless {
3033
}
3134
}
3235

36+
// JMH configuration passed via command line
37+
jmh {
38+
includes = project.hasProperty('jmh.includes') ? [project.property('jmh.includes')] : []
39+
}
40+
3341
compileJava.options.compilerArgs.addAll(["-processor", "org.openjdk.jmh.generators.BenchmarkProcessor"])

0 commit comments

Comments
 (0)