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.
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
Fix concurrency issues and double lookups in SkillCollection #603
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
.NET
Issue or Pull requests regarding .NET code
kernel.core
labels
Apr 23, 2023
shawncal
reviewed
Apr 23, 2023
5 tasks
If multiple threads concurrently call AddSemantic/NativeFunction, and the skill in question didn't yet exist, both threads could try to add a new collection for that skill. But they're doing so with the indexer, which means one of them could overwrite the one added by the other, which could already have progressed to store the target function into that collection. At that point, data could be lost. By using TryAdd instead of the indexer, we can avoid such overwrites, and by using GetOrAdd, we can simplify the whole pattern. Further, throughout the SkillCollection, there are places where we're looking up into dictionaries twice, first to do a ContainsKey and then subsequently to get the value for that key; better to just use TryGetValue to do the lookup once. There was also duplication between routines for semantic and native functions, which could be collapsed with single helpers.
shawncal
force-pushed
the
skillcollection
branch
from
April 26, 2023 06:08
f448f8a
to
adc4982
Compare
shawncal
previously approved these changes
Apr 26, 2023
LGTM. @dluc do you want to take another look? |
lemillermicrosoft
added
the
PR: ready for review
All feedback addressed, ready for reviews
label
Apr 26, 2023
github-actions
bot
added
the
kernel
Issues or pull requests impacting the core kernel
label
Apr 28, 2023
lemillermicrosoft
approved these changes
May 3, 2023
lemillermicrosoft
added
the
PR: ready to merge
PR has been approved by all reviewers, and is ready to merge.
label
May 3, 2023
shawncal
approved these changes
May 3, 2023
codebrain
pushed a commit
to searchpioneer/semantic-kernel
that referenced
this pull request
May 16, 2023
…ft#603) ### Motivation and Context Fix concurrency issues in SkillCollection and reduce overhead and duplication. ### Description If multiple threads concurrently call AddSemantic/NativeFunction, and the skill in question didn't yet exist, both threads could try to add a new collection for that skill. But they're doing so with the indexer, which means one of them could overwrite the one added by the other, which could already have progressed to store the target function into that collection. At that point, data could be lost. By using TryAdd instead of the indexer, we can avoid such overwrites, and by using GetOrAdd, we can simplify the whole pattern. Further, throughout the SkillCollection, there are places where we're looking up into dictionaries twice, first to do a ContainsKey and then subsequently to get the value for that key; better to just use TryGetValue to do the lookup once. There was also duplication between routines for semantic and native functions, which could be collapsed with single helpers.
dehoward
pushed a commit
to lemillermicrosoft/semantic-kernel
that referenced
this pull request
Jun 1, 2023
…ft#603) ### Motivation and Context Fix concurrency issues in SkillCollection and reduce overhead and duplication. ### Description If multiple threads concurrently call AddSemantic/NativeFunction, and the skill in question didn't yet exist, both threads could try to add a new collection for that skill. But they're doing so with the indexer, which means one of them could overwrite the one added by the other, which could already have progressed to store the target function into that collection. At that point, data could be lost. By using TryAdd instead of the indexer, we can avoid such overwrites, and by using GetOrAdd, we can simplify the whole pattern. Further, throughout the SkillCollection, there are places where we're looking up into dictionaries twice, first to do a ContainsKey and then subsequently to get the value for that key; better to just use TryGetValue to do the lookup once. There was also duplication between routines for semantic and native functions, which could be collapsed with single helpers.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 4, 2023
Bumps [psycopg](https://github.com/psycopg/psycopg) from 3.1.10 to 3.1.12. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/psycopg/psycopg/blob/master/docs/news.rst">psycopg's changelog</a>.</em></p> <blockquote> <p>.. currentmodule:: psycopg</p> <p>.. index:: single: Release notes single: News</p> <h1><code>psycopg</code> release notes</h1> <h2>Future releases</h2> <p>Psycopg 3.2 (unreleased) ^^^^^^^^^^^^^^^^^^^^^^^^</p> <ul> <li>Add support for integer, floating point, boolean <code>NumPy scalar types</code>__ (:ticket:<code>[#332](https://github.com/psycopg/psycopg/issues/332)</code>).</li> <li>Add :ref:<code>raw-query-cursors</code> to execute queries using placeholders in PostgreSQL format (<code>$1</code>, <code>$2</code>...) (🎫<code>[#560](https://github.com/psycopg/psycopg/issues/560)</code>).</li> <li>Add support for libpq functions to close prepared statements and portals introduced in libpq v17 (:ticket:<code>[#603](https://github.com/psycopg/psycopg/issues/603)</code>).</li> <li>Disable receiving more than one result on the same cursor in pipeline mode, to iterate through <code>~Cursor.nextset()</code>. The behaviour was different than in non-pipeline mode and not totally reliable (:ticket:<code>[#604](https://github.com/psycopg/psycopg/issues/604)</code>). The <code>Cursor</code> now only preserves the results set of the last <code>~Cursor.execute()</code>, consistently with non-pipeline mode.</li> </ul> <p>.. __: <a href="https://numpy.org/doc/stable/reference/arrays.scalars.html#built-in-scalar-types">https://numpy.org/doc/stable/reference/arrays.scalars.html#built-in-scalar-types</a></p> <h2>Current release</h2> <p>Psycopg 3.1.12 ^^^^^^^^^^^^^^</p> <ul> <li>Fix possible hanging if a connection is closed while querying (:ticket:<code>[#608](https://github.com/psycopg/psycopg/issues/608)</code>).</li> <li>Fix memory leak when <code>~register_*()</code> functions are called repeatedly (:ticket:<code>[#647](https://github.com/psycopg/psycopg/issues/647)</code>).</li> </ul> <p>Psycopg 3.1.11 ^^^^^^^^^^^^^^</p> <ul> <li>Avoid caching the parsing results of large queries to avoid excessive memory usage (:ticket:<code>[#628](https://github.com/psycopg/psycopg/issues/628)</code>).</li> <li>Fix integer overflow in C/binary extension with OID > 2^31 (:ticket:<code>[#630](https://github.com/psycopg/psycopg/issues/630)</code>).</li> <li>Fix loading of intervals with days and months or years (:ticket:<code>[#643](https://github.com/psycopg/psycopg/issues/643)</code>).</li> <li>Work around excessive CPU usage on Windows (reported in :ticket:<code>[#645](https://github.com/psycopg/psycopg/issues/645)</code>).</li> <li>Fix building on Solaris and derivatives (:ticket:<code>[#632](https://github.com/psycopg/psycopg/issues/632)</code>).</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/psycopg/psycopg/commit/5498bb85c62cbe71da16731e9f25e8727a098c80"><code>5498bb8</code></a> chore: bump psycopg package version to 3.1.12</li> <li><a href="https://github.com/psycopg/psycopg/commit/b4b8ceb32da7f182ba0e3e0e81d692ce604b15cb"><code>b4b8ceb</code></a> Merge branch 'fix-608' into maint-3.1</li> <li><a href="https://github.com/psycopg/psycopg/commit/ae43e63400dc7366dde1e26d689cff69238c7d2c"><code>ae43e63</code></a> fix: use poll() instead of epoll() for waiting</li> <li><a href="https://github.com/psycopg/psycopg/commit/8b564e8f2539e6accaa853ec80636ab0d2d53de1"><code>8b564e8</code></a> fix: don't hang forever if async connection is closed while querying</li> <li><a href="https://github.com/psycopg/psycopg/commit/b3e0be9869257cfa9602608caee4ebe96148f63f"><code>b3e0be9</code></a> fix: don't raise spurious errors on cancel if the connection is closed</li> <li><a href="https://github.com/psycopg/psycopg/commit/125f93c852cf9a0c4158fe45f162b3b420568a8e"><code>125f93c</code></a> ci(scaleway_m1): add list command and jq pretty output</li> <li><a href="https://github.com/psycopg/psycopg/commit/87dc783af3e744fb6dc411794f9efb627b9a7d1e"><code>87dc783</code></a> chore(crdb): test 23.1 in CI</li> <li><a href="https://github.com/psycopg/psycopg/commit/dbddfc5d3f567cb291b6f98868a97de9ec40d153"><code>dbddfc5</code></a> Merge branch 'fix-647' into maint-3.1</li> <li><a href="https://github.com/psycopg/psycopg/commit/4137dedad1e2e9078562bbb1ad5fff1b7ef640ed"><code>4137ded</code></a> fix: cache all dynamically generated adapter types</li> <li><a href="https://github.com/psycopg/psycopg/commit/d7eea4989766ea92b0d7d51559ff11779ff3b872"><code>d7eea49</code></a> fix: cache dynamic adapters created in register_array()</li> <li>Additional commits viewable in <a href="https://github.com/psycopg/psycopg/compare/3.1.10...3.1.12">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=psycopg&package-manager=pip&previous-version=3.1.10&new-version=3.1.12)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
SOE-YoungS
pushed a commit
to SOE-YoungS/semantic-kernel
that referenced
this pull request
Nov 1, 2023
Bumps [psycopg](https://github.com/psycopg/psycopg) from 3.1.10 to 3.1.12. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/psycopg/psycopg/blob/master/docs/news.rst">psycopg's changelog</a>.</em></p> <blockquote> <p>.. currentmodule:: psycopg</p> <p>.. index:: single: Release notes single: News</p> <h1><code>psycopg</code> release notes</h1> <h2>Future releases</h2> <p>Psycopg 3.2 (unreleased) ^^^^^^^^^^^^^^^^^^^^^^^^</p> <ul> <li>Add support for integer, floating point, boolean <code>NumPy scalar types</code>__ (:ticket:<code>[microsoft#332](https://github.com/psycopg/psycopg/issues/332)</code>).</li> <li>Add :ref:<code>raw-query-cursors</code> to execute queries using placeholders in PostgreSQL format (<code>$1</code>, <code>$2</code>...) (🎫<code>[microsoft#560](https://github.com/psycopg/psycopg/issues/560)</code>).</li> <li>Add support for libpq functions to close prepared statements and portals introduced in libpq v17 (:ticket:<code>[microsoft#603](https://github.com/psycopg/psycopg/issues/603)</code>).</li> <li>Disable receiving more than one result on the same cursor in pipeline mode, to iterate through <code>~Cursor.nextset()</code>. The behaviour was different than in non-pipeline mode and not totally reliable (:ticket:<code>[microsoft#604](https://github.com/psycopg/psycopg/issues/604)</code>). The <code>Cursor</code> now only preserves the results set of the last <code>~Cursor.execute()</code>, consistently with non-pipeline mode.</li> </ul> <p>.. __: <a href="https://numpy.org/doc/stable/reference/arrays.scalars.html#built-in-scalar-types">https://numpy.org/doc/stable/reference/arrays.scalars.html#built-in-scalar-types</a></p> <h2>Current release</h2> <p>Psycopg 3.1.12 ^^^^^^^^^^^^^^</p> <ul> <li>Fix possible hanging if a connection is closed while querying (:ticket:<code>[microsoft#608](https://github.com/psycopg/psycopg/issues/608)</code>).</li> <li>Fix memory leak when <code>~register_*()</code> functions are called repeatedly (:ticket:<code>[microsoft#647](https://github.com/psycopg/psycopg/issues/647)</code>).</li> </ul> <p>Psycopg 3.1.11 ^^^^^^^^^^^^^^</p> <ul> <li>Avoid caching the parsing results of large queries to avoid excessive memory usage (:ticket:<code>[microsoft#628](https://github.com/psycopg/psycopg/issues/628)</code>).</li> <li>Fix integer overflow in C/binary extension with OID > 2^31 (:ticket:<code>[microsoft#630](https://github.com/psycopg/psycopg/issues/630)</code>).</li> <li>Fix loading of intervals with days and months or years (:ticket:<code>[microsoft#643](https://github.com/psycopg/psycopg/issues/643)</code>).</li> <li>Work around excessive CPU usage on Windows (reported in :ticket:<code>[microsoft#645](https://github.com/psycopg/psycopg/issues/645)</code>).</li> <li>Fix building on Solaris and derivatives (:ticket:<code>[microsoft#632](https://github.com/psycopg/psycopg/issues/632)</code>).</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/psycopg/psycopg/commit/5498bb85c62cbe71da16731e9f25e8727a098c80"><code>5498bb8</code></a> chore: bump psycopg package version to 3.1.12</li> <li><a href="https://github.com/psycopg/psycopg/commit/b4b8ceb32da7f182ba0e3e0e81d692ce604b15cb"><code>b4b8ceb</code></a> Merge branch 'fix-608' into maint-3.1</li> <li><a href="https://github.com/psycopg/psycopg/commit/ae43e63400dc7366dde1e26d689cff69238c7d2c"><code>ae43e63</code></a> fix: use poll() instead of epoll() for waiting</li> <li><a href="https://github.com/psycopg/psycopg/commit/8b564e8f2539e6accaa853ec80636ab0d2d53de1"><code>8b564e8</code></a> fix: don't hang forever if async connection is closed while querying</li> <li><a href="https://github.com/psycopg/psycopg/commit/b3e0be9869257cfa9602608caee4ebe96148f63f"><code>b3e0be9</code></a> fix: don't raise spurious errors on cancel if the connection is closed</li> <li><a href="https://github.com/psycopg/psycopg/commit/125f93c852cf9a0c4158fe45f162b3b420568a8e"><code>125f93c</code></a> ci(scaleway_m1): add list command and jq pretty output</li> <li><a href="https://github.com/psycopg/psycopg/commit/87dc783af3e744fb6dc411794f9efb627b9a7d1e"><code>87dc783</code></a> chore(crdb): test 23.1 in CI</li> <li><a href="https://github.com/psycopg/psycopg/commit/dbddfc5d3f567cb291b6f98868a97de9ec40d153"><code>dbddfc5</code></a> Merge branch 'fix-647' into maint-3.1</li> <li><a href="https://github.com/psycopg/psycopg/commit/4137dedad1e2e9078562bbb1ad5fff1b7ef640ed"><code>4137ded</code></a> fix: cache all dynamically generated adapter types</li> <li><a href="https://github.com/psycopg/psycopg/commit/d7eea4989766ea92b0d7d51559ff11779ff3b872"><code>d7eea49</code></a> fix: cache dynamic adapters created in register_array()</li> <li>Additional commits viewable in <a href="https://github.com/psycopg/psycopg/compare/3.1.10...3.1.12">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=psycopg&package-manager=pip&previous-version=3.1.10&new-version=3.1.12)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mark Wallace <127216156+markwallace-microsoft@users.noreply.github.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 20, 2024
Bumps [psycopg](https://github.com/psycopg/psycopg) from 3.1.15 to 3.1.18. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/psycopg/psycopg/blob/master/docs/news.rst">psycopg's changelog</a>.</em></p> <blockquote> <p>.. currentmodule:: psycopg</p> <p>.. index:: single: Release notes single: News</p> <h1><code>psycopg</code> release notes</h1> <h2>Future releases</h2> <p>Psycopg 3.2 (unreleased) ^^^^^^^^^^^^^^^^^^^^^^^^</p> <ul> <li>Add support for integer, floating point, boolean <code>NumPy scalar types</code>__ (:ticket:<code>[#332](https://github.com/psycopg/psycopg/issues/332)</code>).</li> <li>Add <code>!timeout</code> and <code>!stop_after</code> parameters to <code>Connection.notifies()</code> (:ticket:<code>340</code>).</li> <li>Add :ref:<code>raw-query-cursors</code> to execute queries using placeholders in PostgreSQL format (<code>$1</code>, <code>$2</code>...) (:ticket:<code>[#560](https://github.com/psycopg/psycopg/issues/560)</code>).</li> <li>Add <code>~rows.scalar_row</code> to return scalar values from a query (:ticket:<code>[#723](https://github.com/psycopg/psycopg/issues/723)</code>).</li> <li>Add <code>~Connection.set_autocommit()</code> on sync connections, and similar transaction control methods available on the async connections.</li> <li>Add support for libpq functions to close prepared statements and portals introduced in libpq v17 (:ticket:<code>[#603](https://github.com/psycopg/psycopg/issues/603)</code>).</li> <li>The <code>!context</code> parameter of <code>sql</code> objects <code>~sql.Composable.as_string()</code> and <code>~sql.Composable.as_bytes()</code> methods is now optional (:ticket:<code>[#716](https://github.com/psycopg/psycopg/issues/716)</code>).</li> <li>Disable receiving more than one result on the same cursor in pipeline mode, to iterate through <code>~Cursor.nextset()</code>. The behaviour was different than in non-pipeline mode and not totally reliable (:ticket:<code>[#604](https://github.com/psycopg/psycopg/issues/604)</code>). The <code>Cursor</code> now only preserves the results set of the last <code>~Cursor.execute()</code>, consistently with non-pipeline mode.</li> </ul> <p>.. __: <a href="https://numpy.org/doc/stable/reference/arrays.scalars.html#built-in-scalar-types">https://numpy.org/doc/stable/reference/arrays.scalars.html#built-in-scalar-types</a></p> <h2>Current release</h2> <p>Psycopg 3.1.18 ^^^^^^^^^^^^^^</p> <ul> <li>Fix possible deadlock on pipeline exit (:ticket:<code>[#685](https://github.com/psycopg/psycopg/issues/685)</code>).</li> <li>Fix overflow loading large intervals in C module (:ticket:<code>[#719](https://github.com/psycopg/psycopg/issues/719)</code>).</li> <li>Fix compatibility with musl libc distributions affected by <code>CPython issue [#65821](https://github.com/psycopg/psycopg/issues/65821)</code>__ (:ticket:<code>[#725](https://github.com/psycopg/psycopg/issues/725)</code>).</li> </ul> <p>.. __: <a href="https://redirect.github.com/python/cpython/issues/65821">python/cpython#65821</a></p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/psycopg/psycopg/commit/8585a23fcd7bcf75193adbc10d3005752ba8f15f"><code>8585a23</code></a> chore: bump psycopg package version to 3.1.18</li> <li><a href="https://github.com/psycopg/psycopg/commit/ab646b70c82aafe6004064a40a3ba358142999a3"><code>ab646b7</code></a> fix(c): drop spurious loop break in pipeline_communicate</li> <li><a href="https://github.com/psycopg/psycopg/commit/bebfe97f934c9136e4db52709ac0fb4dd9cae64d"><code>bebfe97</code></a> chore: bump cibuildwheel version</li> <li><a href="https://github.com/psycopg/psycopg/commit/89394a6f36d42d308a8e672e9b5deef8e76254ae"><code>89394a6</code></a> chore: bump checkout action to v4</li> <li><a href="https://github.com/psycopg/psycopg/commit/ed579e51ca9b44af148e55d345e312f58ce12a6f"><code>ed579e5</code></a> docs: fix tickets format</li> <li><a href="https://github.com/psycopg/psycopg/commit/d4a4e8e1447de3446f614a29a8274ef7c4d03d64"><code>d4a4e8e</code></a> Merge branch 'musl-ctypes' into maint-3.1</li> <li><a href="https://github.com/psycopg/psycopg/commit/8bc51e6812cfaedebdd7afff7c86be301d5fbf66"><code>8bc51e6</code></a> docs: mention musl-ctypes workaround in news file</li> <li><a href="https://github.com/psycopg/psycopg/commit/afb040a800b2667a07dc441e8cdb94e55a0dcf65"><code>afb040a</code></a> fix: add <code>libc.so</code> fallback for musl systems to the ctypes impl</li> <li><a href="https://github.com/psycopg/psycopg/commit/06ef0d92109a63fa1a7630804a3a26af0e0a39c9"><code>06ef0d9</code></a> test: drop ineffective marker on fixture</li> <li><a href="https://github.com/psycopg/psycopg/commit/b955118e523c84f5f702d93fd74288ce51ff61db"><code>b955118</code></a> Merge branch 'fix-interval-overflow' into maint-3.1</li> <li>Additional commits viewable in <a href="https://github.com/psycopg/psycopg/compare/3.1.15...3.1.18">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=psycopg&package-manager=pip&previous-version=3.1.15&new-version=3.1.18)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Eduard van Valkenburg <eavanvalkenburg@users.noreply.github.com> Co-authored-by: Evan Mattson <35585003+moonbox3@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
kernel
Issues or pull requests impacting the core kernel
.NET
Issue or Pull requests regarding .NET code
PR: ready for review
All feedback addressed, ready for reviews
PR: ready to merge
PR has been approved by all reviewers, and is ready to merge.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Fix concurrency issues in SkillCollection and reduce overhead and duplication.
Description
If multiple threads concurrently call AddSemantic/NativeFunction, and the skill in question didn't yet exist, both threads could try to add a new collection for that skill. But they're doing so with the indexer, which means one of them could overwrite the one added by the other, which could already have progressed to store the target function into that collection. At that point, data could be lost. By using TryAdd instead of the indexer, we can avoid such overwrites, and by using GetOrAdd, we can simplify the whole pattern.
Further, throughout the SkillCollection, there are places where we're looking up into dictionaries twice, first to do a ContainsKey and then subsequently to get the value for that key; better to just use TryGetValue to do the lookup once.
There was also duplication between routines for semantic and native functions, which could be collapsed with single helpers.
Contribution Checklist
dotnet format