Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into resize
Browse files Browse the repository at this point in the history
  • Loading branch information
gaobinlong committed Mar 27, 2024
2 parents bb987da + 839ee4c commit 43c6cda
Show file tree
Hide file tree
Showing 103 changed files with 265 additions and 64 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased 2.x]
### Added
- Add a counter to node stat api to track shard going from idle to non-idle ([#12768](https://github.com/opensearch-project/OpenSearch/pull/12768))

### Dependencies
- Bump `org.apache.commons:commons-configuration2` from 2.10.0 to 2.10.1 ([#12896](https://github.com/opensearch-project/OpenSearch/pull/12896))
- Bump `asm` from 9.6 to 9.7 ([#12908](https://github.com/opensearch-project/OpenSearch/pull/12908))
- Bump `net.minidev:json-smart` from 2.5.0 to 2.5.1 ([#12893](https://github.com/opensearch-project/OpenSearch/pull/12893))
- Bump `netty` from 4.1.107.Final to 4.1.108.Final ([#12924](https://github.com/opensearch-project/OpenSearch/pull/12924))

### Changed
- [BWC and API enforcement] Enforcing the presence of API annotations at build time ([#12872](https://github.com/opensearch-project/OpenSearch/pull/12872))
Expand All @@ -122,4 +124,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Security

[Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD
[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.12...2.x
[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.13...2.x
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jakarta_annotation = 1.3.5
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.13.0

netty = 4.1.107.Final
netty = 4.1.108.Final
joda = 2.12.2

# project reactor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class CopyProcessorTests extends OpenSearchTestCase {
public void testCopyExistingField() throws Exception {
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
String sourceFieldName = RandomDocumentPicks.randomExistingFieldName(random(), ingestDocument);
String targetFieldName = RandomDocumentPicks.randomFieldName(random());
String targetFieldName = RandomDocumentPicks.randomNonExistingFieldName(random(), ingestDocument);
Processor processor = createCopyProcessor(sourceFieldName, targetFieldName, false, false, false);
processor.execute(ingestDocument);
assertThat(ingestDocument.hasField(targetFieldName), equalTo(true));
Expand Down Expand Up @@ -71,7 +71,8 @@ public void testCopyWithIgnoreMissing() throws Exception {
public void testCopyWithRemoveSource() throws Exception {
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
String sourceFieldName = RandomDocumentPicks.randomExistingFieldName(random(), ingestDocument);
String targetFieldName = RandomDocumentPicks.randomFieldName(random());
String targetFieldName = RandomDocumentPicks.randomNonExistingFieldName(random(), ingestDocument);

Object sourceValue = ingestDocument.getFieldValue(sourceFieldName, Object.class);

Processor processor = createCopyProcessor(sourceFieldName, targetFieldName, false, true, false);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2a9d06026ed251705e6ab52fa6ebe5f4f15aab7a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2ef6018eecde345fcddb96e31f651df16dca4c2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd44733e94f3f6237c896f2bbe9927c1eba48543

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed90430e545529a2df7c1db6c94568ea00867a61

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
30617b39cc6f850ca3807459fe726fbcd63989f2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d186a0be320e6a139c42d9b018596ef9d4a0b4ca

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f3085568e45c2ca74118118f792d0d55968aeb13

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1fd80f714c85ca685a80f32e0a4e8fd3b866e310

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0df31f1cd96df8b2882b1e0faf4409b0bd704541

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
93cc78652ed836ef950604139bfb4afb45e0bc7b

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed90430e545529a2df7c1db6c94568ea00867a61

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3ad0af28e408092f0d12994802a9f3fe18d45f8c

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
62b6a5dfee2e22ab9015a469cb68e4727596fd4c

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84d160a3b20f1de896df0cfafe6638199d49efb8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0df31f1cd96df8b2882b1e0faf4409b0bd704541

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ad97680373f9c9f278f597ad6552d44e20418929

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2a9d06026ed251705e6ab52fa6ebe5f4f15aab7a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2ef6018eecde345fcddb96e31f651df16dca4c2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd44733e94f3f6237c896f2bbe9927c1eba48543

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed90430e545529a2df7c1db6c94568ea00867a61

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
30617b39cc6f850ca3807459fe726fbcd63989f2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d186a0be320e6a139c42d9b018596ef9d4a0b4ca

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f3085568e45c2ca74118118f792d0d55968aeb13

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1fd80f714c85ca685a80f32e0a4e8fd3b866e310

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
baf7b939ef71b25713cacbe47bef8caf80ce99c6

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0df31f1cd96df8b2882b1e0faf4409b0bd704541

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2a9d06026ed251705e6ab52fa6ebe5f4f15aab7a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2ef6018eecde345fcddb96e31f651df16dca4c2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd44733e94f3f6237c896f2bbe9927c1eba48543

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
30617b39cc6f850ca3807459fe726fbcd63989f2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d186a0be320e6a139c42d9b018596ef9d4a0b4ca

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f3085568e45c2ca74118118f792d0d55968aeb13

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1fd80f714c85ca685a80f32e0a4e8fd3b866e310

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2a9d06026ed251705e6ab52fa6ebe5f4f15aab7a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2ef6018eecde345fcddb96e31f651df16dca4c2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
93cc78652ed836ef950604139bfb4afb45e0bc7b

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd44733e94f3f6237c896f2bbe9927c1eba48543

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed90430e545529a2df7c1db6c94568ea00867a61

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
30617b39cc6f850ca3807459fe726fbcd63989f2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d186a0be320e6a139c42d9b018596ef9d4a0b4ca

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f3085568e45c2ca74118118f792d0d55968aeb13

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84d160a3b20f1de896df0cfafe6638199d49efb8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1fd80f714c85ca685a80f32e0a4e8fd3b866e310

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0df31f1cd96df8b2882b1e0faf4409b0bd704541
Loading

0 comments on commit 43c6cda

Please sign in to comment.