lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Optimized performance of DefaultDateFormatter by marking certain static Regex patterns for pre-compilation. Increased the Regex cache size to 1024 in DefaultDateFormatterTests setup code.

Browse Source
This commit is contained in:
Daniel Stolt
2014-07-29 20:05:01 +02:00
parent 387425deb9
commit 9f4e91f75f
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs
View File

@@ -17,6 +17,11 @@ namespace Orchard.Framework.Tests.Localization {
[TestFixture]
public class DefaultDateFormatterTests {
[SetUp]
public void Init() {
Regex.CacheSize = 1024;
}
[Test]
[Description("Date/time parsing works correctly for all combinations of months, format strings and cultures.")]
public void ParseDateTimeTest01() {

10
src/Orchard/Localization/Services/DefaultDateFormatter.cs
View File

@@ -248,9 +248,9 @@ namespace Orchard.Localization.Services {
protected virtual bool GetUseGenitiveMonthName(string format) {
// Use genitive month name if the format (excluding literals) contains a numerical day component (d or dd).
var formatWithoutLiterals = Regex.Replace(format, @"(?<!\\)'(.*?)(?<!\\)'|(?<!\\)""(.*?)(?<!\\)""", "");
var formatWithoutLiterals = Regex.Replace(format, @"(?<!\\)'(.*?)(?<!\\)'|(?<!\\)""(.*?)(?<!\\)""", "", RegexOptions.Compiled);
var numericalDayPattern = @"(\b|[^d])d{1,2}(\b|[^d])";
return Regex.IsMatch(formatWithoutLiterals, numericalDayPattern);
return Regex.IsMatch(formatWithoutLiterals, numericalDayPattern, RegexOptions.Compiled);
}
protected virtual Dictionary<string, string> GetDateParseReplacements() {
@@ -343,13 +343,13 @@ namespace Orchard.Localization.Services {
string result = format;
// Transform the / and : characters into culture-specific date and time separators.
result = Regex.Replace(result, @"\/|:", m => m.Value == "/" ? _dateTimeFormatProvider.DateSeparator : _dateTimeFormatProvider.TimeSeparator);
result = Regex.Replace(result, @"\/|:", m => m.Value == "/" ? _dateTimeFormatProvider.DateSeparator : _dateTimeFormatProvider.TimeSeparator, RegexOptions.Compiled);
// Escape all characters that are intrinsic Regex syntax.
result = EscapeForRegex(result);
// Transform all literals to corresponding wildcard matches.
result = Regex.Replace(result, @"(?<!\\)'(.*?)(?<!\\)'|(?<!\\)""(.*?)(?<!\\)""", m => String.Format("(?:.{{{0}}})", m.Value.Replace("\\", "").Length - 2));
result = Regex.Replace(result, @"(?<!\\)'(.*?)(?<!\\)'|(?<!\\)""(.*?)(?<!\\)""", m => String.Format("(?:.{{{0}}})", m.Value.Replace("\\", "").Length - 2), RegexOptions.Compiled);
// Transform all DateTime format specifiers into corresponding Regex captures.
result = result.ReplaceAll(replacements);
@@ -397,7 +397,7 @@ namespace Orchard.Localization.Services {
}
protected virtual string EscapeForRegex(string input) {
return Regex.Replace(input, @"\.|\$|\^|\{|\[|\(|\||\)|\*|\+|\?|\\", m => String.Format(@"\{0}", m.Value));
return Regex.Replace(input, @"\.|\$|\^|\{|\[|\(|\||\)|\*|\+|\?|\\", m => String.Format(@"\{0}", m.Value), RegexOptions.Compiled);
}
protected virtual CultureInfo CurrentCulture {