Fix total rollup schema bug

Signed-off-by: Andrew Stein <steinlink@gmail.com>

Author: texodus

rust/perspective-js/test/js/group_rollup_mode.spec.js

@@ -585,6 +585,23 @@ const data = {
                 table.delete();
             });
 
+            test("with split_by schema", async function () {
+                const table = await perspective.table(data);
+                const view = await table.view({
+                    split_by: ["z"],
+                    group_rollup_mode: "total",
+                });
+                const schema = await view.schema();
+                expect(schema).toStrictEqual({
+                    w: "float",
+                    x: "integer",
+                    y: "integer",
+                    z: "integer",
+                });
+                view.delete();
+                table.delete();
+            });
+
             test("updates after table.update()", async function () {
                 const table = await perspective.table(data);
                 const view = await table.view({

rust/perspective-server/cpp/perspective/src/cpp/view.cpp

@@ -461,7 +461,7 @@ View<CTX_T>::schema() const {
         std::string type_string = dtype_to_str(types[agg_name]);
         new_schema[agg_name] = type_string;
 
-        if ((!m_row_pivots.empty() || m_view_config->is_total_only()) && !is_column_only()) {
+        if ((!m_row_pivots.empty() || m_view_config->is_total_only()) && (!is_column_only() || m_view_config->is_total_only())) {
             new_schema[agg_name] =
                 _map_aggregate_types(agg_name, new_schema[agg_name]);
         }
@@ -540,7 +540,7 @@ View<CTX_T>::expression_schema() const {
         const std::string& expression_alias = expr->get_expression_alias();
         new_schema[expression_alias] = dtype_to_str(expr->get_dtype());
 
-        if ((!m_row_pivots.empty() || m_view_config->is_total_only()) && !is_column_only()) {
+        if ((!m_row_pivots.empty() || m_view_config->is_total_only()) && (!is_column_only() || m_view_config->is_total_only())) {
             new_schema[expression_alias] = _map_aggregate_types(
                 expression_alias, new_schema[expression_alias]
             );