Skip to content

Commit bf2d510

Browse files
jevgenijspjevgenijsp
authored
Merge pull request #133 from Geta/feature/add-content-url-history-index
Add content URL history hash index
2 parents 9529c5b + dd04d60 commit bf2d510

File tree

5 files changed

+87
-20
lines changed

5 files changed

+87
-20
lines changed

‎src/Geta.NotFoundHandler.Optimizely/Data/SqlContentUrlHistoryRepository.cs‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
using Geta.NotFoundHandler.Optimizely.Core.AutomaticRedirects;
1010
using Newtonsoft.Json;
1111
using Newtonsoft.Json.Converters;
12+
using System.Security.Cryptography;
13+
using System.Text;
1214

1315
namespace Geta.NotFoundHandler.Optimizely.Data
1416
{
1517
public class SqlContentUrlHistoryRepository : IRepository<ContentUrlHistory>, IContentUrlHistoryLoader
1618
{
1719
private const string ContentUrlHistoryTable = "[dbo].[NotFoundHandler.ContentUrlHistory]";
18-
private const string AllFields = "Id, ContentKey, Urls, CreatedUtc";
20+
private const string AllFields = "Id, ContentKey, Urls, CreatedUtc, md5_ContentKey";
1921
private readonly IDataExecutor _dataExecutor;
2022

2123
public SqlContentUrlHistoryRepository(IDataExecutor dataExecutor)
@@ -35,33 +37,46 @@ private static JsonSerializerSettings JsonSettings
3537
return settings;
3638
}
3739
}
40+
41+
private static byte[] CalculateMd5Hash(string input)
42+
{
43+
using var md5 = MD5.Create();
44+
var inputBytes = Encoding.Unicode.GetBytes(input);
45+
var hashBytes = md5.ComputeHash(inputBytes);
46+
47+
return hashBytes;
48+
}
3849

3950
public bool IsRegistered(ContentUrlHistory entity)
4051
{
4152
var sqlCommand = $@"SELECT TOP 1 {AllFields}
4253
FROM {ContentUrlHistoryTable}
43-
WHERE ContentKey = @contentKey
54+
WHERE ContentKey = @contentKey AND md5_ContentKey = @contentKeyHash
4455
ORDER BY CreatedUtc DESC";
4556

4657
var dataTable = _dataExecutor.ExecuteQuery(
4758
sqlCommand,
48-
_dataExecutor.CreateStringParameter("contentKey", entity.ContentKey));
59+
_dataExecutor.CreateStringParameter("contentKey", entity.ContentKey),
60+
_dataExecutor.CreateBinaryParameter("contentKeyHash", CalculateMd5Hash(entity.ContentKey))
61+
);
4962

5063
var last = ToContentUrlHistory(dataTable).FirstOrDefault();
5164

52-
return last != null && last.Urls.Count == entity.Urls.Count && last.Urls.All(entity.Urls.Contains);
65+
var result = last != null && last.Urls.Count == entity.Urls.Count && last.Urls.All(entity.Urls.Contains);
66+
67+
return result;
5368
}
5469

