Skip to content

Count in IQueryable throw exception #533

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Count in IQueryable throw exception #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb038b5
test to show a bug where Count doesn't work in IQueryable #528
May 17, 2025
63cb8dc
fix bug where Count doesn't work in IQueryable #528
May 17, 2025
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
22 changes: 19 additions & 3 deletions src/Redis.OM/Aggregation/AggregationPredicates/QueryPredicate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protected override void SplitBinaryExpression(BinaryExpression expression, Stack
else if (left != null)
{
ValidateAndPushOperand(expression.Right, stack);
if (expression.NodeType == ExpressionType.Or)
if (expression.NodeType == ExpressionType.Or || expression.NodeType == ExpressionType.OrElse)
{
stack.Push("|");
}
Expand All @@ -157,7 +157,7 @@ protected override void SplitBinaryExpression(BinaryExpression expression, Stack
else if (right != null)
{
SplitBinaryExpression(right, stack);
if (expression.NodeType == ExpressionType.Or)
if (expression.NodeType == ExpressionType.Or || expression.NodeType == ExpressionType.OrElse)
{
stack.Push("|");
}
Expand All @@ -166,7 +166,23 @@ protected override void SplitBinaryExpression(BinaryExpression expression, Stack
}
else
{
ValidateAndPushOperand(expression, stack);
var leftCall = expression.Left as MethodCallExpression;
var rightCall = expression.Right as MethodCallExpression;

if (leftCall != null && rightCall != null)
{
ValidateAndPushOperand(leftCall, stack);
if (expression.NodeType == ExpressionType.Or || expression.NodeType == ExpressionType.OrElse)
{
stack.Push("|");
}

ValidateAndPushOperand(rightCall, stack);
}
else
{
ValidateAndPushOperand(expression, stack);
}
}
}

Expand Down
71 changes: 71 additions & 0 deletions test/Redis.OM.Unit.Tests/RediSearchTests/SearchFunctionalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,77 @@ public void TestCountWithEmptyCollection()
Assert.Equal(0, count);
}

[Fact]
public void TestCountWithOrElseMethodCallExpression()
{
const string name = "TestCountWithOrElseMethodCallExpression";
var person = new Person[] {
new Person { Name = name + "-AAA", Age = 110 },
new Person { Name = name + "-BBB", Age = 112 },
new Person { Name = name + "-CCC", Age = 115 },
new Person { Name = name + "-AAA", Age = 120 },
new Person { Name = name + "-BBB", Age = 122 },
new Person { Name = name + "-AAA", Age = 130 },
new Person { Name = name + "-BBB", Age = 132 },
};

var collection = new RedisCollection<Person>(_connection, 10000);
IQueryable<Person> query = collection;

if (collection.Where(x => x.Name.Contains(name + "-CCC")).Count() == 0)
{
foreach (var p in person)
{
collection.Insert(p);
}
}

var countCollection1 = collection.Where(x => x.Name.Contains(name + "-CCC") || x.Age > 125).Count(); // for reference (3 items)
var countQuery1 = query.Where(x => x.Name.Contains(name + "-CCC") || x.Age > 125).Count();
var countCollection2 = collection.Where(x => x.Age > 125 || x.Name.Contains(name + "-CCC")).Count();
var countQuery2 = query.Where(x => x.Age > 125 || x.Name.Contains(name + "-CCC")).Count();

Assert.Equal(countCollection1, countQuery1);
Assert.Equal(countCollection1, countCollection2);
Assert.Equal(countCollection1, countQuery2);
}

[Fact]
public void TestCountWhereLeftAndRightAreMethodCallExpression()
{
const string name = "TestCountWhereLeftAndRightAreMethodCallExpression";
var person = new Person[] {
new Person { Name = name + "-AAA", Age = 110 },
new Person { Name = name + "-BBB", Age = 112 },
new Person { Name = name + "-CCC", Age = 115 },
new Person { Name = name + "-AAA", Age = 120 },
new Person { Name = name + "-BBB", Age = 122 },
new Person { Name = name + "-AAA", Age = 130 },
new Person { Name = name + "-BBB", Age = 132 },
};

var collection = new RedisCollection<Person>(_connection, 10000);
IQueryable<Person> query = collection;

if (collection.Where(x => x.Name.Contains(name + "-CCC")).Count() == 0)
{
foreach (var p in person)
{
collection.Insert(p);
}
}

var countInCollection = collection.Where(x => x.Name.Contains(name + "-CCC")).Count(); // for reference (1 items)
var countInQuery = query.Where(x => x.Name.Contains(name + "-CCC")).Count();

Assert.Equal(countInCollection, countInQuery);

countInCollection = collection.Where(x => x.Name.Contains(name + "-CCC") || x.Name.Contains(name + "-AAA")).Count(); // for reference (4 items)
countInQuery = query.Where(x => x.Name.Contains(name + "-CCC") || x.Name.Contains(name + "-AAA")).Count();

Assert.Equal(countInCollection, countInQuery);
}

[Fact]
public void TestUpdate()
{
Expand Down