Add OrderedDictionary by stephentoub · Pull Request #103309 · dotnet/runtime

stephentoub · 2024-06-11T19:59:31Z

ghost · 2024-06-11T19:59:36Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2024-06-11T19:59:37Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

kronic · 2024-06-12T08:36:00Z

@stephentoub @terrajobst
Maybe it's worth adding more methods

publicvoidMove(intoldIndex,intnewIndex);publicvoidStort(IComparer<TValue>comparer);

eiriktsarpalis · 2024-06-12T09:31:56Z

Adding some kind of sorting functionality would be useful, but ideally that should be solved for IList in general, cf. #76375

This rewrites the core of the type to be based on a custom data structure rather than wrapping Dictionary and List. The core structure is based on both Dictionary in corelib and the OrderedDictionary prototype in corefxlab. This also adds missing TryAdd, Capacity, EnsureCapacity, and TrimExcess members for parity with Dictionary, and fixes debugger views for the Key/ValueCollections.

stephentoub · 2024-06-13T04:54:55Z

@eiriktsarpalis, please take another look when you get a chance. I redid the guts based on the feedback to prioritize enumeration. It's based on a combination of approaches taken by Dictionary<> and by the corefxlab OrderedDictionary<>.

stephentoub · 2024-06-14T03:08:09Z

/ba-g all failures are known

AndreyAkinshin · 2024-06-14T08:27:24Z

@stephentoub Thank you very much for doing this! It's fantastic that we can finally use generic OrderedDirectiory out of the box without using 3rd-party NuGet packages or implementing it from scratch.

eiriktsarpalis · 2024-06-14T12:10:33Z

