Skip to content

Commit b7d2441

Browse files
songkant-awssongkant-aws
committed
Merge branch 'main' into smj-sort-pushdown
2 parents 36c2c32 + b88bf56 commit b7d2441

252 files changed

Lines changed: 4017 additions & 1692 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.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
java: [21, 24]
25+
java: [21, 25]
2626
runs-on: ubuntu-latest
2727
container:
2828
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -63,7 +63,7 @@ jobs:
6363
fail-fast: false
6464
matrix:
6565
os: [ windows-latest, macos-14 ]
66-
java: [21, 24]
66+
java: [21, 25]
6767

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

‎.github/workflows/sql-pitest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
needs: Get-CI-Image-Tag
2121
strategy:
2222
matrix:
23-
java: [21, 24]
23+
java: [21, 25]
2424
runs-on: ubuntu-latest
2525
container:
2626
# 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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
java: [21, 24]
32+
java: [21, 25]
3333
test-type: ['unit', 'integration', 'doc']
3434
runs-on: ubuntu-latest
3535
container:
@@ -52,9 +52,9 @@ jobs:
5252
run: |
5353
chown -R 1000:1000 `pwd`
5454
if [ "${{ matrix.test-type }}" = "unit" ]; then
55-
su `id -un 1000` -c "./gradlew --continue build -x integTest -x doctest"
55+
su `id -un 1000` -c "./gradlew --continue build -x integTest -x yamlRestTest -x doctest"
5656
elif [ "${{ matrix.test-type }}" = "integration" ]; then
57-
su `id -un 1000` -c "./gradlew --continue integTest"
57+
su `id -un 1000` -c "./gradlew --continue integTest yamlRestTest"
5858
else
5959
su `id -un 1000` -c "./gradlew --continue doctest"
6060
fi
@@ -106,16 +106,16 @@ jobs:
106106
matrix:
107107
entry:
108108
- { os: windows-latest, java: 21, os_build_args: -PbuildPlatform=windows }
109-
- { os: windows-latest, java: 24, os_build_args: -PbuildPlatform=windows }
109+
- { os: windows-latest, java: 25, os_build_args: -PbuildPlatform=windows }
110110
- { os: macos-14, java: 21, os_build_args: '' }
111-
- { os: macos-14, java: 24, os_build_args: '' }
111+
- { os: macos-14, java: 25, os_build_args: '' }
112112
test-type: ['unit', 'integration', 'doc']
113113
exclude:
114114
# Exclude doctest for Windows
115115
- test-type: doc
116116
entry: { os: windows-latest, java: 21, os_build_args: -PbuildPlatform=windows }
117117
- test-type: doc
118-
entry: { os: windows-latest, java: 24, os_build_args: -PbuildPlatform=windows }
118+
entry: { os: windows-latest, java: 25, os_build_args: -PbuildPlatform=windows }
119119
runs-on: ${{ matrix.entry.os }}
120120

121121
steps:
@@ -130,9 +130,9 @@ jobs:
130130
- name: Build and Test
131131
run: |
132132
if [ "${{ matrix.test-type }}" = "unit" ]; then
133-
./gradlew --continue build -x integTest -x doctest ${{ matrix.entry.os_build_args }}
133+
./gradlew --continue build -x integTest -x yamlRestTest -x doctest ${{ matrix.entry.os_build_args }}
134134
elif [ "${{ matrix.test-type }}" = "integration" ]; then
135-
./gradlew --continue integTest ${{ matrix.entry.os_build_args }}
135+
./gradlew --continue integTest yamlRestTest ${{ matrix.entry.os_build_args }}
136136
else
137137
./gradlew --continue doctest ${{ matrix.entry.os_build_args }}
138138
fi
@@ -184,7 +184,7 @@ jobs:
184184
runs-on: ubuntu-latest
185185
strategy:
186186
matrix:
187-
java: [21, 24]
187+
java: [21, 25]
188188
container:
189189
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
190190
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
@@ -230,7 +230,7 @@ jobs:
230230
runs-on: ubuntu-latest
231231
strategy:
232232
matrix:
233-
java: [21, 24]
233+
java: [21, 25]
234234
container:
235235
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
236236
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
needs: Get-CI-Image-Tag
2121
strategy:
2222
matrix:
23-
java: [21, 24]
23+
java: [21, 25]
2424
runs-on: ubuntu-latest
2525
container:
2626
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution

