Skip to content
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

By reference string comparison in template cache #1947

Merged
merged 2 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 44 additions & 0 deletions src/Serilog/Core/Pipeline/ByReferenceStringComparer.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Copyright 2013-2015 Serilog Contributors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

namespace Serilog.Core.Pipeline;

class ByReferenceStringComparer : IEqualityComparer, IEqualityComparer<string>
{
public static readonly ByReferenceStringComparer Instance = new();

ByReferenceStringComparer()
{
}

public new bool Equals(object? x, object? y)
{
return ReferenceEquals(x, y);
}

public int GetHashCode(object obj)
{
return RuntimeHelpers.GetHashCode(obj);
}

public bool Equals(string? x, string? y)
{
return ReferenceEquals(x, y);
}

public int GetHashCode(string obj)
{
return GetHashCode((object) obj);
}
}
2 changes: 1 addition & 1 deletion src/Serilog/Core/Pipeline/MessageTemplateCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class MessageTemplateCache : IMessageTemplateParser
// https://learn.microsoft.com/en-us/dotnet/api/system.collections.generic.dictionary-2#thread-safety
//
// Hence the reason to use Hashtable, otherwise read operation should have been placed into the lock section
readonly Hashtable _templates = new();
readonly Hashtable _templates = new(ByReferenceStringComparer.Instance);
const int MaxCacheItems = 1000;
const int MaxCachedTemplateLength = 1024;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class ConcurrentDictionaryMessageTemplateCache : IMessageTemplateParser
{
readonly IMessageTemplateParser _innerParser;

readonly ConcurrentDictionary<string, MessageTemplate> _templates = new();
readonly ConcurrentDictionary<string, MessageTemplate> _templates = new(ByReferenceStringComparer.Instance);

const int MaxCacheItems = 1000;
const int MaxCachedTemplateLength = 1024;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class DictionaryMessageTemplateCache : IMessageTemplateParser
readonly IMessageTemplateParser _innerParser;
readonly object _templatesLock = new();

readonly Dictionary<string, MessageTemplate> _templates = new();
readonly Dictionary<string, MessageTemplate> _templates = new(ByReferenceStringComparer.Instance);

const int MaxCacheItems = 1000;
const int MaxCachedTemplateLength = 1024;
Expand Down