diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTableConfig.java b/web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTableConfig.java index 27269548a2b..9b3e53c12ed 100644 --- a/web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTableConfig.java +++ b/web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTableConfig.java @@ -83,7 +83,8 @@ public class JsTotalsTableConfig { JsAggregationOperation.LAST, JsAggregationOperation.COUNT_DISTINCT, JsAggregationOperation.DISTINCT, - JsAggregationOperation.UNIQUE); + JsAggregationOperation.UNIQUE, + JsAggregationOperation.SKIP); /** * Specifies if a Totals Table should be expanded by default in the UI. Defaults to false. @@ -111,7 +112,6 @@ public class JsTotalsTableConfig { */ public JsArray groupBy = new JsArray<>(); - private AggregateRequest grpcRequest; private JsArray customColumns; private JsArray dropColumns; @@ -406,6 +406,10 @@ public AggregateRequest buildRequest(JsArray allColumns) { // case JsAggregationOperation.WSUM: { // // TODO #3302 support this // } + case JsAggregationOperation.SKIP: { + // cancel entirely, start the loop again + return; + } default: JsLog.warn("Aggregation " + aggregationType + " not supported, ignoring"); } diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsRollupConfig.java b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsRollupConfig.java index 3108c86adc8..7cf14222b66 100644 --- a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsRollupConfig.java +++ b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsRollupConfig.java @@ -261,6 +261,10 @@ public RollupRequest buildRequest(JsArray tableColumns) { // case JsAggregationOperation.WSUM: { // // TODO #3302 support this // } + case JsAggregationOperation.SKIP: { + // cancel entirely, start the loop again + return; + } default: JsLog.warn("Aggregation " + aggregationType + " not supported, ignoring"); } diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/enums/JsAggregationOperation.java b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/enums/JsAggregationOperation.java index fa0c50cce57..f46fb08489c 100644 --- a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/enums/JsAggregationOperation.java +++ b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/enums/JsAggregationOperation.java @@ -68,9 +68,7 @@ public class JsAggregationOperation { */ LAST = "Last", UNIQUE = "Unique"; - /** - * Indicates that this column should not be aggregated. String value is "Skip". - */ + // Array operation isn't legal in all contexts, just omit it for now // ARRAY = "Array", // These need some other parameter to function, not supported yet @@ -78,7 +76,10 @@ public class JsAggregationOperation { // SORTED_FIRST="SortedFirst", // SORTED_LAST="SortedLast", // WSUM = "WeightedSum"; - @Deprecated + + /** + * Indicates that this column should not be aggregated. String value is "Skip". + */ public static final String SKIP = "Skip"; @JsIgnore @@ -89,7 +90,8 @@ public static boolean canAggregateType(String aggregationType, String columnType case DISTINCT: case FIRST: case LAST: - case UNIQUE: { + case UNIQUE: + case SKIP: { // These operations are always safe return true; }