‎api/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spotless {
2828
removeUnusedImports()
2929
trimTrailingWhitespace()
3030
endWithNewline()
31-
googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
31+
googleJavaFormat('1.32.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
3232
}
3333
}
3434

‎async-query-core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ spotless {
8080
removeUnusedImports()
8181
trimTrailingWhitespace()
8282
endWithNewline()
83-
googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
83+
googleJavaFormat('1.32.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
8484
}
8585
}
8686

‎async-query/build.gradle‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,22 @@ jacocoTestCoverageVerification {
9595
rule {
9696
element = 'CLASS'
9797
excludes = [
98+
'org.opensearch.sql.spark.asyncquery.OpenSearchAsyncQueryJobMetadataStorageService',
9899
'org.opensearch.sql.spark.cluster.ClusterManagerEventListener*',
99100
'org.opensearch.sql.spark.cluster.FlintIndexRetention',
101+
'org.opensearch.sql.spark.cluster.FlintStreamingJobHouseKeeperTask',
100102
'org.opensearch.sql.spark.cluster.IndexCleanup',
103+
'org.opensearch.sql.spark.config.OpenSearchSparkSubmitParameterModifier',
104+
'org.opensearch.sql.spark.execution.session.*',
105+
'org.opensearch.sql.spark.execution.statement.*',
101106
// ignore because XContext IOException
102107
'org.opensearch.sql.spark.execution.statestore.StateStore',
108+
'org.opensearch.sql.spark.execution.statestore.OpenSearchStatementStorageService',
109+
'org.opensearch.sql.spark.execution.statestore.OpenSearchSessionStorageService',
110+
'org.opensearch.sql.spark.flint.*',
111+
'org.opensearch.sql.spark.metrics.OpenSearchMetricsService',
103112
'org.opensearch.sql.spark.rest.*',
113+
'org.opensearch.sql.spark.response.OpenSearchJobExecutionResponseReader',
104114
'org.opensearch.sql.spark.scheduler.parser.OpenSearchScheduleQueryJobRequestParser',
105115
'org.opensearch.sql.spark.transport.model.*'
106116
]

‎benchmarks/build.gradle‎

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

66
plugins {
77
id 'java-library'
8-
id "me.champeau.jmh" version "0.6.8"
8+
id "me.champeau.jmh" version "0.7.3"
99
}
1010

1111
repositories {

‎build.gradle‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ plugins {
8080
id 'java-library'
8181
id "io.freefair.lombok" version "8.14"
8282
id 'jacoco'
83-
id 'com.diffplug.spotless' version '7.2.1'
83+
id 'com.diffplug.spotless' version '8.1.0'
8484
}
8585

8686
// import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
@@ -113,7 +113,7 @@ spotless {
113113
removeUnusedImports()
114114
trimTrailingWhitespace()
115115
endWithNewline()
116-
googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
116+
googleJavaFormat('1.32.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
117117
}
118118
}
119119

@@ -128,8 +128,16 @@ allprojects {
128128
}
129129

130130
plugins.withId('java') {
131-
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
131+
java {
132+
sourceCompatibility = JavaVersion.VERSION_21
133+
targetCompatibility = JavaVersion.VERSION_21
134+
}
135+
}
136+
137+
tasks.withType(Test) {
138+
jvmArgs '-Dnet.bytebuddy.experimental=true'
132139
}
140+
133141
configurations.all {
134142
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.9.10"
135143
resolutionStrategy.force "net.minidev:json-smart:${versions.json_smart}"

‎common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ spotless {
8080
removeUnusedImports()
8181
trimTrailingWhitespace()
8282
endWithNewline()
83-
googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
83+
googleJavaFormat('1.32.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
8484
}
8585
}

0 commit comments

Comments
 (0)