Skip to content
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

Update dependency com.tdunning:t-digest to v3.3 #2136

Merged
merged 2 commits into from
Mar 20, 2024
Merged

Update dependency com.tdunning:t-digest to v3.3 #2136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb2cd9b
Update dependency com.tdunning:t-digest to v3.3
solrbot Jan 4, 2024
e0d3696
Update percentile assertions based on bug fixes in t-digest
risdenk Mar 8, 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
4 changes: 2 additions & 2 deletions ...e/src/test/org/apache/solr/search/facet/DistributedFacetSimpleRefinementLongTailTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ private void checkSubFacetStats(String extraJson) throws Exception {
assertEquals(300L, aaa0_Bucket.get("countvals"));
assertEquals(0L, aaa0_Bucket.get("missing"));
assertEquals(34650.0D, aaa0_Bucket.get("sum"));
assertEquals(483.70000000000016D, (double) aaa0_Bucket.get("percentile"), 0.1E-7);
assertEquals(486.5D, (double) aaa0_Bucket.get("percentile"), 0.1E-7);
assertEquals(115.5D, (double) aaa0_Bucket.get("avg"), 0.1E-7);
assertEquals(1.674585E7D, (double) aaa0_Bucket.get("sumsq"), 0.1E-7);
assertEquals(206.4493184076D, (double) aaa0_Bucket.get("stddev"), 0.1E-7);
Expand Down Expand Up @@ -548,7 +548,7 @@ private void checkSubFacetStats(String extraJson) throws Exception {
assertEquals(35L, tailB_Bucket.get("min"));
assertEquals(40L, tailB_Bucket.get("max"));
assertEquals(12L, tailB_Bucket.get("countvals"));
assertEquals(39.9D, tailB_Bucket.get("percentile"));
assertEquals(40.0D, tailB_Bucket.get("percentile"));
assertEquals(5L, tailB_Bucket.get("missing"));
assertEquals(450.0D, tailB_Bucket.get("sum"));
assertEquals(37.5D, (double) tailB_Bucket.get("avg"), 0.1E-7);
Expand Down
16 changes: 8 additions & 8 deletions solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2327,9 +2327,9 @@ public static void doStatsTemplated(Client client, ModifiableSolrParams p) throw
+ " , f3:{terms:{${terms} field:'${cat_s}', sort:'n1 desc', facet:{n1:'percentile(${sparse_num_d},50)'} }} "
+ "}"),
"facets=={ 'count':6, "
+ " f1:{ 'buckets':[{ val:'A', count:2, n1:3.0 }, { val:'B', count:3, n1:-5.0}]}"
+ ", f2:{ 'buckets':[{ val:'B', count:3, n1:-5.0}, { val:'A', count:2, n1:3.0 }]}"
+ ", f3:{ 'buckets':[{ val:'A', count:2, n1:1.0}, { val:'B', count:3}]}"
+ " f1:{ 'buckets':[{ val:'A', count:2, n1:4.0 }, { val:'B', count:3, n1:-5.0}]}"
+ ", f2:{ 'buckets':[{ val:'B', count:3, n1:-5.0}, { val:'A', count:2, n1:4.0 }]}"
+ ", f3:{ 'buckets':[{ val:'A', count:2, n1:6.0}, { val:'B', count:3}]}"
+ "}");

// test sorting by multiple percentiles (sort is by first)
Expand All @@ -2342,8 +2342,8 @@ public static void doStatsTemplated(Client client, ModifiableSolrParams p) throw
"{f1:{terms:{${terms} field:${cat_s}, sort:'n1 desc', facet:{n1:'percentile(${num_d},50,0,100)'} }}"
+ " , f2:{terms:{${terms} field:${cat_s}, sort:'n1 asc', facet:{n1:'percentile(${num_d},50,0,100)'} }} }"),
"facets=={ 'count':6, "
+ " f1:{ 'buckets':[{ val:'A', count:2, n1:[3.0,2.0,4.0] }, { val:'B', count:3, n1:[-5.0,-9.0,11.0] }]}"
+ ", f2:{ 'buckets':[{ val:'B', count:3, n1:[-5.0,-9.0,11.0]}, { val:'A', count:2, n1:[3.0,2.0,4.0] }]} }");
+ " f1:{ 'buckets':[{ val:'A', count:2, n1:[4.0,2.0,4.0] }, { val:'B', count:3, n1:[-5.0,-9.0,11.0] }]}"
+ ", f2:{ 'buckets':[{ val:'B', count:3, n1:[-5.0,-9.0,11.0]}, { val:'A', count:2, n1:[4.0,2.0,4.0] }]} }");

