address review: store running-total entries only for items with a number

crates/engine/src/cmd/print.rs

@@ -32,26 +32,8 @@ use header_footer::draw_header_footer;
 pub use header_footer::{
     HF_FIELDS, HfContext, HfSection, codes_to_fields, expand_header_footer, fields_to_codes, hf_date_time, join_header_footer, split_header_footer,
 };
-type DecodedPicture = (Vec<u8>, u32, u32);
-
-/// What one PDF render shares across the pages an object spans.
-#[derive(Default)]
-struct PicCache {
-    /// Decoded pictures (bytes, width, height) keyed by (sheet, picture); `None` = undecodable.
-    decoded: std::collections::HashMap<(usize, usize), Option<DecodedPicture>>,
-    /// Laid-out charts keyed by (sheet, chart), rendered once however many pages they touch.
-    charts: std::collections::HashMap<(usize, usize), Vec<gridcraft_chart::Prim>>,
-    /// Bytes of picture pixels embedded so far, and chart primitives emitted so far. Each page an
-    /// object touches gets its own copy in the PDF, so a workbook-controlled anchor over thousands
-    /// of pages would multiply them without bound.
-    image_bytes: usize,
-    chart_prims: usize,
-}
-
-/// Most picture pixel bytes (RGBA, before PDF packing) one render embeds across all pages.
-const MAX_EMBEDDED_IMAGE_BYTES: usize = 512 * 1024 * 1024;
-/// Most chart primitives one render draws across all pages.
-const MAX_CHART_PRIMS: usize = 4_000_000;
+/// Decoded pictures (bytes, width, height) keyed by (sheet, picture); `None` = undecodable.
+type PicCache = std::collections::HashMap<(usize, usize), Option<(Vec<u8>, u32, u32)>>;
 
 #[cfg(test)]
 use layout::bands;
