Major aggregation factory and completeness cleanup

ClientSupport/src/main/java/io/deephaven/treetable/RollupSnapshotImpl.java

@@ -2,7 +2,6 @@
 
 import io.deephaven.base.verify.Require;
 import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.updategraph.NotificationQueue;
 import io.deephaven.engine.table.MatchPair;
 import io.deephaven.engine.util.string.StringUtils;
@@ -162,7 +161,7 @@ private HierarchicalTable applyFilters(@NotNull HierarchicalTable table) {
 
         final Table source = Require.neqNull(table.getSourceTable(), "Hierarchical source table");
         final RollupInfo info = getInfo();
-        return (HierarchicalTable) ((QueryTable) source.where(filters)).rollup(info.factory,
+        return (HierarchicalTable) source.where(filters).rollup(info.aggregations,
                 info.getLeafType() == RollupInfo.LeafType.Constituent, info.getSelectColumns());
     }
 

Generators/Generators.gradle

@@ -227,8 +227,6 @@ def pythonStaticMethodsArgs = ['io.deephaven.time.calendar.Calendars',
                                'io.deephaven.engine.util.TableTools',
                                     '/Generators/src/main/java/io/deephaven/pythonPreambles/TableToolsPreamble.txt',
                                     '/Integrations/python/deephaven/TableTools/__init__.py',
-                               'io.deephaven.engine.table.impl.by.AggregationFactory',
-                                    '/Integrations/python/deephaven/AggregationFactory/__init__.py',
                                'io.deephaven.plot.colors.ColorMaps',
                                    '/Integrations/python/deephaven/Plot/ColorMaps/__init__.py',
                                'io.deephaven.engine.util.WindowCheck',

Integrations/python/deephaven/__init__.py

@@ -9,8 +9,6 @@
 
 * Calendars imported as cals
 
-* AggregationFactory imported as af
-
 * DateTimeUtils imported as dtu
 
 * MovingAverages imported as mavg
@@ -58,7 +56,7 @@
     'Aggregation', 'ColumnName', 'ColumnRenderersBuilder', 'DistinctFormatter', 'DownsampledWhereFilter', 'DynamicTableWriter',
     'LayoutHintBuilder', 'Replayer', 'SmartKey', 'SortColumn', 'TotalsTableBuilder', 'WindowCheck',  # from TableManipulation
 
-    "cals", "af", "dtu", "figw", "mavg", "plt", "pt", "ttools", "tloggers",  # subpackages with abbreviated names
+    "cals", "dtu", "figw", "mavg", "plt", "pt", "ttools", "tloggers",  # subpackages with abbreviated names
 
     "read_csv", "write_csv" # from csv
 ]
@@ -81,7 +79,6 @@
 
 
 from . import Calendars as cals, \
-    AggregationFactory as af, \
     DateTimeUtils as dtu, \
     MovingAverages as mavg, \
     ConsumeKafka as ck, \
@@ -107,7 +104,6 @@ def initialize():
 
     # ensure that all the symbols are called and reimport the broken symbols
     cals._defineSymbols()
-    af._defineSymbols()
     dtu._defineSymbols()
     dh._defineSymbols()
     ck._defineSymbols()

Integrations/python/deephaven/doc/io/deephaven/api/agg/Aggregation/Visitor.json

@@ -1,8 +1,9 @@
 {
  "className": "io.deephaven.api.agg.Aggregation$Visitor",
  "methods": {
-  "visit": "*Overload 1*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 2*  \n  :param normalAgg: io.deephaven.api.agg.NormalAggregation\n  \n*Overload 3*  \n  :param normalAggs: io.deephaven.api.agg.NormalAggregations"
+  "visit": "**Incompatible overloads text - text from the first overload:**\n\nVisit a column aggregation.\n\n*Overload 1*  \n  :param aggregations: (io.deephaven.api.agg.Aggregations) - The compound aggregation to visit\n  \n*Overload 2*  \n  :param columnAgg: (io.deephaven.api.agg.ColumnAggregation) - The column aggregation to visit\n  \n*Overload 3*  \n  :param columnAggs: (io.deephaven.api.agg.ColumnAggregations) - The compound column aggregation to visit\n  \n*Overload 4*  \n  :param count: (io.deephaven.api.agg.Count) - The count aggregation\n  \n*Overload 5*  \n  :param firstRowKey: (io.deephaven.api.agg.FirstRowKey) - The first row key aggregation\n  \n*Overload 6*  \n  :param lastRowKey: (io.deephaven.api.agg.LastRowKey) - The last row key aggregation"
  },
  "path": "io.deephaven.api.agg.Aggregation.Visitor",
+ "text": "Visitor interface. Combines with Aggregation.walk(Visitor) in order to allow for type-safe Aggregation evaluation\n without switch statements or if-else blocks.",
  "typeName": "interface"
 }

Integrations/python/deephaven/doc/io/deephaven/api/agg/AggregationDescriptions.json

@@ -0,0 +1,10 @@
+{
+ "className": "io.deephaven.api.agg.AggregationDescriptions",
+ "methods": {
+  "of": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: java.util.Map<java.lang.String,java.lang.String>\n  \n*Overload 2*  \n  :param aggregations: java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>\n  :return: java.util.Map<java.lang.String,java.lang.String>",
+  "visit": "**Incompatible overloads text - text from the first overload:**\n\nVisit a column aggregation.\n\n*Overload 1*  \n  :param aggregations: (io.deephaven.api.agg.Aggregations) - The compound aggregation to visit\n  \n*Overload 2*  \n  :param columnAgg: (io.deephaven.api.agg.ColumnAggregation) - The column aggregation to visit\n  \n*Overload 3*  \n  :param columnAggs: (io.deephaven.api.agg.ColumnAggregations) - The compound column aggregation to visit\n  \n*Overload 4*  \n  :param count: (io.deephaven.api.agg.Count) - The count aggregation\n  \n*Overload 5*  \n  :param firstRowKey: (io.deephaven.api.agg.FirstRowKey) - The first row key aggregation\n  \n*Overload 6*  \n  :param lastRowKey: (io.deephaven.api.agg.LastRowKey) - The last row key aggregation"
+ },
+ "path": "io.deephaven.api.agg.AggregationDescriptions",
+ "text": "A visitor to describe the input and aggregation column name pairs for aggregations.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/AggregationOptimizer.json

@@ -3,9 +3,9 @@
  "methods": {
   "build": ":return: java.util.List<io.deephaven.api.agg.Aggregation>",
   "of": "Optimizes a collection of aggregations by grouping like-specced aggregations together. The\n input order will be preserved based on the spec-encountered order.\n\n:param aggregations: (java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>) - the aggregations\n:return: (java.util.List<io.deephaven.api.agg.Aggregation>) the optimized aggregations",
-  "visit": "*Overload 1*  \n  :param count: io.deephaven.api.agg.Count\n  \n*Overload 2*  \n  :param normalAgg: io.deephaven.api.agg.NormalAggregation\n  \n*Overload 3*  \n  :param normalAggs: io.deephaven.api.agg.NormalAggregations"
+  "visit": "**Incompatible overloads text - text from the first overload:**\n\nVisit a column aggregation.\n\n*Overload 1*  \n  :param aggregations: (io.deephaven.api.agg.Aggregations) - The compound aggregation to visit\n  \n*Overload 2*  \n  :param columnAgg: (io.deephaven.api.agg.ColumnAggregation) - The column aggregation to visit\n  \n*Overload 3*  \n  :param columnAggs: (io.deephaven.api.agg.ColumnAggregations) - The compound column aggregation to visit\n  \n*Overload 4*  \n  :param count: (io.deephaven.api.agg.Count) - The count aggregation\n  \n*Overload 5*  \n  :param firstRowKey: (io.deephaven.api.agg.FirstRowKey) - The first row key aggregation\n  \n*Overload 6*  \n  :param lastRowKey: (io.deephaven.api.agg.LastRowKey) - The last row key aggregation"
  },
  "path": "io.deephaven.api.agg.AggregationOptimizer",
- "text": "Optimizes a collection of aggregations by grouping like-speccedd aggregations together.",
+ "text": "Optimizes a collection of aggregations by grouping like-specced aggregations together.",
  "typeName": "class"
 }

Integrations/python/deephaven/doc/io/deephaven/api/agg/AggregationPairs.json

@@ -0,0 +1,11 @@
+{
+ "className": "io.deephaven.api.agg.AggregationPairs",
+ "methods": {
+  "of": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: java.util.stream.Stream<io.deephaven.api.agg.Pair>\n  \n*Overload 2*  \n  :param aggregations: java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>\n  :return: java.util.stream.Stream<io.deephaven.api.agg.Pair>",
+  "outputsOf": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: java.util.stream.Stream<io.deephaven.api.ColumnName>\n  \n*Overload 2*  \n  :param aggregations: java.util.Collection<? extendsio.deephaven.api.agg.Aggregation>\n  :return: java.util.stream.Stream<io.deephaven.api.ColumnName>",
+  "visit": "**Incompatible overloads text - text from the first overload:**\n\nVisit a column aggregation.\n\n*Overload 1*  \n  :param aggregations: (io.deephaven.api.agg.Aggregations) - The compound aggregation to visit\n  \n*Overload 2*  \n  :param columnAgg: (io.deephaven.api.agg.ColumnAggregation) - The column aggregation to visit\n  \n*Overload 3*  \n  :param columnAggs: (io.deephaven.api.agg.ColumnAggregations) - The compound column aggregation to visit\n  \n*Overload 4*  \n  :param count: (io.deephaven.api.agg.Count) - The count aggregation\n  \n*Overload 5*  \n  :param firstRowKey: (io.deephaven.api.agg.FirstRowKey) - The first row key aggregation\n  \n*Overload 6*  \n  :param lastRowKey: (io.deephaven.api.agg.LastRowKey) - The last row key aggregation"
+ },
+ "path": "io.deephaven.api.agg.AggregationPairs",
+ "text": "A visitor to get the ordered input/output column name pairs for aggregations.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/Aggregations.json

@@ -0,0 +1,11 @@
+{
+ "className": "io.deephaven.api.agg.Aggregations",
+ "methods": {
+  "aggregations": ":return: java.util.List<io.deephaven.api.agg.Aggregation>",
+  "builder": ":return: io.deephaven.api.agg.Aggregations.Builder",
+  "walk": "Glue method to deliver this Aggregation to a AggSpec.Visitor.\n\nNote: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: (V) - The visitor\n:return: (V) The visitor"
+ },
+ "path": "io.deephaven.api.agg.Aggregations",
+ "text": "Aggregations is an Aggregation that is a collection of two or more aggregations.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/Aggregations/Builder.json

@@ -0,0 +1,10 @@
+{
+ "className": "io.deephaven.api.agg.Aggregations$Builder",
+ "methods": {
+  "addAggregations": "*Overload 1*  \n  :param aggregation: io.deephaven.api.agg.Aggregation\n  :return: io.deephaven.api.agg.Aggregations.Builder\n  \n*Overload 2*  \n  :param aggregations: io.deephaven.api.agg.Aggregation...\n  :return: io.deephaven.api.agg.Aggregations.Builder",
+  "addAllAggregations": ":param aggregations: java.lang.Iterable<? extendsio.deephaven.api.agg.Aggregation>\n:return: io.deephaven.api.agg.Aggregations.Builder",
+  "build": ":return: io.deephaven.api.agg.Aggregations"
+ },
+ "path": "io.deephaven.api.agg.Aggregations.Builder",
+ "typeName": "interface"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/ColumnAggregation.json

@@ -0,0 +1,12 @@
+{
+ "className": "io.deephaven.api.agg.ColumnAggregation",
+ "methods": {
+  "of": ":param spec: io.deephaven.api.agg.spec.AggSpec\n:param pair: io.deephaven.api.agg.Pair\n:return: io.deephaven.api.agg.ColumnAggregation",
+  "pair": ":return: io.deephaven.api.agg.Pair",
+  "spec": ":return: io.deephaven.api.agg.spec.AggSpec",
+  "walk": "Glue method to deliver this Aggregation to a AggSpec.Visitor.\n\nNote: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: (V) - The visitor\n:return: (V) The visitor"
+ },
+ "path": "io.deephaven.api.agg.ColumnAggregation",
+ "text": "A ColumnAggregation is an Aggregation that is composed of a spec and a single input/output\n column pair. The spec defines the aggregation operation to apply to the input column in order to\n produce the paired output column.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/ColumnAggregations.json

@@ -0,0 +1,12 @@
+{
+ "className": "io.deephaven.api.agg.ColumnAggregations",
+ "methods": {
+  "builder": ":return: io.deephaven.api.agg.ColumnAggregations.Builder",
+  "pairs": ":return: java.util.List<io.deephaven.api.agg.Pair>",
+  "spec": ":return: io.deephaven.api.agg.spec.AggSpec",
+  "walk": "Glue method to deliver this Aggregation to a AggSpec.Visitor.\n\nNote: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: (V) - The visitor\n:return: (V) The visitor"
+ },
+ "path": "io.deephaven.api.agg.ColumnAggregations",
+ "text": "ColumnAggregations is an Aggregation that is composed of a spec and multiple input/output\n column pairs. The spec defines the aggregation operation to apply to each input column in order to\n produce the paired output column.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/ColumnAggregations/Builder.json

@@ -0,0 +1,11 @@
+{
+ "className": "io.deephaven.api.agg.ColumnAggregations$Builder",
+ "methods": {
+  "addAllPairs": ":param elements: java.lang.Iterable<? extendsio.deephaven.api.agg.Pair>\n:return: io.deephaven.api.agg.ColumnAggregations.Builder",
+  "addPairs": "*Overload 1*  \n  :param element: io.deephaven.api.agg.Pair\n  :return: io.deephaven.api.agg.ColumnAggregations.Builder\n  \n*Overload 2*  \n  :param elements: io.deephaven.api.agg.Pair...\n  :return: io.deephaven.api.agg.ColumnAggregations.Builder",
+  "build": ":return: io.deephaven.api.agg.ColumnAggregations",
+  "spec": ":param spec: io.deephaven.api.agg.spec.AggSpec\n:return: io.deephaven.api.agg.ColumnAggregations.Builder"
+ },
+ "path": "io.deephaven.api.agg.ColumnAggregations.Builder",
+ "typeName": "interface"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/Count.json

@@ -3,8 +3,9 @@
  "methods": {
   "column": ":return: io.deephaven.api.ColumnName",
   "of": "*Overload 1*  \n  :param name: io.deephaven.api.ColumnName\n  :return: io.deephaven.api.agg.Count\n  \n*Overload 2*  \n  :param x: java.lang.String\n  :return: io.deephaven.api.agg.Count",
-  "walk": "Note: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: V\n:return: V"
+  "walk": "Glue method to deliver this Aggregation to a AggSpec.Visitor.\n\nNote: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: (V) - The visitor\n:return: (V) The visitor"
  },
  "path": "io.deephaven.api.agg.Count",
+ "text": "An aggregation that provides a single output column with the number of rows in each aggregation\n group.",
  "typeName": "class"
 }

Integrations/python/deephaven/doc/io/deephaven/api/agg/FirstRowKey.json

@@ -0,0 +1,11 @@
+{
+ "className": "io.deephaven.api.agg.FirstRowKey",
+ "methods": {
+  "column": ":return: io.deephaven.api.ColumnName",
+  "of": "*Overload 1*  \n  :param name: io.deephaven.api.ColumnName\n  :return: io.deephaven.api.agg.FirstRowKey\n  \n*Overload 2*  \n  :param x: java.lang.String\n  :return: io.deephaven.api.agg.FirstRowKey",
+  "walk": "Glue method to deliver this Aggregation to a AggSpec.Visitor.\n\nNote: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: (V) - The visitor\n:return: (V) The visitor"
+ },
+ "path": "io.deephaven.api.agg.FirstRowKey",
+ "text": "An aggregation that provides a single output column with the first row key from the input table\n for each aggregation group in the result.\n \n The primary use case for this aggregation is to allow for a subsequent sort on the output column to order aggregated data by current first occurrence in the input table rather than\n encounter order.",
+ "typeName": "class"
+}

Integrations/python/deephaven/doc/io/deephaven/api/agg/LastRowKey.json

@@ -0,0 +1,11 @@
+{
+ "className": "io.deephaven.api.agg.LastRowKey",
+ "methods": {
+  "column": ":return: io.deephaven.api.ColumnName",
+  "of": "*Overload 1*  \n  :param name: io.deephaven.api.ColumnName\n  :return: io.deephaven.api.agg.LastRowKey\n  \n*Overload 2*  \n  :param x: java.lang.String\n  :return: io.deephaven.api.agg.LastRowKey",
+  "walk": "Glue method to deliver this Aggregation to a AggSpec.Visitor.\n\nNote: Java generics information - <V extends io.deephaven.api.agg.Aggregation.Visitor>\n\n:param visitor: (V) - The visitor\n:return: (V) The visitor"
+ },
+ "path": "io.deephaven.api.agg.LastRowKey",
+ "text": "An aggregation that provides a single output column with the last row key from the input table\n for each aggregation group in the result.\n \n The primary use case for this aggregation is to allow for a subsequent sort on the output column to order aggregated data by current last occurrence in the input table rather than\n encounter order.",
+ "typeName": "class"
+}