// test sorting by count/index order
client.testJQ(
Expand Down Expand Up @@ -2812,7 +2812,7 @@ public static void doStatsTemplated(Client client, ModifiableSolrParams p) throw
"facets=={ 'count':6, "
+ "sum1:0.0, sumsq1:51.5, avg1:0.0, mind:-5.0, maxd:3.0"
+ ", mini:-5, maxi:3, mins:'a', maxs:'b'"
+ ", stddev:2.712405363721075, variance:7.3571428571, median:0.0, perc:[-5.0,2.25,3.0], maxss:'b'"
+ ", stddev:2.712405363721075, variance:7.3571428571, median:0.0, perc:[-5.0,3.0,3.0], maxss:'b'"
+ "}");

// test sorting by multi-valued
Expand Down Expand Up @@ -2840,8 +2840,8 @@ public static void doStatsTemplated(Client client, ModifiableSolrParams p) throw
"{f1:{terms:{${terms} field:'${cat_s}', sort:'n1 asc', facet:{n1:'percentile(${num_is}, 50)'} }}"
+ " , f2:{terms:{${terms} field:'${cat_s}', sort:'n1 desc', facet:{n1:'percentile(${num_is}, 50)'} }} }"),
"facets=={ 'count':6, "
+ " f1:{ 'buckets':[{ val:'B', count:3, n1: -0.50}, { val:'A', count:2, n1:1.0}]}"
+ ", f2:{ 'buckets':[{ val:'A', count:2, n1:1.0}, { val:'B', count:3, n1:-0.50 }]} }");
+ " f1:{ 'buckets':[{ val:'B', count:3, n1: 0.0}, { val:'A', count:2, n1:2.0}]}"
+ ", f2:{ 'buckets':[{ val:'A', count:2, n1:2.0}, { val:'B', count:3, n1:0.0 }]} }");

