GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Changed database info cache key · roji/Npgsql@cffa5f5

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • src
    • Npgsql.NetTopologySuite
      • Npgsql - Backup.NetTopologySuite.csproj
      • Npgsql.NetTopologySuite.csproj
    • Npgsql
      • NpgsqlConnector.cs
      • NpgsqlDatabaseInfo.cs
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/Npgsql.NetTopologySuite/Npgsql - Backup.NetTopologySuite.csproj‎

Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<Authors>Yoh Deadfall, Shay Rojansky</Authors>
4+
<Description>NetTopologySuite plugin for Npgsql, allowing mapping of PostGIS geometry types to NetTopologySuite types.</Description>
5+
<PackageTags>npgsql postgresql postgres postgis nts ado ado.net database sql</PackageTags>
6+
<TargetFramework>netstandard2.0</TargetFramework>
7+
<TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net5.0</TargetFramework>
8+
<NoWarn>$(NoWarn);NU5104</NoWarn>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<PackageReference Include="NetTopologySuite.IO.PostGIS" />
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ProjectReference Include="../Npgsql/Npgsql.csproj" />
15+
</ItemGroup>
16+
</Project>
Collapse file

‎src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj‎

Copy file name to clipboardExpand all lines: src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Authors>Yoh Deadfall, Shay Rojansky</Authors>
44
<Description>NetTopologySuite plugin for Npgsql, allowing mapping of PostGIS geometry types to NetTopologySuite types.</Description>
55
<PackageTags>npgsql postgresql postgres postgis nts ado ado.net database sql</PackageTags>
6-
<TargetFramework>netstandard2.0</TargetFramework>
7-
<TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net5.0</TargetFramework>
6+
<TargetFrameworks>net5.0</TargetFrameworks>
7+
<TargetFrameworks Condition="'$(DeveloperBuild)' != 'True'">net461;netstandard2.0</TargetFrameworks>
88
<NoWarn>$(NoWarn);NU5104</NoWarn>
99
</PropertyGroup>
1010
<ItemGroup>
Collapse file

‎src/Npgsql/NpgsqlConnector.cs‎

Copy file name to clipboardExpand all lines: src/Npgsql/NpgsqlConnector.cs
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ internal NpgsqlConnector(NpgsqlConnection connection)
347347

348348
string Host => Settings.Host!;
349349
int Port => Settings.Port;
350+
string Database => Settings.Database!;
350351
string KerberosServiceName => Settings.KerberosServiceName;
351352
SslMode SslMode => Settings.SslMode;
352353
int ConnectionTimeout => Settings.Timeout;
@@ -522,7 +523,8 @@ internal async ValueTask LoadDatabaseInfo(bool forceReload, NpgsqlTimeout timeou
522523
// being set up (even if its empty)
523524
TypeMapper = new ConnectorTypeMapper(this);
524525

525-
if (forceReload || !NpgsqlDatabaseInfo.Cache.TryGetValue(ConnectionString, out var database))
526+
var key = (Host, Port, Database, Settings.ServerCompatibilityMode == ServerCompatibilityMode.NoTypeLoading);
527+
if (forceReload || !NpgsqlDatabaseInfo.Cache.TryGetValue(key, out var database))
526528
{
527529
var hasSemaphore = async
528530
? await DatabaseInfoSemaphore.WaitAsync(timeout.TimeLeft, cancellationToken)
@@ -534,9 +536,9 @@ internal async ValueTask LoadDatabaseInfo(bool forceReload, NpgsqlTimeout timeou
534536

535537
try
536538
{
537-
if (forceReload || !NpgsqlDatabaseInfo.Cache.TryGetValue(ConnectionString, out database))
539+
if (forceReload || !NpgsqlDatabaseInfo.Cache.TryGetValue(key, out database))
538540
{
539-
NpgsqlDatabaseInfo.Cache[ConnectionString] = database = await NpgsqlDatabaseInfo.Load(Connection,
541+
NpgsqlDatabaseInfo.Cache[key] = database = await NpgsqlDatabaseInfo.Load(Connection,
540542
timeout, async);
541543
}
542544
}
Collapse file

‎src/Npgsql/NpgsqlDatabaseInfo.cs‎

Copy file name to clipboardExpand all lines: src/Npgsql/NpgsqlDatabaseInfo.cs
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public abstract class NpgsqlDatabaseInfo
1515
{
1616
#region Fields
1717

18-
internal static readonly ConcurrentDictionary<string, NpgsqlDatabaseInfo> Cache
19-
= new ConcurrentDictionary<string, NpgsqlDatabaseInfo>();
18+
internal static readonly ConcurrentDictionary<(string Host, int Port, string Database, bool NoTypeLoading), NpgsqlDatabaseInfo> Cache
19+
= new ConcurrentDictionary<(string Host, int Port, string Database, bool NoTypeLoading), NpgsqlDatabaseInfo>();
2020

2121
static volatile INpgsqlDatabaseInfoFactory[] Factories = new INpgsqlDatabaseInfoFactory[]
2222
{

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.