@@ -120,7 +102,7 @@ pub fn render_pdf(wb: &Workbook, layouts: &[SheetLayout], file: &str, path: &str
     let mut printed_blocks = Vec::new();
     // Decoded pictures are reused across the pages their anchor covers: a floating picture
     // spanning 40 pages was decoded (and pushed into the PDF) 40 times (#2389).
-    let mut pics = PicCache::default();
+    let mut pics = PicCache::new();
     for lay in layouts {
         let Some(sh) = wb.sheet(lay.sheet) else { continue };
         let mut cf = if sh.cond_formats.is_empty() { None } else { Some(crate::cf::CfCache::new()) };

crates/engine/src/cmd/print/layout.rs

@@ -224,12 +224,6 @@ pub fn layout_sheet(wb: &Workbook, si: usize, opts: &PrintOptions, range_overrid
         Some(r) => trim_full(sh, r),
         None => print_range(sh).unwrap_or(RangeRef::cell(CellRef::new(0, 0))),
     };
-    // A print area from a file or JSON can name coordinates past the grid; pagination walks every
-    // line of the area (zero-height rows never fill a band), so it is held to the grid first.
-    let area = RangeRef::new(
-        CellRef::new(area.start.row.min(MAX_ROWS - 1), area.start.col.min(MAX_COLS - 1)),
-        CellRef::new(area.end.row.min(MAX_ROWS - 1), area.end.col.min(MAX_COLS - 1)),
-    );
     let title_rows = title_span(st.title_rows, MAX_ROWS);
     let title_cols = title_span(st.title_cols, MAX_COLS);
     let digits = format!("{}", area.end.row + 1).len() as f32;
@@ -385,19 +379,3 @@ pub(super) fn segments(titles: Option<(u32, u32)>, band: (u32, u32)) -> Vec<(u32
 pub(super) fn seg_size(sh: &Sheet, seg: (u32, u32), rows: bool) -> f32 {
     if rows { (seg.0..=seg.1).map(|r| sh.row_height(r)).sum() } else { (seg.0..=seg.1).map(|c| sh.col_width(c)).sum() }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn a_print_area_past_the_grid_is_held_to_the_grid() {
-        let mut wb = Workbook::new();
-        let sh = wb.sheet_mut(0).unwrap();
-        sh.default_row_height = 0.0;
-        sh.print.print_area = Some(RangeRef { start: CellRef::new(0, 0), end: CellRef::new(u32::MAX, u32::MAX) });
-        let lay = layout_sheet(&wb, 0, &PrintOptions::default(), None).unwrap();
-        assert_eq!((lay.area.end.row, lay.area.end.col), (MAX_ROWS - 1, MAX_COLS - 1));
-        assert!(lay.pages.len() <= MAX_PAGES);
-    }
-}

crates/engine/src/cmd/print/objects.rs

@@ -88,14 +88,9 @@ pub(super) fn draw_objects(pg: &mut Page, wb: &Workbook, si: usize, sh: &Sheet,
         let (x, y, w, h) = place(r);
         // About 150 dpi is plenty for print.
         let (mw, mh) = (((w / 72.0) * 150.0).ceil().clamp(1.0, 4000.0) as u32, ((h / 72.0) * 150.0).ceil().clamp(1.0, 4000.0) as u32);
-        let decoded = pics.decoded.entry((si, imi)).or_insert_with(|| decode_image(&im.data, mw, mh));
+        let decoded = pics.entry((si, imi)).or_insert_with(|| decode_image(&im.data, mw, mh));
         if let Some((px, pw, ph)) = decoded.as_ref() {
-            // Every page the picture touches embeds its own copy: past the budget it is left out.
-            let bytes = px.len();
-            if pics.image_bytes.saturating_add(bytes) <= super::MAX_EMBEDDED_IMAGE_BYTES {
-                pics.image_bytes += bytes;
-                pg.image_rgba(Rect::new(x, y, w, h), px, [*pw, *ph]);
-            }
+            pg.image_rgba(Rect::new(x, y, w, h), px, [*pw, *ph]);
         }
     }
     for shp in &sh.shapes {
@@ -125,21 +120,15 @@ pub(super) fn draw_objects(pg: &mut Page, wb: &Workbook, si: usize, sh: &Sheet,
         }
         draw_shape(pg, wb, shp, b, (x, y, w, h));
     }
-    for (chi, ch) in sh.charts.iter().enumerate() {
+    for ch in &sh.charts {
         let r = anchor_rect(sh, &ch.anchor);
         if !visible(r) {
             continue;
         }
         let (x, y, _, _) = place(r);
-        let prims = pics.charts.entry((si, chi)).or_insert_with(|| {
-            let data = gridcraft_chart::resolve(wb, si, ch);
-            gridcraft_chart::render(ch, &data, r.2 as f32, r.3 as f32, &PdfMeasure)
-        });
-        // As for pictures, each page gets its own copy of the drawing commands.
-        if pics.chart_prims.saturating_add(prims.len()) <= super::MAX_CHART_PRIMS {
-            pics.chart_prims += prims.len();
-            draw_prims(pg, prims, Xf { ox: x, oy: y, k: b.k });
-        }
+        let data = gridcraft_chart::resolve(wb, si, ch);
+        let prims = gridcraft_chart::render(ch, &data, r.2 as f32, r.3 as f32, &PdfMeasure);
+        draw_prims(pg, &prims, Xf { ox: x, oy: y, k: b.k });
     }
     pg.restore();
 }

crates/engine/src/pivot/charts.rs

@@ -57,6 +57,10 @@ fn rows_ref(sheet: &str, origin: CellRef, col: u32, rows: &[u32]) -> Option<Stri
 /// Most category rows a PivotChart plots.
 const MAX_CHART_ROWS: usize = 10_000;
 
+/// Most series a PivotChart gets: the chart renderer reads at most 255 series, and each one owns
+/// reference text as long as its category rows, copied into every linked chart.
+const MAX_CHART_SERIES: usize = 255;
+
 /// A PivotChart's series for a report written at `origin`: categories are the innermost row
 /// items, one series per item column (column items × value fields); totals are left out.
 pub fn chart_series(sheet: &str, origin: CellRef, out: &Output) -> Vec<Series> {
@@ -64,6 +68,7 @@ pub fn chart_series(sheet: &str, origin: CellRef, out: &Output) -> Vec<Series> {
     let categories = out.label_col.and_then(|c| rows_ref(sheet, origin, c, &rows));
     out.chart_cols
         .iter()
+        .take(MAX_CHART_SERIES)
         .filter_map(|(c, name)| {
             Some(Series {
                 name: Some(format!("\"{}\"", name.replace('"', "\"\""))),
@@ -106,3 +111,22 @@ pub fn clear_output(wb: &mut Workbook, sheet: usize, idx: usize) {
         p.last_range = None;
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn a_pivot_chart_gets_at_most_the_series_the_renderer_reads() {
+        let out = Output {
+            grid: vec![],
+            row_kinds: vec![],
+            body_offset: 0,
+            width: 1000,
+            chart_rows: vec![1, 2, 3],
+            chart_cols: (1..1000).map(|c| (c, format!("S{c}"))).collect(),
+            label_col: Some(0),
+        };
+        assert_eq!(chart_series("Sheet1", CellRef::new(0, 0), &out).len(), MAX_CHART_SERIES);
+    }
+}

crates/engine/src/pivot/compute.rs

@@ -1,5 +1,7 @@
 use super::items::{Acc, FieldItems, build_tree, collect_siblings, is_collapsed, item_label};
-use super::output::{AggMap, CellKind, ColKind, ColSpec, Ctx, Grid, Line, LineKind, Output, RowKind, ValSrc, data_cols_exceed_sheet, flatten_cols};
+use super::output::{
+    AggMap, CellKind, ColKind, ColSpec, Ctx, Grid, Line, LineKind, Output, RowKind, ValSrc, caption, data_cols_exceed_sheet, flatten_cols,
+};
 use super::{
     CalcSet, CellError, CellRef, HashMap, HashSet, MAX_AXIS_FIELDS, MAX_COLS, MAX_VALUE_FIELDS, PivotDateGroup, PivotField, PivotFilter, PivotFunc,
     PivotLayout, PivotShowAs, PivotTable, PivotValue, Source, Value, Workbook, read_source,
@@ -92,6 +94,10 @@ struct AggregateData {
     col_leaves: HashSet<Vec<u32>>,
 }
 
+/// Most accumulators (groups times value columns) one report may hold: twice what the 5 million
+/// group limit allowed at one value field.
+const MAX_ACCUMULATORS: usize = 16_000_000;
+
 fn aggregate_record(
     input: &AggregateInput<'_>,
     data: &mut AggregateData,
@@ -150,7 +156,9 @@ fn aggregate_record(
     if !input.cols.is_empty() && data_cols_exceed_sheet(data.col_leaves.len(), input.pt.grand_totals_rows, input.vals.len()) {
         return Err("The PivotTable report will not fit on the sheet.".into());
     }
-    if data.aggs.len() > 5_000_000 {
+    // Each entry holds one accumulator per value field and calculated-field source column, so the
+    // width counts too: a handful of groups over hundreds of fields is large as well.
+    if data.aggs.len() > 5_000_000 || data.aggs.len().saturating_mul(input.vals.len() + input.extra.len()) > MAX_ACCUMULATORS {
         return Err("The PivotTable report is too large.".into());
     }
     Ok(())
@@ -257,8 +265,8 @@ fn write_headers(g: &mut Grid, input: HeaderInput<'_>) -> Result<(), String> {
                     let lv = spec.path.len().saturating_sub(1);
                     let label = spec.path.last().and_then(|it| col_items.get(lv).map(|fi| fi.label(*it))).unwrap_or_default();
                     let text = match vi {
-                        Some(vi) if k > 1 => format!("{label} {}", val_name(*vi)),
-                        _ => format!("{label} Total"),
+                        Some(vi) if k > 1 => caption(&label, &val_name(*vi)),
+                        _ => caption(&label, "Total"),
                     };
                     g.set(first_level + lv, c, Value::text(text), CellKind::ColLabel, 0, None);
                 }
@@ -316,6 +324,7 @@ struct ShowContext<'a> {
     value_index: usize,
     level0: &'a [u32],
     siblings: &'a HashMap<Vec<u32>, Vec<u32>>,
+    cache: &'a ShowCache,
 }
 
 fn number(value: &Option<Value>) -> Option<f64> {
@@ -332,42 +341,67 @@ fn ratio(a: Value, b: Option<Value>) -> Value {
     }
 }
 
+/// What Running Total and Rank need from other cells, computed once per sibling set instead of
+/// once per displayed value (which rescanned the whole set every time).
+type ShowKey = (Vec<u32>, Vec<u32>, usize);
+/// Cumulative values by top-level item, and the total of all of them.
+type RunningTotals = (HashMap<u32, f64>, f64);
+
+#[derive(Default)]
+struct ShowCache {
+    /// Ranked values' sibling numbers, sorted ascending without repeats, by (parent, column, value).
+    ranks: std::cell::RefCell<HashMap<ShowKey, Vec<f64>>>,
+    /// Running totals by top-level item, with the total of all of them, by (rest of path, column, value).
+    running: std::cell::RefCell<HashMap<ShowKey, RunningTotals>>,
+}
+
 fn running_total(raw: Value, lookup: &ValueLookup<'_>, context: &ShowContext<'_>) -> Value {
-    let Some((first, _)) = context.row_path.split_first() else { return raw };
+    let Some((first, rest)) = context.row_path.split_first() else { return raw };
     if !matches!(raw, Value::Number(_)) {
         return raw;
     }
-    let mut total = 0.0;
-    for item in context.level0 {
-        let mut path = context.row_path.to_vec();
-        if let Some(first_item) = path.first_mut() {
-            *first_item = *item;
+    let mut cache = context.cache.running.borrow_mut();
+    let (by_item, all) = cache.entry((rest.to_vec(), context.col_path.to_vec(), context.value_index)).or_insert_with(|| {
+        let mut total = 0.0;
+        let mut by_item = HashMap::new();
+        for item in context.level0 {
+            let mut path = Vec::with_capacity(rest.len() + 1);
+            path.push(*item);
+            path.extend_from_slice(rest);
+            // An item with no number here adds nothing and is not stored (the shown cell always has one).
+            let Some(value) = number(&lookup.get(&path, context.col_path, context.value_index)) else { continue };
+            total += value;
+            by_item.entry(*item).or_insert(total);
         }
-        total += number(&lookup.get(&path, context.col_path, context.value_index)).unwrap_or(0.0);
-        if item == first {
-            break;
-        }
-    }
-    Value::number(total)
+        (by_item, total)
+    });
+    Value::number(by_item.get(first).copied().unwrap_or(*all))
 }
 
 fn ranked_value(raw: Value, lookup: &ValueLookup<'_>, context: &ShowContext<'_>) -> Value {
     let Some((_, parent)) = context.row_path.split_last() else { return Value::Empty };
     let Some(me) = raw.as_f64() else { return raw };
-    let siblings = context.siblings.get(parent).cloned().unwrap_or_default();
+    let mut cache = context.cache.ranks.borrow_mut();
+    let sorted = cache.entry((parent.to_vec(), context.col_path.to_vec(), context.value_index)).or_insert_with(|| {
+        let mut all: Vec<f64> = context
+            .siblings
+            .get(parent)
+            .into_iter()
+            .flatten()
+            .filter_map(|sibling| {
+                let mut path = parent.to_vec();
+                path.push(*sibling);
+                number(&lookup.get(&path, context.col_path, context.value_index))
+            })
+            .collect();
+        all.sort_by(f64::total_cmp);
+        all.dedup();
+        all
+    });
     // Excel's ranks are dense: ties share a rank and the next value takes the next one
     // (5, 4, 3, 3, 4 rank 1, 2, 3, 3, 2), so count the distinct larger values.
-    let mut larger: Vec<f64> = siblings
-        .into_iter()
-        .filter_map(|sibling| {
-            let mut path = parent.to_vec();
-            path.push(sibling);
-            number(&lookup.get(&path, context.col_path, context.value_index)).filter(|value| *value > me)
-        })
-        .collect();
-    larger.sort_by(f64::total_cmp);
-    larger.dedup();
-    Value::number(larger.len() as f64 + 1.0)
+    let larger = sorted.len() - sorted.partition_point(|value| *value <= me);
+    Value::number(larger as f64 + 1.0)
 }
 
 fn show_value(definition: &PivotValue, raw: Value, lookup: &ValueLookup<'_>, context: &ShowContext<'_>) -> Value {
@@ -637,6 +671,7 @@ pub(super) fn compute_from(wb: &Workbook, pt: &PivotTable, src: &Source, mut pro
         })
         .collect();
     let lookup = ValueLookup { wb, source: src, calc: &calc, vals: &vals, extra: &extra, aggs: &aggs, value_count: k };
+    let show_cache = ShowCache::default();
     let mut chart_rows: Vec<u32> = Vec::new();
     let chart_cols: Vec<(u32, String)> = data_cols
         .iter()
@@ -694,7 +729,7 @@ pub(super) fn compute_from(wb: &Workbook, pt: &PivotTable, src: &Source, mut pro
             let Some((_, vdef)) = vals.get(*vi) else { continue };
             let cp = spec.path.as_slice();
             let Some(raw) = lookup.get(rp, cp, *vi) else { continue };
-            let context = ShowContext { row_path: rp, col_path: cp, value_index: *vi, level0: &level0, siblings: &siblings };
+            let context = ShowContext { row_path: rp, col_path: cp, value_index: *vi, level0: &level0, siblings: &siblings, cache: &show_cache };
             let shown = show_value(vdef, raw, &lookup, &context);
             if let Some(pr) = probe.as_deref_mut() {
                 if pr.at == Some((r, l + j)) {

crates/engine/src/pivot/output.rs

@@ -121,6 +121,18 @@ pub(super) enum ColKind {
     Grand,
 }
 
+/// Longest item caption Excel keeps; a subtotal caption repeats its parent's label for every value
+/// field at every level, so a long source label is cut rather than multiplied.
+const MAX_CAPTION_LABEL_CHARS: usize = 255;
+
+/// `label` (cut to [`MAX_CAPTION_LABEL_CHARS`]) and `suffix`, as in "East Total".
+pub(super) fn caption(label: &str, suffix: &str) -> String {
+    let mut out: String = label.chars().take(MAX_CAPTION_LABEL_CHARS).collect();
+    out.push(' ');
+    out.push_str(suffix);
+    out
+}
+
 pub(super) struct ColSpec {
     pub(super) kind: ColKind,
     pub(super) path: Vec<u32>,
@@ -162,7 +174,7 @@ impl Ctx<'_> {
                 leaf: false,
                 path: prefix.to_vec(),
                 values: true,
-                labels: vec![(col, Value::text(format!("{label} {name}")), indent, None)],
+                labels: vec![(col, Value::text(caption(label, name)), indent, None)],
                 vi: Some(vi),
             });
         }
@@ -249,7 +261,7 @@ impl Ctx<'_> {
                         leaf: false,
                         path: prefix.clone(),
                         values: true,
-                        labels: vec![(col, Value::text(format!("{label} Total")), indent, None)],
+                        labels: vec![(col, Value::text(caption(&label, "Total")), indent, None)],
                         vi,
                     });
                 }
@@ -316,7 +328,7 @@ impl Ctx<'_> {
                         leaf: false,
                         path: prefix.clone(),
                         values: true,
-                        labels: vec![(col, Value::text(format!("{label} Total")), 0, None)],
+                        labels: vec![(col, Value::text(caption(&label, "Total")), 0, None)],
                         vi,
                     });
                 }
@@ -438,3 +450,17 @@ pub(super) fn cell_style(lk: &Look, rk: RowKind, cell: &OutCell, last_header: bo
     }
     s
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn captions_cut_a_long_parent_label() {
+        assert_eq!(caption("East", "Total"), "East Total");
+        let long = "é".repeat(100_000);
+        let c = caption(&long, "Sum of Sales");
+        assert_eq!(c.chars().count(), MAX_CAPTION_LABEL_CHARS + " Sum of Sales".len());
+        assert!(c.ends_with(" Sum of Sales"));
+    }
+}