// test sorting by multi-valued field with domain query
client.testJQ(
Expand Down
1 change: 0 additions & 1 deletion solr/licenses/t-digest-3.1.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/t-digest-3.3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e96c4fd7d63b05828cf5ef41da20649195b1b78
68 changes: 34 additions & 34 deletions ...solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,8 +939,8 @@ public void testStatsStream() throws Exception {
assertEquals(5.5D, avgf, 0.0);
assertEquals(5.477225575051661D, stdi, 0.0);
assertEquals(3.0276503540974917D, stdf, 0.0);
assertEquals(7.0D, peri, 0.0);
assertEquals(5.5D, perf, 0.0);
assertEquals(10.0D, peri, 0.0);
assertEquals(6.0D, perf, 0.0);
assertEquals(10, count, 0.0);
assertEquals(countDist.longValue(), 3L);

Expand Down Expand Up @@ -986,8 +986,8 @@ public void testStatsStream() throws Exception {
assertEquals(5.5D, avgf, 0.0);
assertEquals(5.477225575051661D, stdi, 0.0);
assertEquals(3.0276503540974917D, stdf, 0.0);
assertEquals(7.0D, peri, 0.0);
assertEquals(5.5D, perf, 0.0);
assertEquals(10.0D, peri, 0.0);
assertEquals(6.0D, perf, 0.0);
assertEquals(10, count, 0.0);

// Test with shards parameter
Expand Down Expand Up @@ -1036,8 +1036,8 @@ public void testStatsStream() throws Exception {
assertEquals(5.5D, avgf, 0.0);
assertEquals(5.477225575051661D, stdi, 0.0);
assertEquals(3.0276503540974917D, stdf, 0.0);
assertEquals(7.0D, peri, 0.0);
assertEquals(5.5D, perf, 0.0);
assertEquals(10.0D, peri, 0.0);
assertEquals(6.0D, perf, 0.0);
assertEquals(10, count, 0.0);

// Execersise the /stream hander
Expand Down Expand Up @@ -1424,8 +1424,8 @@ public void testFacetStream() throws Exception {
assertEquals(2, count, 0.0);
assertEquals(4.949747468305833D, stdi, 0.0);
assertEquals(2.1213203435596424D, stdf, 0.0);
assertEquals(7.5D, peri, 0.0);
assertEquals(5.5D, perf, 0.0);
assertEquals(11.0D, peri, 0.0);
assertEquals(7.0D, perf, 0.0);
assertEquals(countDist.longValue(), 2);

tuple = tuples.get(1);
Expand Down Expand Up @@ -1457,8 +1457,8 @@ public void testFacetStream() throws Exception {
assertEquals(4, count, 0.0);
assertEquals(6.551081335677848D, stdi, 0.0);
assertEquals(4.041451884327381D, stdf, 0.0);
assertEquals(1.5D, peri, 0.0);
assertEquals(3.5D, perf, 0.0);
assertEquals(2.0D, peri, 0.0);
assertEquals(5.0D, perf, 0.0);
assertEquals(countDist.longValue(), 4);

tuple = tuples.get(2);
Expand Down Expand Up @@ -1490,8 +1490,8 @@ public void testFacetStream() throws Exception {
assertEquals(4, count, 0.0);
assertEquals(4.509249752822894D, stdi, 0.0);
assertEquals(2.6457513110645907D, stdf, 0.0);
assertEquals(11.0D, peri, 0.0);
assertEquals(7.0D, perf, 0.0);
assertEquals(12.0D, peri, 0.0);
assertEquals(8.0D, perf, 0.0);
assertEquals(countDist.longValue(), 4);

// Reverse the Sort.
Expand Down Expand Up @@ -1547,8 +1547,8 @@ public void testFacetStream() throws Exception {
assertEquals(4, count, 0.0);
assertEquals(4.509249752822894D, stdi, 0.0);
assertEquals(2.6457513110645907D, stdf, 0.0);
assertEquals(11.0D, peri, 0.0);
assertEquals(7.0D, perf, 0.0);
assertEquals(12.0D, peri, 0.0);
assertEquals(8.0D, perf, 0.0);

tuple = tuples.get(1);
bucket = tuple.getString("a_s");
Expand Down Expand Up @@ -1578,8 +1578,8 @@ public void testFacetStream() throws Exception {
assertEquals(4, count, 0.0);
assertEquals(6.551081335677848D, stdi, 0.0);
assertEquals(4.041451884327381D, stdf, 0.0);
assertEquals(1.5D, peri, 0.0);
assertEquals(3.5D, perf, 0.0);
assertEquals(2.0D, peri, 0.0);
assertEquals(5.0D, perf, 0.0);

tuple = tuples.get(2);
bucket = tuple.getString("a_s");
Expand Down Expand Up @@ -1609,8 +1609,8 @@ public void testFacetStream() throws Exception {
assertEquals(2, count, 0.0);
assertEquals(4.949747468305833D, stdi, 0.0);
assertEquals(2.1213203435596424D, stdf, 0.0);
assertEquals(7.5D, peri, 0.0);
assertEquals(5.5D, perf, 0.0);
assertEquals(11.0D, peri, 0.0);
assertEquals(7.0D, perf, 0.0);

clause =
"facet("
Expand Down Expand Up @@ -1803,8 +1803,8 @@ public void testFacetStream() throws Exception {
assertEquals(2, count, 0.0);
assertEquals(4.949747468305833D, stdi, 0.0);
assertEquals(2.1213203435596424D, stdf, 0.0);
assertEquals(7.5D, peri, 0.0);
assertEquals(5.5D, perf, 0.0);
assertEquals(11.0D, peri, 0.0);
assertEquals(7.0D, perf, 0.0);

tuple = tuples.get(1);
bucket = tuple.getString("a_s");
Expand Down Expand Up @@ -1834,8 +1834,8 @@ public void testFacetStream() throws Exception {
assertEquals(4, count, 0.0);
assertEquals(4.509249752822894D, stdi, 0.0);
assertEquals(2.6457513110645907D, stdf, 0.0);
assertEquals(11.0D, peri, 0.0);
assertEquals(7.0D, perf, 0.0);
assertEquals(12.0D, peri, 0.0);
assertEquals(8.0D, perf, 0.0);

tuple = tuples.get(2);
bucket = tuple.getString("a_s");
Expand Down Expand Up @@ -1865,8 +1865,8 @@ public void testFacetStream() throws Exception {
assertEquals(4, count, 0.0);
assertEquals(6.551081335677848D, stdi, 0.0);
assertEquals(4.041451884327381D, stdf, 0.0);
assertEquals(1.5D, peri, 0.0);
assertEquals(3.5D, perf, 0.0);
assertEquals(2.0D, peri, 0.0);
assertEquals(5.0D, perf, 0.0);

// Test index sort

Expand Down Expand Up @@ -2477,32 +2477,32 @@ public void testSubFacetStream() throws Exception {
double stdi = tuple.getDouble("std(a_i)");
double peri = tuple.getDouble("per(a_i,50)");

assertEquals("hello3", bucket1);
assertEquals("hello0", bucket1);
assertEquals("b", bucket2);
assertEquals(1.5275252316519468D, stdi, 0.0);
assertEquals(12.0D, peri, 0.0);
assertEquals(9.192388155425117D, stdi, 0.0);
assertEquals(14.0D, peri, 0.0);

tuple = tuples.get(1);
bucket1 = tuple.getString("level1_s");
bucket2 = tuple.getString("level2_s");
stdi = tuple.getDouble("std(a_i)");
peri = tuple.getDouble("per(a_i,50)");

assertEquals("hello4", bucket1);
assertEquals("hello3", bucket1);
assertEquals("b", bucket2);
assertEquals(0.0D, stdi, 0.0);
assertEquals(11.0, peri, 0.0);
assertEquals(1.5275252316519468D, stdi, 0.0);
assertEquals(12.0, peri, 0.0);

tuple = tuples.get(2);
bucket1 = tuple.getString("level1_s");
bucket2 = tuple.getString("level2_s");
stdi = tuple.getDouble("std(a_i)");
peri = tuple.getDouble("per(a_i,50)");

assertEquals("hello0", bucket1);
assertEquals("hello4", bucket1);
assertEquals("b", bucket2);
assertEquals(9.192388155425117D, stdi, 0.0);
assertEquals(7.5D, peri, 0.0);
assertEquals(0.0D, stdi, 0.0);
assertEquals(11.0D, peri, 0.0);

tuple = tuples.get(3);
bucket1 = tuple.getString("level1_s");
Expand Down Expand Up @@ -2535,7 +2535,7 @@ public void testSubFacetStream() throws Exception {
assertEquals("hello0", bucket1);
assertEquals("a", bucket2);
assertEquals(1.4142135623730951D, stdi, 0.0);
assertEquals(1.0D, peri, 0.0);
assertEquals(2.0D, peri, 0.0);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ com.squareup.okio:okio:3.6.0 (1 constraints: 530c38fd)
com.squareup.okio:okio-jvm:3.6.0 (1 constraints: 500ad3b9)
com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35)
com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)
com.tdunning:t-digest:3.1 (1 constraints: a804212c)
com.tdunning:t-digest:3.3 (1 constraints: aa04232c)
com.zaxxer:SparseBitSet:1.2 (1 constraints: 0d081e75)
commons-cli:commons-cli:1.6.0 (1 constraints: 09050236)
commons-codec:commons-codec:1.16.0 (11 constraints: a297a2db)
Expand Down
2 changes: 1 addition & 1 deletion versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ com.google.re2j:re2j=1.7
com.j256.simplemagic:simplemagic=1.17
com.jayway.jsonpath:json-path=2.9.0
com.lmax:disruptor=3.4.4
com.tdunning:t-digest=3.1
com.tdunning:t-digest=3.3
commons-cli:commons-cli=1.6.0
commons-codec:commons-codec=1.16.0
commons-collections:commons-collections=3.2.2
Expand Down
Loading