Skip to content

Optimize removal of filter disabled conditions #163

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
JonathanMagnan merged 3 commits into from
Nov 3, 2019
Merged

Optimize removal of filter disabled conditions #163

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb63046
Optimize removing filter disabled conditions
TobiasMarklund Oct 23, 2019
a818c39
Make sure CommandText is updated
TobiasMarklund Oct 24, 2019
279d0fa
Safeguard for search index overflow
TobiasMarklund Oct 24, 2019
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
21 changes: 15 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 @@ -934,10 +934,13 @@ private static void RemoveFilterDisabledConditionFromQuery(DbCommand command, Db
int paramIdx;
// Must include the "IS NOT NULL" part here. When switched to using CSpace, the SQL was slightly different
// and found a case (covered by test case "AccountAndBlogEntries") where an embedded select was returning these parameters!
while ((paramIdx = command.CommandText.IndexOf(param.ParameterName + " IS NOT NULL", StringComparison.CurrentCultureIgnoreCase)) != -1)
StringBuilder b = new StringBuilder();
var curIdx = 0;
while ((curIdx < command.CommandText.Length) &&
(paramIdx = command.CommandText.IndexOf(param.ParameterName + " IS NOT NULL", curIdx, StringComparison.OrdinalIgnoreCase)) != -1)
{
int startIdx = command.CommandText.LastIndexOf("or", paramIdx, StringComparison.CurrentCultureIgnoreCase);
int endIdx = command.CommandText.IndexOf(")", paramIdx);
int startIdx = command.CommandText.LastIndexOf("or", paramIdx, StringComparison.OrdinalIgnoreCase);
int endIdx = command.CommandText.IndexOf(')', paramIdx);

if (endIdx == -1)
{
Expand All @@ -952,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);
if ((openingParenIndex < startIdx) || (openingParenIndex > paramIdx))
endIdx--; // Do not have opening paren so do not remove the trailing ")"!
}
Expand All @@ -962,12 +965,18 @@ private static void RemoveFilterDisabledConditionFromQuery(DbCommand command, Db
#if (DEBUG)
throw new ApplicationException(string.Format("Failed to find start or end index of remove filter clause for parameter name {0}", param.ParameterName));
#else
return;
break;
#endif
}

command.CommandText = command.CommandText.Remove(startIdx, endIdx - startIdx + 1);
b.Append(command.CommandText.Substring(curIdx, startIdx - curIdx));

curIdx = endIdx + 1;
}
if (curIdx < command.CommandText.Length)
b.Append(command.CommandText.Substring(curIdx, command.CommandText.Length - curIdx));

command.CommandText = b.ToString();
}

/// <summary>
Expand Down