Skip to content

feat: DH-18856: Add Median to jsapi Aggregation Options #6700

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

Merged
dgodinez-dh merged 8 commits into from
Mar 20, 2025
Merged

feat: DH-18856: Add Median to jsapi Aggregation Options #6700

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
150c400
feat: DH-18856: Add Median to jsapi Aggregation Options
dgodinez-dh Mar 13, 2025
4956324
fix imports
dgodinez-dh Mar 13, 2025
9fe4811
add median to rollup html
dgodinez-dh Mar 17, 2025
06b55c5
remove median from rollup config
dgodinez-dh Mar 17, 2025
4988b97
fix import
dgodinez-dh Mar 17, 2025
d9841ec
add unit test
dgodinez-dh Mar 18, 2025
296cc44
update unit test
dgodinez-dh Mar 19, 2025
be113f2
spotless
dgodinez-dh Mar 19, 2025
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
13 changes: 12 additions & 1 deletion web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTableConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.deephaven.javascript.proto.dhinternal.io.deephaven_core.proto.table_pb.aggspec.AggSpecFirst;
import io.deephaven.javascript.proto.dhinternal.io.deephaven_core.proto.table_pb.aggspec.AggSpecLast;
import io.deephaven.javascript.proto.dhinternal.io.deephaven_core.proto.table_pb.aggspec.AggSpecMax;
import io.deephaven.javascript.proto.dhinternal.io.deephaven_core.proto.table_pb.aggspec.AggSpecMedian;
import io.deephaven.javascript.proto.dhinternal.io.deephaven_core.proto.table_pb.aggspec.AggSpecMin;
import io.deephaven.javascript.proto.dhinternal.io.deephaven_core.proto.table_pb.aggspec.AggSpecNonUniqueSentinel;
import io.deephaven.javascript.proto.dhinternal.io.deephaven_core.proto.table_pb.aggspec.AggSpecStd;
Expand Down Expand Up @@ -70,14 +71,15 @@ public class JsTotalsTableConfig {
LAST = "Last",
// ARRAY = "Array",
SKIP = "Skip";
private static final List<String> knownAggTypes = Arrays.asList(
protected static final List<String> knownAggTypes = Arrays.asList(
JsAggregationOperation.COUNT,
JsAggregationOperation.MIN,
JsAggregationOperation.MAX,
JsAggregationOperation.SUM,
JsAggregationOperation.ABS_SUM,
JsAggregationOperation.VAR,
JsAggregationOperation.AVG,
JsAggregationOperation.MEDIAN,
JsAggregationOperation.STD,
JsAggregationOperation.FIRST,
JsAggregationOperation.LAST,
Expand Down Expand Up @@ -357,6 +359,15 @@ public AggregateRequest buildRequest(JsArray<Column> allColumns) {
agg.setColumns(columns);
break;
}
case JsAggregationOperation.MEDIAN: {
AggSpec spec = new AggSpec();
spec.setMedian(new AggSpecMedian());
columns = new AggregationColumns();
columns.setSpec(spec);
columns.setMatchPairsList(aggColumns);
agg.setColumns(columns);
break;
}
case JsAggregationOperation.STD: {
AggSpec spec = new AggSpec();
spec.setStd(new AggSpecStd());
Expand Down
6 changes: 6 additions & 0 deletions ...ient-api/src/main/java/io/deephaven/web/client/api/tree/enums/JsAggregationOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ public class JsAggregationOperation {
* "Avg".
*/
AVG = "Avg",
/**
* The median of all values in the specified column. Can only apply to numeric types. String value is
* "Median".
*/
MEDIAN = "Median",
/**
* The sample standard deviation of all values in the specified column. Can only apply to numeric types.
* String value is "Std". Sample standard deviation is computed using Bessel's correction
Expand Down Expand Up @@ -111,6 +116,7 @@ public static boolean canAggregateType(String aggregationType, String columnType
case STD: {
return isNumeric(columnType);
}
case MEDIAN:
case MIN:
case MAX: {
// Can only apply to Comparables - JS can't work this out, so we'll stick to known types
Expand Down
30 changes: 30 additions & 0 deletions web/client-api/src/test/java/io/deephaven/web/client/api/TotalsTableTestGwt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
import io.deephaven.web.client.api.subscription.ViewportData;
import jsinterop.base.Js;

import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Supplier;

public class TotalsTableTestGwt extends AbstractAsyncGwtTestCase {
private final TableSourceBuilder tables = new TableSourceBuilder()
Expand Down Expand Up @@ -371,6 +374,33 @@ public void testGroupedTotals() {
.then(this::finish).catch_(this::report);
}

public void testCreateTotalsTableAggTypes() {
connect(tables)
.then(table("hasTotals"))
.then(table -> {
List<Supplier<Promise<JsTotalsTable>>> tests = new ArrayList<>();
List<String> aggs = JsTotalsTableConfig.knownAggTypes;
for (int i = 0; i < aggs.size(); i++) {
String operation = aggs.get(i);
JsTotalsTableConfig config = new JsTotalsTableConfig();
config.groupBy.push("K");
config.operationMap.set("J",
Js.uncheckedCast(new JsString[] {toJsString(operation)}));
tests.add(() -> table.getTotalsTable(config).then(totals -> {
totals.setViewport(0, 100, null, null, null);

return waitForEvent(totals, JsTable.EVENT_UPDATED, update -> {
ViewportData viewportData = (ViewportData) update.getDetail();
assertEquals(2, viewportData.getRows().length);
Copy link
Copy Markdown
Member

@mofojed mofojed Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably include checks for the content of the cells in these rows, similar to the above test cases.

Copy link
Copy Markdown
Contributor Author

@dgodinez-dh dgodinez-dh Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Colin asked for a test similar to HierarchicalTableTestGwt.testCreateRollupAggTypes, which looks like it iterates over all the agg types and checks that they work and send an update. Checking the data might be complicated because we are doing every agg, so the data will be different per agg.

Copy link
Copy Markdown
Contributor Author

@dgodinez-dh dgodinez-dh Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some value checking.

Copy link
Copy Markdown
Member

@niloc132 niloc132 Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Data checking in the rollup test doesnt exist either - the intention was just to make sure we could at least read every type, and that no supported agg causes a failure when passing it to the API.

}, 1500);
}));
}

return tests.stream().reduce((p1, p2) -> () -> p1.get().then(result -> p2.get())).get().get();
})
.then(this::finish).catch_(this::report);
}

private static class TotalsResults {
int k;
long i;
Expand Down
⚡