From 57b82cf10db0d127b3c5ea42f2e2090fc7af9b45 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 26 Aug 2025 15:16:06 -0400 Subject: [PATCH] fix: Use IDictionary.GetEnumerator explicitly to iterate keyvals We really need to replace these old non-generic collections with generic ones. BlueRow's IDictionaryEnumerator implementation iterates over values when passed to a foreach loop, not key value pairs. --- .../DataStreamCore/BlueData/BlueRow.cs | 11 +++++++++-- .../Collections/GenericDictionaryWrapper.cs | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/BlueRow.cs b/src/DataStreamSuite/DataStreamCore/BlueData/BlueRow.cs index 98b89e377..2a1c06084 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/BlueRow.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/BlueRow.cs @@ -88,9 +88,16 @@ namespace BCG public BlueRow(IBlueTableSchema schema, IDictionary row) { myInit(schema); - foreach (DictionaryEntry de in row) - if (mySchema[de.Key as string] != null) + // Use GetEnumerator instead of a foreach loop because the latter calls + // '((IEnumerator)row).GetEnumerator()', which iterates over values + // instead of key value pairs. + var en = row.GetEnumerator(); + while (en.MoveNext()) { + var de = en.Entry; + if (mySchema[de.Key as string] is not null) { myValues[mySchema[de.Key as string].colNo] = de.Value; + } + } } /// diff --git a/src/client/spark_core/Collections/GenericDictionaryWrapper.cs b/src/client/spark_core/Collections/GenericDictionaryWrapper.cs index 684de3691..9b39c42fb 100644 --- a/src/client/spark_core/Collections/GenericDictionaryWrapper.cs +++ b/src/client/spark_core/Collections/GenericDictionaryWrapper.cs @@ -65,7 +65,9 @@ namespace Spark.Core.Collections { } public IEnumerator> GetEnumerator() { - foreach (DictionaryEntry kv in source) { + var en = source.GetEnumerator(); + while (en.MoveNext()) { + var kv = en.Entry; yield return new(castKey(kv.Key), castValue(kv.Value)); } }