Skip to content

Commit 137935b

Browse files
authored
Merge main for OpenSearch 3.0 release. (#3434)
Signed-off-by: Peng Huo <penghuo@gmail.com>
1 parent ea0c708 commit 137935b

File tree

360 files changed

+5349
-4858
lines changed

Some content is hidden

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

360 files changed

+5349
-4858
lines changed

.github/workflows/integ-tests-with-security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
java: [21]
24+
java: [21, 23]
2525
runs-on: ubuntu-latest
2626
container:
2727
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -62,7 +62,7 @@ jobs:
6262
fail-fast: false
6363
matrix:
6464
os: [ windows-latest, macos-13 ]
65-
java: [21]
65+
java: [21, 23]
6666

6767
runs-on: ${{ matrix.os }}
6868

.github/workflows/sql-pitest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
matrix:
2323
java:
2424
- 21
25+
- 23
2526
runs-on: ubuntu-latest
2627
container:
2728
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution

.github/workflows/sql-test-and-build-workflow.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# Run all jobs
3030
fail-fast: false
3131
matrix:
32-
java: [21]
32+
java: [21, 23]
3333
runs-on: ubuntu-latest
3434
container:
3535
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -101,7 +101,9 @@ jobs:
101101
matrix:
102102
entry:
103103
- { os: windows-latest, java: 21, os_build_args: -x doctest -PbuildPlatform=windows }
104+
- { os: windows-latest, java: 23, os_build_args: -x doctest -PbuildPlatform=windows }
104105
- { os: macos-13, java: 21 }
106+
- { os: macos-13, java: 23 }
105107
runs-on: ${{ matrix.entry.os }}
106108

107109
steps:
@@ -161,7 +163,7 @@ jobs:
161163
runs-on: ubuntu-latest
162164
strategy:
163165
matrix:
164-
java: [21]
166+
java: [21, 23]
165167
container:
166168
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
167169
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}

.github/workflows/sql-test-workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
matrix:
2323
java:
2424
- 21
25+
- 23
2526
runs-on: ubuntu-latest
2627
container:
2728
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution

DEVELOPER_GUIDE.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ The plugin codebase is in standard layout of Gradle project::
146146
├── plugin
147147
├── protocol
148148
├── ppl
149-
├── spark
150149
├── sql
151150
├── sql-cli
152151
├── sql-jdbc
@@ -161,7 +160,6 @@ Here are sub-folders (Gradle modules) for plugin source code:
161160
- ``core``: core query engine.
162161
- ``opensearch``: OpenSearch storage engine.
163162
- ``prometheus``: Prometheus storage engine.
164-
- ``spark`` : Spark storage engine
165163
- ``protocol``: request/response protocol formatter.
166164
- ``common``: common util code.
167165
- ``integ-test``: integration and comparison test.
@@ -296,7 +294,6 @@ For test cases, you can use the cases in the following checklist in case you mis
296294

297295
- *Other Statements*
298296

299-
- DELETE
300297
- SHOW
301298
- DESCRIBE
302299

async-query-core/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
id 'jacoco'
1010
id 'antlr'
1111
id 'com.diffplug.spotless' version '6.22.0'
12-
id 'com.github.johnrengelman.shadow'
12+
id 'com.gradleup.shadow'
1313
}
1414

1515
repositories {
@@ -46,10 +46,9 @@ dependencies {
4646
antlr "org.antlr:antlr4:4.7.1"
4747

4848
implementation project(':core')
49-
implementation project(':spark') // TODO: dependency to spark should be eliminated
50-
implementation project(':datasources') // TODO: dependency to datasources should be eliminated
5149
implementation 'org.json:json:20231013'
5250
implementation 'com.google.code.gson:gson:2.8.9'
51+
api group: 'com.amazonaws', name: 'aws-java-sdk-emrserverless', version: "${aws_java_sdk_version}"
5352

5453
testImplementation(platform("org.junit:junit-bom:5.9.3"))
5554

@@ -148,4 +147,4 @@ shadowJar {
148147

149148
from sourceSets.main.output
150149
configurations = [project.configurations.runtimeClasspath]
151-
}
150+
}

spark/src/main/java/org/opensearch/sql/spark/data/type/SparkDataType.java renamed to async-query-core/src/main/java/org/opensearch/sql/spark/data/type/SparkDataType.java

File renamed without changes.

spark/src/main/java/org/opensearch/sql/spark/data/value/SparkExprValue.java renamed to async-query-core/src/main/java/org/opensearch/sql/spark/data/value/SparkExprValue.java

File renamed without changes.

spark/src/main/java/org/opensearch/sql/spark/functions/response/DefaultSparkSqlFunctionResponseHandle.java renamed to async-query-core/src/main/java/org/opensearch/sql/spark/functions/response/DefaultSparkSqlFunctionResponseHandle.java

File renamed without changes.

spark/src/main/java/org/opensearch/sql/spark/functions/response/SparkSqlFunctionResponseHandle.java renamed to async-query-core/src/main/java/org/opensearch/sql/spark/functions/response/SparkSqlFunctionResponseHandle.java

File renamed without changes.

0 commit comments

Comments
 (0)