diff --git a/Csv/CsvLineSplitter.cs b/Csv/CsvLineSplitter.cs index 48ad845..78f6ab9 100644 --- a/Csv/CsvLineSplitter.cs +++ b/Csv/CsvLineSplitter.cs @@ -144,7 +144,7 @@ private static bool IsUnterminatedQuotedValueCore(SpanText value, char quoteChar return trailingQuoteCount % 2 != 0; } - public IList Split(MemoryText line, CsvOptions options) + public IList Split(MemoryText line, CsvOptions options, int? capacity = null) { #if NET8_0_OR_GREATER var span = line.Span; @@ -152,7 +152,7 @@ public IList Split(MemoryText line, CsvOptions options) var span = line; #endif - var values = new List(); + var values = capacity.HasValue ? new List(capacity.Value) : new List(); var start = 0; var inQuotes = false; char quoteChar = '\0'; diff --git a/Csv/CsvReader.cs b/Csv/CsvReader.cs index 0f8612d..9407e5b 100644 --- a/Csv/CsvReader.cs +++ b/Csv/CsvReader.cs @@ -736,9 +736,9 @@ private static void InitializeOptions(SpanText line, CsvOptions options) options.Splitter = CsvLineSplitter.Get(options); } - private static IList SplitLine(MemoryText line, CsvOptions options) + private static IList SplitLine(MemoryText line, CsvOptions options, int? capacity = null) { - return options.Splitter.Split(line, options); + return options.Splitter.Split(line, options, capacity); } private static MemoryText[] Trim(IList line, CsvOptions options) @@ -883,9 +883,9 @@ internal IList RawSplitLine get { #if NET8_0_OR_GREATER - rawSplitLine ??= SplitLine(Raw.AsMemory(), options); + rawSplitLine ??= SplitLine(Raw.AsMemory(), options, headers?.Length); #else - rawSplitLine ??= SplitLine(Raw, options); + rawSplitLine ??= SplitLine(Raw, options, headers?.Length); #endif return rawSplitLine; } @@ -982,7 +982,7 @@ public bool LineHasColumn(string name) return RawSplitLine.Count > index; } - internal IList RawSplitLine => rawSplitLine ??= SplitLine(Raw.AsMemory(), options); + internal IList RawSplitLine => rawSplitLine ??= SplitLine(Raw.AsMemory(), options, headers?.Length); public string[] Values => Line.Select(it => it.AsString()).ToArray(); public ReadOnlyMemory[] ValuesMemory => Line; @@ -1126,7 +1126,7 @@ public bool LineHasColumn(string name) return RawSplitLine.Count > index; } - internal IList> RawSplitLine => rawSplitLine ??= SplitLineOptimized(rawMemory, options, memoryOptions); + internal IList> RawSplitLine => rawSplitLine ??= SplitLineOptimized(rawMemory, options, memoryOptions, headers?.Length); public string[] Values => Line.Select(v => v.ToString()).ToArray(); public ReadOnlyMemory[] ValuesMemory => Line; @@ -1229,10 +1229,10 @@ public bool TryGetSpan(int index, out ReadOnlySpan value) public override string ToString() => Raw; } - private static IList> SplitLineOptimized(ReadOnlyMemory line, CsvOptions options, CsvMemoryOptions memoryOptions) + private static IList> SplitLineOptimized(ReadOnlyMemory line, CsvOptions options, CsvMemoryOptions memoryOptions, int? capacity = null) { var splitter = CsvLineSplitter.Get(options); - return splitter.Split(line, options); + return splitter.Split(line, options, capacity); } private static ReadOnlyMemory[] TrimOptimized(IList> line, CsvOptions options, CsvMemoryOptions memoryOptions)