+ // to record the newly updated indices.
+ for (i = _count - 1; i >= index; --i)
+ {
+ entries[i + 1] = entries[i];


Is there a chance we could perf improvement if the shifting of the entries array used block copying?

Possibly. But we still need to walk the entries individually to fix up the chains. We can more easily experiment with it once it's in a daily.

stephentoub · 2024-06-11T19:59:31Z

Closes#24826

ghost · 2024-06-11T19:59:36Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2024-06-11T19:59:37Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

kronic · 2024-06-12T08:36:00Z

@stephentoub @terrajobst
Maybe it's worth adding more methods

publicvoidMove(intoldIndex,intnewIndex);publicvoidStort(IComparer<TValue>comparer);

eiriktsarpalis · 2024-06-12T09:31:56Z

Adding some kind of sorting functionality would be useful, but ideally that should be solved for IList in general, cf. #76375

This rewrites the core of the type to be based on a custom data structure rather than wrapping Dictionary and List. The core structure is based on both Dictionary in corelib and the OrderedDictionary prototype in corefxlab. This also adds missing TryAdd, Capacity, EnsureCapacity, and TrimExcess members for parity with Dictionary, and fixes debugger views for the Key/ValueCollections.

stephentoub · 2024-06-13T04:54:55Z

@eiriktsarpalis, please take another look when you get a chance. I redid the guts based on the feedback to prioritize enumeration. It's based on a combination of approaches taken by Dictionary<> and by the corefxlab OrderedDictionary<>.

stephentoub · 2024-06-14T03:08:09Z

/ba-g all failures are known

AndreyAkinshin · 2024-06-14T08:27:24Z

@stephentoub Thank you very much for doing this! It's fantastic that we can finally use generic OrderedDirectiory out of the box without using 3rd-party NuGet packages or implementing it from scratch.

eiriktsarpalis · 2024-06-14T12:10:33Z

+ // to record the newly updated indices.
+ for (i = _count - 1; i >= index; --i)
+ {
+ entries[i + 1] = entries[i];


Is there a chance we could perf improvement if the shifting of the entries array used block copying?

Possibly. But we still need to walk the entries individually to fix up the chains. We can more easily experiment with it once it's in a daily.

stephentoub · 2024-06-11T19:59:31Z

Closes#24826

ghost · 2024-06-11T19:59:36Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2024-06-11T19:59:37Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

kronic · 2024-06-12T08:36:00Z

@stephentoub @terrajobst
Maybe it's worth adding more methods

publicvoidMove(intoldIndex,intnewIndex);publicvoidStort(IComparer<TValue>comparer);

eiriktsarpalis · 2024-06-12T09:31:56Z

Adding some kind of sorting functionality would be useful, but ideally that should be solved for IList in general, cf. #76375

This rewrites the core of the type to be based on a custom data structure rather than wrapping Dictionary and List. The core structure is based on both Dictionary in corelib and the OrderedDictionary prototype in corefxlab. This also adds missing TryAdd, Capacity, EnsureCapacity, and TrimExcess members for parity with Dictionary, and fixes debugger views for the Key/ValueCollections.

stephentoub · 2024-06-13T04:54:55Z

@eiriktsarpalis, please take another look when you get a chance. I redid the guts based on the feedback to prioritize enumeration. It's based on a combination of approaches taken by Dictionary<> and by the corefxlab OrderedDictionary<>.

stephentoub · 2024-06-14T03:08:09Z

/ba-g all failures are known

AndreyAkinshin · 2024-06-14T08:27:24Z

@stephentoub Thank you very much for doing this! It's fantastic that we can finally use generic OrderedDirectiory out of the box without using 3rd-party NuGet packages or implementing it from scratch.

eiriktsarpalis · 2024-06-14T12:10:33Z

+ // to record the newly updated indices.
+ for (i = _count - 1; i >= index; --i)
+ {
+ entries[i + 1] = entries[i];


Is there a chance we could perf improvement if the shifting of the entries array used block copying?

Possibly. But we still need to walk the entries individually to fix up the chains. We can more easily experiment with it once it's in a daily.

stephentoub · 2024-06-11T19:59:31Z

Closes#24826

ghost · 2024-06-11T19:59:36Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2024-06-11T19:59:37Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

kronic · 2024-06-12T08:36:00Z

@stephentoub @terrajobst
Maybe it's worth adding more methods

publicvoidMove(intoldIndex,intnewIndex);publicvoidStort(IComparer<TValue>comparer);

eiriktsarpalis · 2024-06-12T09:31:56Z

Adding some kind of sorting functionality would be useful, but ideally that should be solved for IList in general, cf. #76375

This rewrites the core of the type to be based on a custom data structure rather than wrapping Dictionary and List. The core structure is based on both Dictionary in corelib and the OrderedDictionary prototype in corefxlab. This also adds missing TryAdd, Capacity, EnsureCapacity, and TrimExcess members for parity with Dictionary, and fixes debugger views for the Key/ValueCollections.

stephentoub · 2024-06-13T04:54:55Z

@eiriktsarpalis, please take another look when you get a chance. I redid the guts based on the feedback to prioritize enumeration. It's based on a combination of approaches taken by Dictionary<> and by the corefxlab OrderedDictionary<>.

stephentoub · 2024-06-14T03:08:09Z

/ba-g all failures are known

AndreyAkinshin · 2024-06-14T08:27:24Z

@stephentoub Thank you very much for doing this! It's fantastic that we can finally use generic OrderedDirectiory out of the box without using 3rd-party NuGet packages or implementing it from scratch.

eiriktsarpalis · 2024-06-14T12:10:33Z

+ // to record the newly updated indices.
+ for (i = _count - 1; i >= index; --i)
+ {
+ entries[i + 1] = entries[i];


Is there a chance we could perf improvement if the shifting of the entries array used block copying?

Possibly. But we still need to walk the entries individually to fix up the chains. We can more easily experiment with it once it's in a daily.

stephentoub · 2024-06-11T19:59:31Z

Closes#24826

ghost · 2024-06-11T19:59:36Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2024-06-11T19:59:37Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

kronic · 2024-06-12T08:36:00Z

@stephentoub @terrajobst
Maybe it's worth adding more methods

publicvoidMove(intoldIndex,intnewIndex);publicvoidStort(IComparer<TValue>comparer);

eiriktsarpalis · 2024-06-12T09:31:56Z

Adding some kind of sorting functionality would be useful, but ideally that should be solved for IList in general, cf. #76375

This rewrites the core of the type to be based on a custom data structure rather than wrapping Dictionary and List. The core structure is based on both Dictionary in corelib and the OrderedDictionary prototype in corefxlab. This also adds missing TryAdd, Capacity, EnsureCapacity, and TrimExcess members for parity with Dictionary, and fixes debugger views for the Key/ValueCollections.

stephentoub · 2024-06-13T04:54:55Z

@eiriktsarpalis, please take another look when you get a chance. I redid the guts based on the feedback to prioritize enumeration. It's based on a combination of approaches taken by Dictionary<> and by the corefxlab OrderedDictionary<>.

stephentoub · 2024-06-14T03:08:09Z

/ba-g all failures are known

AndreyAkinshin · 2024-06-14T08:27:24Z

@stephentoub Thank you very much for doing this! It's fantastic that we can finally use generic OrderedDirectiory out of the box without using 3rd-party NuGet packages or implementing it from scratch.

eiriktsarpalis · 2024-06-14T12:10:33Z

+ // to record the newly updated indices.
+ for (i = _count - 1; i >= index; --i)
+ {
+ entries[i + 1] = entries[i];


Is there a chance we could perf improvement if the shifting of the entries array used block copying?

Possibly. But we still need to walk the entries individually to fix up the chains. We can more easily experiment with it once it's in a daily.

stephentoub · 2024-06-11T19:59:31Z

Closes#24826

ghost · 2024-06-11T19:59:36Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2024-06-11T19:59:37Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

kronic · 2024-06-12T08:36:00Z

@stephentoub @terrajobst
Maybe it's worth adding more methods

publicvoidMove(intoldIndex,intnewIndex);publicvoidStort(IComparer<TValue>comparer);

eiriktsarpalis · 2024-06-12T09:31:56Z

Adding some kind of sorting functionality would be useful, but ideally that should be solved for IList in general, cf. #76375

This rewrites the core of the type to be based on a custom data structure rather than wrapping Dictionary and List. The core structure is based on both Dictionary in corelib and the OrderedDictionary prototype in corefxlab. This also adds missing TryAdd, Capacity, EnsureCapacity, and TrimExcess members for parity with Dictionary, and fixes debugger views for the Key/ValueCollections.

stephentoub · 2024-06-13T04:54:55Z

@eiriktsarpalis, please take another look when you get a chance. I redid the guts based on the feedback to prioritize enumeration. It's based on a combination of approaches taken by Dictionary<> and by the corefxlab OrderedDictionary<>.

stephentoub · 2024-06-14T03:08:09Z

/ba-g all failures are known

AndreyAkinshin · 2024-06-14T08:27:24Z

@stephentoub Thank you very much for doing this! It's fantastic that we can finally use generic OrderedDirectiory out of the box without using 3rd-party NuGet packages or implementing it from scratch.

eiriktsarpalis · 2024-06-14T12:10:33Z

+ // to record the newly updated indices.
+ for (i = _count - 1; i >= index; --i)
+ {
+ entries[i + 1] = entries[i];


Is there a chance we could perf improvement if the shifting of the entries array used block copying?

Possibly. But we still need to walk the entries individually to fix up the chains. We can more easily experiment with it once it's in a daily.

stephentoub · 2024-06-11T19:59:31Z

Closes#24826

ghost · 2024-06-11T19:59:36Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2024-06-11T19:59:37Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

kronic · 2024-06-12T08:36:00Z

@stephentoub @terrajobst
Maybe it's worth adding more methods

publicvoidMove(intoldIndex,intnewIndex);publicvoidStort(IComparer<TValue>comparer);

eiriktsarpalis · 2024-06-12T09:31:56Z

Adding some kind of sorting functionality would be useful, but ideally that should be solved for IList in general, cf. #76375

This rewrites the core of the type to be based on a custom data structure rather than wrapping Dictionary and List. The core structure is based on both Dictionary in corelib and the OrderedDictionary prototype in corefxlab. This also adds missing TryAdd, Capacity, EnsureCapacity, and TrimExcess members for parity with Dictionary, and fixes debugger views for the Key/ValueCollections.

stephentoub · 2024-06-13T04:54:55Z

@eiriktsarpalis, please take another look when you get a chance. I redid the guts based on the feedback to prioritize enumeration. It's based on a combination of approaches taken by Dictionary<> and by the corefxlab OrderedDictionary<>.

stephentoub · 2024-06-14T03:08:09Z

/ba-g all failures are known

AndreyAkinshin · 2024-06-14T08:27:24Z

@stephentoub Thank you very much for doing this! It's fantastic that we can finally use generic OrderedDirectiory out of the box without using 3rd-party NuGet packages or implementing it from scratch.

eiriktsarpalis · 2024-06-14T12:10:33Z

+ // to record the newly updated indices.
+ for (i = _count - 1; i >= index; --i)
+ {
+ entries[i + 1] = entries[i];


Is there a chance we could perf improvement if the shifting of the entries array used block copying?

Possibly. But we still need to walk the entries individually to fix up the chains. We can more easily experiment with it once it's in a daily.

stephentoub · 2024-06-11T19:59:31Z

Closes#24826

ghost · 2024-06-11T19:59:36Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

ghost · 2024-06-11T19:59:37Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

kronic · 2024-06-12T08:36:00Z

@stephentoub @terrajobst
Maybe it's worth adding more methods

publicvoidMove(intoldIndex,intnewIndex);publicvoidStort(IComparer<TValue>comparer);

eiriktsarpalis · 2024-06-12T09:31:56Z

Adding some kind of sorting functionality would be useful, but ideally that should be solved for IList in general, cf. #76375

This rewrites the core of the type to be based on a custom data structure rather than wrapping Dictionary and List. The core structure is based on both Dictionary in corelib and the OrderedDictionary prototype in corefxlab. This also adds missing TryAdd, Capacity, EnsureCapacity, and TrimExcess members for parity with Dictionary, and fixes debugger views for the Key/ValueCollections.

stephentoub · 2024-06-13T04:54:55Z

@eiriktsarpalis, please take another look when you get a chance. I redid the guts based on the feedback to prioritize enumeration. It's based on a combination of approaches taken by Dictionary<> and by the corefxlab OrderedDictionary<>.

stephentoub · 2024-06-14T03:08:09Z

/ba-g all failures are known

AndreyAkinshin · 2024-06-14T08:27:24Z

@stephentoub Thank you very much for doing this! It's fantastic that we can finally use generic OrderedDirectiory out of the box without using 3rd-party NuGet packages or implementing it from scratch.

eiriktsarpalis · 2024-06-14T12:10:33Z

+ // to record the newly updated indices.
+ for (i = _count - 1; i >= index; --i)
+ {
+ entries[i + 1] = entries[i];


Is there a chance we could perf improvement if the shifting of the entries array used block copying?

Possibly. But we still need to walk the entries individually to fix up the chains. We can more easily experiment with it once it's in a daily.

stephentoub requested a review from eiriktsarpalis June 11, 2024 19:59

ghost added area-System.Collections new-api-needs-documentation labels Jun 11, 2024

dotnet-policy-serviceBot assigned stephentoub Jun 11, 2024

This was referenced Jun 12, 2024
The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008
Open
Wasm test failure: System addon update list error SyntaxError: XMLHttpRequest.open #102955
Closed
[browser][ST] Wasm tests timeout #103246
Closed

eiriktsarpalis reviewed Jun 12, 2024
View reviewed changes

Comment threadsrc/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs Outdated

eiriktsarpalis reviewed Jun 12, 2024
View reviewed changes

Comment threadsrc/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs Outdated

eiriktsarpalis reviewed Jun 12, 2024
View reviewed changes

Comment threadsrc/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs

TylerBrinkley reviewed Jun 12, 2024
View reviewed changes

Comment threadsrc/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs Outdated

eiriktsarpalis reviewed Jun 12, 2024
View reviewed changes

Comment threadsrc/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs Outdated

eiriktsarpalis reviewed Jun 12, 2024
View reviewed changes

Comment threadsrc/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs Outdated

stephentoub added 2 commits June 13, 2024 00:50

Add OrderedDictionary
a3f12a1

stephentoub force-pushed the ordereddictionary branch from e7e543c to a4dca87Compare June 13, 2024 04:52

This was referenced Jun 13, 2024
[browser][MT] System.Net.Http.Functional.Tests.WorkItemExecution timeout #102385
Closed
[browser][MT] Tests timed out #102559
Closed

TylerBrinkley reviewed Jun 13, 2024
View reviewed changes

Comment threadsrc/libraries/System.Collections/src/System/Collections/Generic/OrderedDictionary.cs

eiriktsarpalis reviewed Jun 13, 2024
View reviewed changes