LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce enumeration of rightResults in BooleanQueryExpression.IsMatch (#1155)

Browse Source 
If Operator is Exists or leftResults is empty don't obtain rightResults,
as not relevant.

Otherwise if rightResults is not an ICollection<JToken> load it into an
List so it won't be recomputed on each enumeration of leftResults.
This commit is contained in:
Jon Hanna
2017-01-09 14:12:49 +13:00
committed by James Newton-King
parent ec2659e3ad
commit cad2ec3a09
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json/Linq/JsonPath/QueryExpression.cs
+23 -13
View File
@@ -2,6 +2,11 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
#else
using System.Linq;
#endif
using Newtonsoft.Json.Utilities;
namespace Newtonsoft.Json.Linq.JsonPath
@@ -88,24 +93,29 @@ namespace Newtonsoft.Json.Linq.JsonPath
public override bool IsMatch(JToken root, JToken t)
{
IEnumerable<JToken> rightResults = GetResult(root, t, Right);
IEnumerable<JToken> leftResults = GetResult(root, t, Left);
foreach (JToken leftResult in leftResults)
if (Operator == QueryOperator.Exists)
{
if (Operator == QueryOperator.Exists)
return GetResult(root, t, Left).Any();
}
using (IEnumerator<JToken> leftResults = GetResult(root, t, Left).GetEnumerator())
{
if (leftResults.MoveNext())
{
return true;
}
else
{
foreach (JToken rightResult in rightResults)
IEnumerable<JToken> rightResultsEn = GetResult(root, t, Right);
ICollection<JToken> rightResults = rightResultsEn as ICollection<JToken> ?? rightResultsEn.ToList();
do
{
if (MatchTokens(leftResult, rightResult))
JToken leftResult = leftResults.Current;
foreach (JToken rightResult in rightResults)
{
return true;
if (MatchTokens(leftResult, rightResult))
{
return true;
}
}
}
} while (leftResults.MoveNext());
}
}