5570
public IEnumerable<(string contentKey, IReadOnlyCollection<ContentUrlHistory> histories)> GetAllMoved()
5671
{
57-
var sqlCommand = $@"SELECT h.Id, h.ContentKey, h.Urls, h.CreatedUtc
72+
var sqlCommand = $@"SELECT h.Id, h.ContentKey, h.Urls, h.CreatedUtc, h.md5_ContentKey
5873
FROM {ContentUrlHistoryTable} h
5974
INNER JOIN
60-
(SELECT ContentKey
75+
(SELECT ContentKey, md5_ContentKey
6176
FROM {ContentUrlHistoryTable}
62-
GROUP BY ContentKey
77+
GROUP BY ContentKey, md5_ContentKey
6378
HAVING COUNT(*) > 1) k
64-
ON h.ContentKey = k.ContentKey
79+
ON h.ContentKey = k.ContentKey AND h.md5_ContentKey = k.md5_ContentKey
6580
ORDER BY h.ContentKey, h.CreatedUtc DESC";
6681

6782
var dataTable = _dataExecutor.ExecuteQuery(sqlCommand);
@@ -73,18 +88,24 @@ HAVING COUNT(*) > 1) k
7388

7489
public IReadOnlyCollection<ContentUrlHistory> GetMoved(string contentKey)
7590
{
76-
var sqlCommand = $@"SELECT h.Id, h.ContentKey, h.Urls, h.CreatedUtc
91+
var contentKeyHash = CalculateMd5Hash(contentKey);
92+
93+
var sqlCommand = $@"SELECT h.Id, h.ContentKey, h.Urls, h.CreatedUtc, h.md5_ContentKey
7794
FROM {ContentUrlHistoryTable} h
7895
INNER JOIN
7996
(SELECT ContentKey
8097
FROM {ContentUrlHistoryTable}
98+
WHERE md5_ContentKey = @contentKeyHash
8199
GROUP BY ContentKey
82100
HAVING COUNT(*) > 1) k
83101
ON h.ContentKey = k.ContentKey
84-
WHERE h.ContentKey = @contentKey
102+
WHERE h.ContentKey = @contentKey AND h.md5_ContentKey = @contentKeyHash
85103
ORDER BY h.ContentKey, h.CreatedUtc DESC";
86104

87-
var dataTable = _dataExecutor.ExecuteQuery(sqlCommand, _dataExecutor.CreateStringParameter("contentKey", contentKey));
105+
var dataTable = _dataExecutor.ExecuteQuery(sqlCommand,
106+
_dataExecutor.CreateStringParameter("contentKey", contentKey),
107+
_dataExecutor.CreateBinaryParameter("contentKeyHash", contentKeyHash)
108+
);
88109

89110
var histories = ToContentUrlHistory(dataTable);
90111

@@ -124,7 +145,8 @@ private void Create(ContentUrlHistory entity)
124145
_dataExecutor.CreateGuidParameter("id", entity.Id),
125146
_dataExecutor.CreateStringParameter("contentKey", entity.ContentKey),
126147
_dataExecutor.CreateStringParameter("urls", ToJson(entity.Urls), -1),
127-
_dataExecutor.CreateDateTimeParameter("createdUtc", entity.CreatedUtc));
148+
_dataExecutor.CreateDateTimeParameter("createdUtc", entity.CreatedUtc)
149+
);
128150
}
129151

130152
private void Update(ContentUrlHistory entity)
@@ -145,7 +167,8 @@ private void Update(ContentUrlHistory entity)
145167
_dataExecutor.CreateGuidParameter("id", entity.Id),
146168
_dataExecutor.CreateStringParameter("contentKey", entity.ContentKey),
147169
_dataExecutor.CreateStringParameter("urls", ToJson(entity.Urls), -1),
148-
_dataExecutor.CreateDateTimeParameter("createdUtc", entity.CreatedUtc));
170+
_dataExecutor.CreateDateTimeParameter("createdUtc", entity.CreatedUtc)
171+
);
149172
}
150173

151174
private static string ToJson(ICollection<TypedUrl> urls)

