Skip to content

Improve string manipulation performance #178

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 8, 2021
Merged

Improve string manipulation performance #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/EntityFramework.DynamicFilters.Shared/DynamicFilterExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ private static void RemoveFilterDisabledConditionFromQuery(DbCommand command, Db
(paramIdx = command.CommandText.IndexOf(param.ParameterName + " IS NOT NULL", curIdx, StringComparison.OrdinalIgnoreCase)) != -1)
{
int startIdx = command.CommandText.LastIndexOf("or", paramIdx, StringComparison.OrdinalIgnoreCase);
int endIdx = command.CommandText.IndexOf(')', paramIdx);
int endIdx = command.CommandText.IndexOf(")", paramIdx, StringComparison.Ordinal);

if (endIdx == -1)
{
Expand All @@ -955,7 +955,7 @@ private static void RemoveFilterDisabledConditionFromQuery(DbCommand command, Db
// (note the extra ()'s which are not present in PostgreSQL).
// So while we found the ending ")", we may or may not want to actually remove it.
// Determine that by checking for the presence of an opening "(" in between the "or" and the parameter name
var openingParenIndex = command.CommandText.IndexOf('(', startIdx);
var openingParenIndex = command.CommandText.IndexOf("(", startIdx, StringComparison.Ordinal);
if ((openingParenIndex < startIdx) || (openingParenIndex > paramIdx))
endIdx--; // Do not have opening paren so do not remove the trailing ")"!
}
Expand Down Expand Up @@ -996,7 +996,7 @@ private static void SetParameterList(IEnumerable paramValueCollection, DbParamet
int prevStartIndex = 0;
int paramStartIdx;
bool isNotCondition = false;
while ((paramStartIdx = command.CommandText.IndexOf(param.ParameterName, prevStartIndex)) != -1)
while ((paramStartIdx = command.CommandText.IndexOf(param.ParameterName, prevStartIndex, StringComparison.OrdinalIgnoreCase)) != -1)
{
int startIdx = FindLastComparisonOperator(command.CommandText, paramStartIdx, out isNotCondition);
if (startIdx == -1)
Expand Down Expand Up @@ -1058,11 +1058,11 @@ private static int FindLastComparisonOperator(string commandText, int fromIdx, o
// possible for us to match on a condition that is earlier in the sql statement.

// MySql uses "!=" syntax. Not possible to find both.
int notEqualIdx = commandText.LastIndexOf("!=", fromIdx, 10);
int notEqualIdx = commandText.LastIndexOf("!=", fromIdx, 10, StringComparison.Ordinal);
if (notEqualIdx == -1)
notEqualIdx = commandText.LastIndexOf("<>", fromIdx, 10);
notEqualIdx = commandText.LastIndexOf("<>", fromIdx, 10, StringComparison.Ordinal);

int equalIdx = commandText.LastIndexOf("=", fromIdx, 10);
int equalIdx = commandText.LastIndexOf("=", fromIdx, 10, StringComparison.Ordinal);
if (equalIdx == notEqualIdx + 1) // Don't want to match on the "=" in "!="
equalIdx = -1;

Expand Down