Skip to content

Commit

Permalink
Bump HdrHistogram from 2.1.9 to 2.1.12 in /server (#2135)
Browse files Browse the repository at this point in the history
* Bump HdrHistogram from 2.1.9 to 2.1.12 in /server

Bumps [HdrHistogram](https://github.com/HdrHistogram/HdrHistogram) from 2.1.9 to 2.1.12.
- [Release notes](https://github.com/HdrHistogram/HdrHistogram/releases)
- [Commits](HdrHistogram/HdrHistogram@HdrHistogram-2.1.9...HdrHistogram-2.1.12)

---
updated-dependencies:
- dependency-name: org.hdrhistogram:HdrHistogram
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Update test to match new behavior of HdrHistogram

There was a [change in behavior in HdrHistogram][1] that causes the
tests to fail with the new version. The fix here is to add another value
in the test data set for the failing test, which has the result of
making both versions of HdrHistogram agree on the percentile values.

[1]: HdrHistogram/HdrHistogram@5c7226c

Signed-off-by: Andrew Ross <andrross@amazon.com>

* Remove unnecessary exclusion on third party audit

Signed-off-by: Andrew Ross <andrross@amazon.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
  • Loading branch information
3 people authored May 5, 2022
1 parent 741445a commit bce7f49
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,16 @@ setup:
---
"Filtered test":

- do:
bulk:
refresh: true
body:
- index:
_index: test_1
_id: 5
- int_field: 126
double_field: 126.0
string_field: foo
- do:
search:
rest_total_hits_as_int: true
Expand All @@ -180,22 +190,22 @@ setup:
field: double_field
hdr: {}

- match: { hits.total: 3 }
- length: { hits.hits: 3 }
- match: { hits.total: 4 }
- length: { hits.hits: 4 }

- match: { aggregations.percentiles_int.values.1\.0: 51.0 }
- match: { aggregations.percentiles_int.values.5\.0: 51.0 }
- match: { aggregations.percentiles_int.values.25\.0: 51.0 }
- match: { aggregations.percentiles_int.values.50\.0: 101.03125 }
- match: { aggregations.percentiles_int.values.75\.0: 101.03125 }
- match: { aggregations.percentiles_int.values.75\.0: 126.03125 }
- match: { aggregations.percentiles_int.values.95\.0: 151.09375 }
- match: { aggregations.percentiles_int.values.99\.0: 151.09375 }

- match: { aggregations.percentiles_double.values.1\.0: 51.0 }
- match: { aggregations.percentiles_double.values.5\.0: 51.0 }
- match: { aggregations.percentiles_double.values.25\.0: 51.0 }
- match: { aggregations.percentiles_double.values.50\.0: 101.03125 }
- match: { aggregations.percentiles_double.values.75\.0: 101.03125 }
- match: { aggregations.percentiles_double.values.75\.0: 126.03125 }
- match: { aggregations.percentiles_double.values.95\.0: 151.09375 }
- match: { aggregations.percentiles_double.values.99\.0: 151.09375 }

Expand Down
6 changes: 1 addition & 5 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ dependencies {
// percentiles aggregation
api 'com.tdunning:t-digest:3.2'
// precentil ranks aggregation
api 'org.hdrhistogram:HdrHistogram:2.1.9'
api 'org.hdrhistogram:HdrHistogram:2.1.12'

// lucene spatial
api "org.locationtech.spatial4j:spatial4j:${versions.spatial4j}", optional
Expand Down Expand Up @@ -317,10 +317,6 @@ tasks.named("thirdPartyAudit").configure {
'com.google.common.geometry.S2$Metric',
'com.google.common.geometry.S2LatLng'
)

if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_1_8) {
ignoreMissingClasses 'javax.xml.bind.DatatypeConverter'
}
}

tasks.named("dependencyLicenses").configure {
Expand Down
1 change: 1 addition & 0 deletions server/licenses/HdrHistogram-2.1.12.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6eb7552156e0d517ae80cc2247be1427c8d90452
1 change: 0 additions & 1 deletion server/licenses/HdrHistogram-2.1.9.jar.sha1

This file was deleted.

0 comments on commit bce7f49

Please sign in to comment.