Skip to content

Feature/memory range dimension #2306

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
JanKallman merged 3 commits into from
Mar 5, 2026
Merged

Feature/memory range dimension #2306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2a142a
#2305 - improved performance when calculating full columns
swmal Mar 4, 2026
105ce75
Merge branch 'develop8' into feature/memory-range-dimension
swmal Mar 4, 2026
2421d49
Removed Debug.Assert
swmal Mar 4, 2026
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
85 changes: 60 additions & 25 deletions src/EPPlus/FormulaParsing/DependencyChain/ArrayFormulaOutput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,18 @@ Date Author Change
*************************************************************************************************
05/14/2024 EPPlus Software AB Initial release EPPlus 7
*************************************************************************************************/
using OfficeOpenXml.FormulaParsing.LexicalAnalysis;
using OfficeOpenXml.Core.CellStore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.Filter;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.FormulaParsing.FormulaExpressions;
using OfficeOpenXml.FormulaParsing.LexicalAnalysis;
using OfficeOpenXml.FormulaParsing.Ranges;
using OfficeOpenXml.Utils;
using OfficeOpenXml.Utils.TypeConversion;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace OfficeOpenXml.FormulaParsing
{
Expand All @@ -37,7 +38,14 @@ internal static void FillArrayFromRangeInfo(RpnFormula f, IRangeInfo array, Rang
var rows = sf.EndRow - sf.StartRow + 1;
var cols = sf.EndCol - sf.StartCol + 1;
var wsIx = ws.IndexInList;
for (int r = 0; r < rows; r++)

// Determine physical boundary and default value for virtual rows
var virtualImr = array as InMemoryRange;
var hasVirtual = virtualImr != null && virtualImr.HasVirtualRows;
var physicalRowLimit = hasVirtual ? Math.Min(rows, virtualImr.PhysicalRows) : rows;

// Phase 1: Physical rows - read actual cell values via GetOffset
for (int r = 0; r < physicalRowLimit; r++)
{
for (int c = 0; c < cols; c++)
{
Expand All @@ -46,9 +54,8 @@ internal static void FillArrayFromRangeInfo(RpnFormula f, IRangeInfo array, Rang
if (r < nr && c < nc)
{
var val = array.GetOffset(r, c);
if(ConvertUtil.IsNumeric(val) && val is double dbl && dbl == 0d)
if (ConvertUtil.IsNumeric(val) && val is double dbl && dbl == 0d)
{
// avoid -0
val = 0d;
}
ws.SetValueInner(row, col, val ?? 0D);
Expand All @@ -58,7 +65,35 @@ internal static void FillArrayFromRangeInfo(RpnFormula f, IRangeInfo array, Rang
ws.SetValueInner(row, col, ErrorValues.NAError);
}
var id = ExcelCellBase.GetCellId(wsIx, row, col);
depChain.processedCells.Add(id);
depChain.processedCells.Add(id);
}
}

// Phase 2: Virtual rows - write pre-computed default value directly
if (hasVirtual && physicalRowLimit < rows)
{
var defaultVal = virtualImr.VirtualDefaultValue ?? 0D;
if (ConvertUtil.IsNumeric(defaultVal) && defaultVal is double dblDefault && dblDefault == 0d)
{
defaultVal = 0d;
}
for (int r = physicalRowLimit; r < rows; r++)
{
for (int c = 0; c < cols; c++)
{
var row = sr + r;
var col = sc + c;
if (r < nr && c < nc)
{
ws.SetValueInner(row, col, defaultVal);
}
else
{
ws.SetValueInner(row, col, ErrorValues.NAError);
}
var id = ExcelCellBase.GetCellId(wsIx, row, col);
depChain.processedCells.Add(id);
}
}
}

Expand All @@ -74,7 +109,7 @@ private static bool HasSpill(ExcelWorksheet ws, int fIx, int startRow, int start
{
if (r == startRow && c == startColumn) continue;
object f = -1;
if (fIx!=-1 && ws._formulas.Exists(r, c, ref f) && f != null)
if (fIx != -1 && ws._formulas.Exists(r, c, ref f) && f != null)
{
if (f is int intfIx && intfIx == fIx)
{
Expand All @@ -87,7 +122,7 @@ private static bool HasSpill(ExcelWorksheet ws, int fIx, int startRow, int start
else
{
var v = ws.GetValueInner(r, c);
if(v!=null)
if (v != null)
{
rowOff = r - startRow;
colOff = c - startColumn;
Expand All @@ -98,7 +133,7 @@ private static bool HasSpill(ExcelWorksheet ws, int fIx, int startRow, int start
}
rowOff = colOff = 0;
return false;
}
}
internal static SimpleAddress[] FillDynamicArrayFromRangeInfo(RpnFormula f, IRangeInfo array, RangeHashset rd, RpnOptimizedDependencyChain depChain)
{
var nr = array.Size.NumberOfRows;
Expand All @@ -107,13 +142,13 @@ internal static SimpleAddress[] FillDynamicArrayFromRangeInfo(RpnFormula f, IRan
var startRow = f._row;
var startCol = f._column;
var wsIx = ws.IndexInList;

f._flags |= FormulaFlags.IsDynamic;
var md = depChain._parsingContext.Package.Workbook.Metadata;
//d.GetDynamicArrayIndex(out int cm);
md.GetDynamicArrayId(out uint cm);
var metaData = f._ws._metadataStore.GetValue(startRow, startCol);
metaData.cm= cm;
metaData.cm = cm;

f._ws._metadataStore.SetValue(f._row, f._column, metaData);

Expand All @@ -134,7 +169,7 @@ internal static SimpleAddress[] FillDynamicArrayFromRangeInfo(RpnFormula f, IRan
}
}
SimpleAddress[] dirtyRange;
if(f._arrayIndex==-1)
if (f._arrayIndex == -1)
{
var endRow = startRow + array.Size.NumberOfRows - 1;
var endCol = f._column + array.Size.NumberOfCols - 1;
Expand All @@ -151,7 +186,7 @@ internal static SimpleAddress[] FillDynamicArrayFromRangeInfo(RpnFormula f, IRan
CleanupSharedFormulaValues(f, ws, sf, endRow, endCol);
sf.EndRow = endRow;
sf.EndCol = endCol;

}
FillArrayFromRangeInfo(f, array, rd, depChain);
return dirtyRange;
Expand Down Expand Up @@ -212,10 +247,10 @@ private static void CleanupSharedFormulaValues(RpnFormula f, ExcelWorksheet ws,
}
}

private static SimpleAddress[] GetDirtyRange(int fromRow, int fromCol, int toRow, int toCol, int prevToRow=0, int prevToCol=0)
private static SimpleAddress[] GetDirtyRange(int fromRow, int fromCol, int toRow, int toCol, int prevToRow = 0, int prevToCol = 0)
{
if(prevToRow == 0) prevToRow = fromRow;
if(prevToCol == 0) prevToCol = fromCol;
if (prevToRow == 0) prevToRow = fromRow;
if (prevToCol == 0) prevToCol = fromCol;
if (prevToRow == toRow && prevToCol == toCol)
{
return new SimpleAddress[0];
Expand All @@ -226,15 +261,15 @@ private static SimpleAddress[] GetDirtyRange(int fromRow, int fromCol, int toRow
{
new SimpleAddress(fromRow, Math.Min(prevToCol+1, toCol+1), Math.Min(prevToRow, toRow), Math.Max(prevToCol, toCol)),
new SimpleAddress(Math.Min(prevToRow + 1, toRow + 1), fromCol, Math.Max(prevToRow, toRow), Math.Max(prevToCol, toCol))
};
};
}
else if(prevToRow != toRow)
else if (prevToRow != toRow)
{
return new SimpleAddress[] { new SimpleAddress(Math.Min(prevToRow+1, toRow), fromCol, Math.Max(prevToRow, toRow), Math.Max(prevToCol,toCol)) };
}
return new SimpleAddress[] { new SimpleAddress(Math.Min(prevToRow + 1, toRow), fromCol, Math.Max(prevToRow, toRow), Math.Max(prevToCol, toCol)) };
}
else
{
return new SimpleAddress[] { new SimpleAddress(fromRow, Math.Min(prevToCol+1, toCol), Math.Max(prevToRow, toRow), Math.Max(prevToCol, toCol)) };
return new SimpleAddress[] { new SimpleAddress(fromRow, Math.Min(prevToCol + 1, toCol), Math.Max(prevToRow, toRow), Math.Max(prevToCol, toCol)) };
}
}

Expand Down
14 changes: 13 additions & 1 deletion src/EPPlus/FormulaParsing/Excel/Functions/RefAndLookup/LookupUtils/XlookupScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,28 @@ private int FindIndexInternal()
return -1;
}


private int GetMaxItemsRow(IRangeInfo lookupRange)
{
var adjusted = lookupRange.GetAddressDimensionAdjusted(0);
if (adjusted != null)
{
return adjusted.ToRow - adjusted.FromRow + 1;
}
if (lookupRange.Address.ToRow > lookupRange.Dimension.ToRow)
{
return lookupRange.Dimension.ToRow - lookupRange.Address.FromRow + 1;
}
}
return _lookupRange.Size.NumberOfRows;
}

private int GetMaxItemsColumns(IRangeInfo lookupRange)
{
var adjusted = lookupRange.GetAddressDimensionAdjusted(0);
if (adjusted != null)
{
return adjusted.ToCol - adjusted.FromCol + 1;
}
if (lookupRange.Address.ToCol > lookupRange.Dimension.ToCol)
{
return lookupRange.Dimension.ToCol - lookupRange.Address.FromCol + 1;
Expand Down
Loading