Skip to content

Respect PropertyName in Aggregation query. #405

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 5 commits into from
Aug 16, 2023
Merged

Respect PropertyName in Aggregation query. #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
145c3c8
fixing #377
slorello89 Aug 11, 2023
3671163
Merge branch 'main' into bugfix/aggregation-custom-property-names
slorello89 Aug 16, 2023
e3b61b2
nsubstiute
slorello89 Aug 16, 2023
3cc222b
fixing Redis 7.2 breaks (in a good way)
slorello89 Aug 16, 2023
5be444f
pour one out for graph
slorello89 Aug 16, 2023
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
1 change: 0 additions & 1 deletion docker/cluster/redis.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ cluster-node-timeout 5000
daemonize yes

loadmodule /opt/redis-stack/lib/redisearch.so
loadmodule /opt/redis-stack/lib/redisgraph.so
loadmodule /opt/redis-stack/lib/redistimeseries.so
loadmodule /opt/redis-stack/lib/rejson.so
loadmodule /opt/redis-stack/lib/redisbloom.so
29 changes: 15 additions & 14 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 @@ -45,32 +45,32 @@ protected override void ValidateAndPushOperand(Expression expression, Stack<stri
{
if (binaryExpression.Right is ConstantExpression constantExpression)
{
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression.Member, constantExpression));
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression, constantExpression));
}
else if (binaryExpression.Right is UnaryExpression uni)
{
switch (uni.Operand)
{
case ConstantExpression c:
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression.Member, c));
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression, c));
break;
case MemberExpression mem when mem.Expression is ConstantExpression frame:
{
var val = ExpressionParserUtilities.GetValue(mem.Member, frame.Value);
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression.Member, System.Linq.Expressions.Expression.Constant(val)));
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression, System.Linq.Expressions.Expression.Constant(val)));
break;
}
}
}
else if (binaryExpression.Right is MemberExpression mem && mem.Expression is ConstantExpression frame)
{
var val = ExpressionParserUtilities.GetValue(mem.Member, frame.Value);
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression.Member, System.Linq.Expressions.Expression.Constant(val)));
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression, System.Linq.Expressions.Expression.Constant(val)));
}
else
{
var val = ExpressionParserUtilities.GetOperandStringForQueryArgs(binaryExpression.Right);
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression.Member, System.Linq.Expressions.Expression.Constant(val)));
stack.Push(BuildQueryPredicate(binaryExpression.NodeType, memberExpression, System.Linq.Expressions.Expression.Constant(val)));
}
}
else if (expression is ConstantExpression c
Expand Down Expand Up @@ -136,7 +136,7 @@ protected override void SplitBinaryExpression(BinaryExpression expression, Stack
}
}

private static string BuildEqualityPredicate(MemberInfo member, ConstantExpression expression)
private static string BuildEqualityPredicate(MemberInfo member, ConstantExpression expression, string memberStr)
{
var sb = new StringBuilder();
var fieldAttribute = member.GetCustomAttribute<SearchFieldAttribute>();
Expand All @@ -145,7 +145,7 @@ private static string BuildEqualityPredicate(MemberInfo member, ConstantExpressi
throw new InvalidOperationException("Searches can only be performed on fields marked with a RedisFieldAttribute with the SearchFieldType not set to None");
}

sb.Append($"@{member.Name}:");
sb.Append($"{memberStr}:");
var searchFieldType = fieldAttribute.SearchFieldType != SearchFieldType.INDEXED
? fieldAttribute.SearchFieldType
: ExpressionTranslator.DetermineIndexFieldsType(member);
Expand All @@ -167,16 +167,17 @@ private static string BuildEqualityPredicate(MemberInfo member, ConstantExpressi
return sb.ToString();
}

private string BuildQueryPredicate(ExpressionType expType, MemberInfo member, ConstantExpression constExpression)
private string BuildQueryPredicate(ExpressionType expType, MemberExpression member, ConstantExpression constExpression)
{
var memberStr = ExpressionParserUtilities.GetOperandString(member);
var queryPredicate = expType switch
{
ExpressionType.GreaterThan => $"@{member.Name}:[({constExpression.Value} inf]",
ExpressionType.LessThan => $"@{member.Name}:[-inf ({constExpression.Value}]",
ExpressionType.GreaterThanOrEqual => $"@{member.Name}:[{constExpression.Value} inf]",
ExpressionType.LessThanOrEqual => $"@{member.Name}:[-inf {constExpression.Value}]",
ExpressionType.Equal => BuildEqualityPredicate(member, constExpression),
ExpressionType.NotEqual => $"@{member.Name} : -{{{constExpression.Value}}}",
ExpressionType.GreaterThan => $"{memberStr}:[({constExpression.Value} inf]",
ExpressionType.LessThan => $"{memberStr}:[-inf ({constExpression.Value}]",
ExpressionType.GreaterThanOrEqual => $"{memberStr}:[{constExpression.Value} inf]",
ExpressionType.LessThanOrEqual => $"{memberStr}:[-inf {constExpression.Value}]",
ExpressionType.Equal => BuildEqualityPredicate(member.Member, constExpression, memberStr),
ExpressionType.NotEqual => $"{memberStr} : -{{{constExpression.Value}}}",
_ => string.Empty
};
return queryPredicate;
Expand Down
4 changes: 2 additions & 2 deletions src/Redis.OM/RediSearchCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static async Task<bool> CreateIndexAsync(this IRedisConnection connection
}
catch (Exception ex)
{
if (ex.Message.Contains("Unknown Index name"))
if (ex.Message.ToLower().Contains("unknown index name"))
{
return null;
}
Expand All @@ -134,7 +134,7 @@ public static async Task<bool> CreateIndexAsync(this IRedisConnection connection
}
catch (Exception ex)
{
if (ex.Message.Contains("Unknown Index name"))
if (ex.Message.ToLower().Contains("unknown index name"))
{
return null;
}
Expand Down
11 changes: 0 additions & 11 deletions test/Redis.OM.Unit.Tests/RediSearchTests/AggregationFunctionalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,16 +271,5 @@ public async Task GetGroupCount()
Assert.True(1<=result["COUNT"]);
}
}

[Fact]
public void TestUnsortedFields()
{
Setup();
var collection = new RedisAggregationSet<Person>(_connection);

Assert.Throws<NotSupportedException>(() =>
collection.Apply(x => $"{x.RecordShell.Email}", "TheEmailThatNeverWas").ToList());

}
}
}
21 changes: 21 additions & 0 deletions test/Redis.OM.Unit.Tests/RediSearchTests/AggregationSetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,27 @@ public void PunctuationMarkInTagQuery()
_ = collection.Where(query).ToList();
_substitute.Received().Execute("FT.AGGREGATE", "person-idx", "@FirstName:{Walter\\-Junior}", "WITHCURSOR", "COUNT", "10000");
}

[Fact]
public void CustomPropertyNamesInQuery()
{
//Arrange
_substitute.Execute("FT.AGGREGATE", Arg.Any<string[]>()).Returns(MockedResult);
_substitute.Execute("FT.CURSOR", Arg.Any<string[]>()).Returns(MockedResultCursorEnd);

var collection = new RedisAggregationSet<ObjectWithPropertyNamesDefined>(_substitute, true, 10);

//Act
_ = collection.Where(x => x.RecordShell.Key == "test").ToList();

//Assert
_substitute.Received().Execute("FT.AGGREGATE",
"objectwithpropertynamesdefined-idx",
"@notKey:{test}",
"WITHCURSOR",
"COUNT",
"10");
}

}
}