Skip to content

Commit bce7f49

Browse files
Bump HdrHistogram from 2.1.9 to 2.1.12 in /server (#2135)
* 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>
1 parent 741445a commit bce7f49

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,16 @@ setup:
160160
---
161161
"Filtered test":
162162

163+
- do:
164+
bulk:
165+
refresh: true
166+
body:
167+
- index:
168+
_index: test_1
169+
_id: 5
170+
- int_field: 126
171+
double_field: 126.0
172+
string_field: foo
163173
- do:
164174
search:
165175
rest_total_hits_as_int: true
@@ -180,22 +190,22 @@ setup:
180190
field: double_field
181191
hdr: {}
182192

183-
- match: { hits.total: 3 }
184-
- length: { hits.hits: 3 }
193+
- match: { hits.total: 4 }
194+
- length: { hits.hits: 4 }
185195

186196
- match: { aggregations.percentiles_int.values.1\.0: 51.0 }
187197
- match: { aggregations.percentiles_int.values.5\.0: 51.0 }
188198
- match: { aggregations.percentiles_int.values.25\.0: 51.0 }
189199
- match: { aggregations.percentiles_int.values.50\.0: 101.03125 }
190-
- match: { aggregations.percentiles_int.values.75\.0: 101.03125 }
200+
- match: { aggregations.percentiles_int.values.75\.0: 126.03125 }
191201
- match: { aggregations.percentiles_int.values.95\.0: 151.09375 }
192202
- match: { aggregations.percentiles_int.values.99\.0: 151.09375 }
193203

194204
- match: { aggregations.percentiles_double.values.1\.0: 51.0 }
195205
- match: { aggregations.percentiles_double.values.5\.0: 51.0 }
196206
- match: { aggregations.percentiles_double.values.25\.0: 51.0 }
197207
- match: { aggregations.percentiles_double.values.50\.0: 101.03125 }
198-
- match: { aggregations.percentiles_double.values.75\.0: 101.03125 }
208+
- match: { aggregations.percentiles_double.values.75\.0: 126.03125 }
199209
- match: { aggregations.percentiles_double.values.95\.0: 151.09375 }
200210
- match: { aggregations.percentiles_double.values.99\.0: 151.09375 }
201211

server/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ dependencies {
121121
// percentiles aggregation
122122
api 'com.tdunning:t-digest:3.2'
123123
// precentil ranks aggregation
124-
api 'org.hdrhistogram:HdrHistogram:2.1.9'
124+
api 'org.hdrhistogram:HdrHistogram:2.1.12'
125125

126126
// lucene spatial
127127
api "org.locationtech.spatial4j:spatial4j:${versions.spatial4j}", optional
@@ -317,10 +317,6 @@ tasks.named("thirdPartyAudit").configure {
317317
'com.google.common.geometry.S2$Metric',
318318
'com.google.common.geometry.S2LatLng'
319319
)
320-
321-
if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_1_8) {
322-
ignoreMissingClasses 'javax.xml.bind.DatatypeConverter'
323-
}
324320
}
325321

326322
tasks.named("dependencyLicenses").configure {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6eb7552156e0d517ae80cc2247be1427c8d90452

server/licenses/HdrHistogram-2.1.9.jar.sha1

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

0 commit comments

Comments
 (0)