‎src/Geta.NotFoundHandler.Optimizely/Infrastructure/Configuration/OptimizelyNotFoundHandlerOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Geta.NotFoundHandler.Optimizely.Infrastructure.Configuration
1010
{
1111
public class OptimizelyNotFoundHandlerOptions
1212
{
13-
public const int CurrentDbVersion = 1;
13+
public const int CurrentDbVersion = 2;
1414

1515
public bool AutomaticRedirectsEnabled { get; set; }
1616
public RedirectType AutomaticRedirectType { get; set; } = RedirectType.Temporary;

‎src/Geta.NotFoundHandler.Optimizely/Infrastructure/Initialization/Upgrader.cs‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under Apache-2.0. See the LICENSE file in the project root for more information
33

44
using Geta.NotFoundHandler.Data;
5-
using Geta.NotFoundHandler.Infrastructure.Configuration;
65
using Geta.NotFoundHandler.Optimizely.Infrastructure.Configuration;
76
using Microsoft.Extensions.Logging;
87

@@ -50,9 +49,14 @@ public void Start()
5049
/// </summary>
5150
private void Create()
5251
{
53-
var created = CreateContentUrlHistoryTable();
52+
var result = CreateContentUrlHistoryTable();
5453

55-
if (created)
54+
if (result)
55+
{
56+
result = CreateContentKeyMd5Column();
57+
}
58+
59+
if (result)
5660
{
5761
CreateVersionNumberSp();
5862
}
@@ -76,14 +80,19 @@ CONSTRAINT [PK_ContentUrlHistory] PRIMARY KEY CLUSTERED ([Id] ASC) ON [PRIMARY]
7680

7781
private void Upgrade()
7882
{
79-
UpdateVersionNumber();
83+
var result = CreateContentKeyMd5Column();
84+
85+
if (result)
86+
{
87+
UpdateVersionNumber();
88+
}
8089
}
8190

8291
private void CreateVersionNumberSp()
8392
{
8493
_logger.LogInformation("Create Optimizely NotFoundHandler version SP START");
8594
var versionSp =
86-
$@"CREATE PROCEDURE {VersionProcedure} AS RETURN {NotFoundHandlerOptions.CurrentDbVersion}";
95+
$@"CREATE PROCEDURE {VersionProcedure} AS RETURN {OptimizelyNotFoundHandlerOptions.CurrentDbVersion}";
8796

8897
var created = _dataExecutor.ExecuteNonQuery(versionSp);
8998

@@ -105,8 +114,35 @@ private int GetVersionNumber()
105114
private void UpdateVersionNumber()
106115
{
107116
var versionSp =
108-
$@"ALTER PROCEDURE {VersionProcedure} AS RETURN {NotFoundHandlerOptions.CurrentDbVersion}";
117+
$@"ALTER PROCEDURE {VersionProcedure} AS RETURN {OptimizelyNotFoundHandlerOptions.CurrentDbVersion}";
109118
_dataExecutor.ExecuteNonQuery(versionSp);
110119
}
120+
121+
private bool CreateContentKeyMd5Column()
122+
{
123+
var command = $@"
124+
BEGIN TRY
125+
BEGIN TRANSACTION;
126+
IF NOT EXISTS (
127+
SELECT 1
128+
FROM sys.columns
129+
WHERE object_id = OBJECT_ID('{ContentUrlHistoryTable}')
130+
AND name = 'md5_ContentKey'
131+
)
132+
BEGIN
133+
ALTER TABLE {ContentUrlHistoryTable} ADD md5_ContentKey AS HASHBYTES('MD5', [ContentKey]);
134+
CREATE INDEX PContentKey_index ON {ContentUrlHistoryTable} (md5_ContentKey);
135+
END
136+
137+
COMMIT TRANSACTION;
138+
END TRY
139+
BEGIN CATCH
140+
ROLLBACK TRANSACTION;
141+
THROW;
142+
END CATCH;
143+
";
144+
145+
return _dataExecutor.ExecuteNonQuery(command);
146+
}
111147
}
112148
}

‎src/Geta.NotFoundHandler/Data/IDataExecutor.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ public interface IDataExecutor
2020
DbParameter CreateIntParameter(string name, int value);
2121
DbParameter CreateBoolParameter(string name, bool value);
2222
DbParameter CreateDateTimeParameter(string name, DateTime value);
23+
DbParameter CreateBinaryParameter(string name, byte[] value, int size = 8000);
2324
}
2425
}

‎src/Geta.NotFoundHandler/Data/SqlDataExecutor.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,13 @@ public DbParameter CreateDateTimeParameter(string name, DateTime value)
183183
return parameter;
184184
}
185185

186+
public DbParameter CreateBinaryParameter(string name, byte[] value, int size = 8000)
187+
{
188+
var parameter = CreateParameter(name, DbType.Binary, size);
189+
parameter.Value = value;
190+
return parameter;
191+
}
192+
186193
private static SqlParameter CreateReturnParameter()
187194
{
188195
var parameter = new SqlParameter

0 commit comments

Comments
 (0)