Skip to content

Commit 37469ca

Browse files
Merge remote-tracking branch 'origin/main' into merge_parquet
Signed-off-by: Shailesh-Kumar-Singh <shaileshkumarsingh260@gmail.com>
2 parents d97d3ce + f892dbd commit 37469ca

208 files changed

Lines changed: 10930 additions & 2976 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/issue-dedupe.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Issue Dedupe Main
3+
on:
4+
issues:
5+
types: [opened]
6+
schedule:
7+
- cron: '0 0 * * *'
8+
workflow_dispatch:
9+
inputs:
10+
issue_number:
11+
description: 'Issue number to check for duplicates'
12+
required: true
13+
type: string
14+
15+
jobs:
16+
detect-issue:
17+
if: >-
18+
(github.event_name == 'workflow_dispatch' &&
19+
github.repository == 'opensearch-project/OpenSearch') ||
20+
(github.event_name == 'issues' &&
21+
github.event.issue.user.type != 'Bot' &&
22+
github.repository == 'opensearch-project/OpenSearch')
23+
uses: opensearch-project/opensearch-build/.github/workflows/issue-dedupe-detect.yml@main
24+
permissions:
25+
contents: read
26+
issues: write
27+
id-token: write
28+
secrets:
29+
BEDROCK_ACCESS_ROLE_ISSUE_DEDUPE: ${{ secrets.BEDROCK_ACCESS_ROLE_ISSUE_DEDUPE }}
30+
with:
31+
issue_number: ${{ inputs.issue_number || '' }}
32+
grace_days: ${{ vars.DUPLICATE_GRACE_DAYS || '7' }}
33+
34+
auto-close-issue:
35+
if: github.event_name == 'schedule' && github.repository == 'opensearch-project/OpenSearch'
36+
uses: opensearch-project/opensearch-build/.github/workflows/issue-dedupe-autoclose.yml@main
37+
permissions:
38+
issues: write
39+
with:
40+
grace_days: ${{ vars.DUPLICATE_GRACE_DAYS || '7' }}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b418ba210ace28adf920f1decf64d673953d07cf
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b418ba210ace28adf920f1decf64d673953d07cf

client/sniffer/licenses/httpclient5-5.6.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ snakeyaml = "2.6"
1717
snakeyaml_engine = "3.0.1"
1818
icu4j = "77.1"
1919
supercsv = "2.4.0"
20-
log4j = "2.25.3"
20+
log4j = "2.25.4"
2121
error_prone_annotations = "2.45.0"
2222
slf4j = "2.0.17"
2323
asm = "9.9.1"
@@ -49,7 +49,7 @@ reactor_netty = "1.3.5"
4949
reactor = "3.8.5"
5050

5151
# client dependencies
52-
httpclient5 = "5.6"
52+
httpclient5 = "5.6.1"
5353
httpcore5 = "5.4"
5454
httpclient = "4.5.14"
5555
httpcore = "4.4.16"

gradle/run.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@ testClusters {
9090
systemProperty 'io.netty.tryUnsafe', 'true'
9191
systemProperty 'io.netty.tryReflectionSetAccessible', 'true'
9292
}
93+
if (p.equals("parquet-data-format") || p.equals("analytics-backend-datafusion")) {
94+
// Composite engine / DataFusion requires pluggable dataformat feature flag
95+
systemProperty 'opensearch.experimental.feature.pluggable.dataformat.enabled', 'true'
96+
// Native lib path for DataFusion FFM bridge
97+
def nativeLibDir = new File(project(':sandbox:libs:dataformat-native').projectDir, 'rust/target/release').absolutePath
98+
systemProperty 'java.library.path', nativeLibDir
99+
jvmArgs '--add-opens=java.base/java.nio=ALL-UNNAMED'
100+
jvmArgs '--enable-native-access=ALL-UNNAMED'
101+
}
93102
}
94103
}
95104
}

libs/core/licenses/log4j-api-2.25.3.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
89ff2217b193fb187b134aa6ebcbfa8a28b018a9

plugins/crypto-kms/licenses/log4j-1.2-api-2.25.3.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
351888743c1d0f7c9ec97a909ff2f7901f77df63

0 commit comments

Comments
 (0)