Skip to content

Upgrade hppc to 0.9.1 #109006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Upgrade hppc to 0.9.1 #109006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f063e99
Upgrade hppc to 0.9.1
ChrisHegarty May 24, 2024
056ccfb
Update docs/changelog/109006.yaml
ChrisHegarty May 24, 2024
014ec89
equalListsWithoutOrder
ChrisHegarty May 24, 2024
df15b5b
Merge branch 'main' into upgrade_hppc_001
elasticmachine May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/109006.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 109006
summary: Upgrade hppc to 0.9.1
area: Infra/Core
type: upgrade
issues: []
6 changes: 3 additions & 3 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@
<sha256 value="05f81d4b911d311ee7ac4849ebf78b303e07743418d4e89a5595422bf3802314" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.carrotsearch" name="hppc" version="0.8.1">
<artifact name="hppc-0.8.1.jar">
<sha256 value="f540703478636d88f699f4666242e6fc9175a996c08ddceaf02106517b970406" origin="Generated by Gradle"/>
<component group="com.carrotsearch" name="hppc" version="0.9.1">
<artifact name="hppc-0.9.1.jar">
<sha256 value="d58706a2be60c972452550cdba79870bf481447c50eb718308e33a6ba45c65ec" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" version="2.8.0">
Expand Down
2 changes: 1 addition & 1 deletion server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies {

// utilities
api project(":libs:elasticsearch-cli")
implementation 'com.carrotsearch:hppc:0.8.1'
implementation 'com.carrotsearch:hppc:0.9.1'

// precentil ranks aggregation
api 'org.hdrhistogram:HdrHistogram:2.1.9'
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
requires org.elasticsearch.vec;

requires com.sun.jna;
requires hppc;
requires com.carrotsearch.hppc;
requires HdrHistogram;
requires jopt.simple;
requires log4j2.ecs.layout;
Expand Down
8 changes: 6 additions & 2 deletions server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,10 @@ public ShardRouting[] drain() {
return mutableShardRoutings;
}

static <T> boolean equalListsWithoutOrder(List<T> a, List<T> b) {
return a.size() == b.size() && new HashSet<>(a).containsAll(b);
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand All @@ -1132,8 +1136,8 @@ public boolean equals(Object o) {
UnassignedShards that = (UnassignedShards) o;
return primaries == that.primaries
&& ignoredPrimaries == that.ignoredPrimaries
&& unassigned.equals(that.unassigned)
&& ignored.equals(that.ignored);
&& equalListsWithoutOrder(unassigned, that.unassigned)
&& equalListsWithoutOrder(ignored, that.ignored);
}

@Override
Expand Down