Skip to content

forcing reload on scripting error, using correct sha in some tests #273

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 3 commits into from
Dec 13, 2022
Merged

forcing reload on scripting error, using correct sha in some tests #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa4ae0f
forcing reload on scripting error, using correct sha in some tests
slorello89 Dec 13, 2022
1707077
revving version
slorello89 Dec 13, 2022
2c070c9
fixing accidental reversion
slorello89 Dec 13, 2022
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
6 changes: 3 additions & 3 deletions src/Redis.OM/Redis.OM.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<RootNamespace>Redis.OM</RootNamespace>
<Nullable>enable</Nullable>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<PackageVersion>0.4.0</PackageVersion>
<Version>0.4.0</Version>
<PackageReleaseNotes>https://github.com/redis/redis-om-dotnet/releases/tag/v0.4.0</PackageReleaseNotes>
<PackageVersion>0.4.1</PackageVersion>
<Version>0.4.1</Version>
<PackageReleaseNotes>https://github.com/redis/redis-om-dotnet/releases/tag/v0.4.1</PackageReleaseNotes>
<Description>Object Mapping and More for Redis</Description>
<Title>Redis OM</Title>
<Authors>Steve Lorello</Authors>
Expand Down
28 changes: 26 additions & 2 deletions src/Redis.OM/RedisCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,19 @@ public static async Task<IDictionary<string, string>> HGetAllAsync(this IRedisCo
};
args.AddRange(keys);
args.AddRange(argv);
return await connection.ExecuteAsync("EVALSHA", args.ToArray());
try
{
return await connection.ExecuteAsync("EVALSHA", args.ToArray());
}
catch (Exception)
{
args[0] = Scripts.ScriptCollection[scriptName];
Scripts.ShaCollection.Clear(); // we don't know what the state of the scripts are in Redis anymore, clear the sha collection and start again

// if an EVALSHA fails it's probably because the sha hasn't been loaded (Redis has probably restarted or flushed)
// We'll Run an EVAL this time, and force all scripts to be reloaded on subsequent attempts
return await connection.ExecuteAsync("EVAL", args.ToArray());
}
}

/// <summary>
Expand Down Expand Up @@ -719,7 +731,19 @@ public static async Task<IDictionary<string, string>> HGetAllAsync(this IRedisCo
};
args.AddRange(keys);
args.AddRange(argv);
return connection.Execute("EVALSHA", args.ToArray());
try
{
return connection.Execute("EVALSHA", args.ToArray());
}
catch (Exception)
{
args[0] = Scripts.ScriptCollection[scriptName];
Scripts.ShaCollection.Clear(); // we don't know what the state of the scripts are in Redis anymore, clear the sha collection and start again

// if an EVALSHA fails it's probably because the sha hasn't been loaded (Redis has probably restarted or flushed)
// We'll Run an EVAL this time, and force all scripts to be reloaded on subsequent attempts
return connection.Execute("EVAL", args.ToArray());
}
}

/// <summary>
Expand Down
46 changes: 40 additions & 6 deletions test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,12 +773,46 @@ public async Task TestUpdateJson()
_mock.Setup(x => x.Execute("FT.SEARCH", It.IsAny<string[]>()))
.Returns(_mockReply);
_mock.Setup(x => x.ExecuteAsync("EVALSHA", It.IsAny<string[]>())).ReturnsAsync("42");
_mock.Setup(x => x.ExecuteAsync("SCRIPT", It.IsAny<string[]>())).ReturnsAsync("42");
_mock.Setup(x => x.ExecuteAsync("SCRIPT", It.IsAny<string[]>())).ReturnsAsync("cbbf1c4fab5064f419e469cc51c563f8bf51e6fb");
var collection = new RedisCollection<Person>(_mock.Object);
var steve = collection.First(x => x.Name == "Steve");
steve.Age = 33;
await collection.UpdateAsync(steve);
_mock.Verify(x => x.ExecuteAsync("EVALSHA", "cbbf1c4fab5064f419e469cc51c563f8bf51e6fb", "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Age", "33"));
Scripts.ShaCollection.Clear();
}

[Fact]
public async Task TestUpdateJsonUnloadedScriptAsync()
{
_mock.Setup(x => x.Execute("FT.SEARCH", It.IsAny<string[]>()))
.Returns(_mockReply);
_mock.Setup(x => x.ExecuteAsync("EVALSHA", It.IsAny<string[]>())).Throws(new RedisServerException("Failed on EVALSHA"));
_mock.Setup(x => x.ExecuteAsync("EVAL", It.IsAny<string[]>())).ReturnsAsync("42");
_mock.Setup(x => x.ExecuteAsync("SCRIPT", It.IsAny<string[]>())).ReturnsAsync("cbbf1c4fab5064f419e469cc51c563f8bf51e6fb");
var collection = new RedisCollection<Person>(_mock.Object);
var steve = collection.First(x => x.Name == "Steve");
steve.Age = 33;
await collection.UpdateAsync(steve);
_mock.Verify(x => x.ExecuteAsync("EVALSHA", "42", "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Age", "33"));
_mock.Verify(x => x.ExecuteAsync("EVALSHA", "cbbf1c4fab5064f419e469cc51c563f8bf51e6fb", "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Age", "33"));
_mock.Verify(x => x.ExecuteAsync("EVAL",Scripts.JsonDiffResolution, "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Age", "33"));
Scripts.ShaCollection.Clear();
}

[Fact]
public void TestUpdateJsonUnloadedScript()
{
_mock.Setup(x => x.Execute("FT.SEARCH", It.IsAny<string[]>()))
.Returns(_mockReply);
_mock.Setup(x => x.Execute("EVALSHA", It.IsAny<string[]>())).Throws(new RedisServerException("Failed on EVALSHA"));
_mock.Setup(x => x.Execute("EVAL", It.IsAny<string[]>())).Returns("42");
_mock.Setup(x => x.Execute("SCRIPT", It.IsAny<string[]>())).Returns("cbbf1c4fab5064f419e469cc51c563f8bf51e6fb");
var collection = new RedisCollection<Person>(_mock.Object);
var steve = collection.First(x => x.Name == "Steve");
steve.Age = 33;
collection.Update(steve);
_mock.Verify(x => x.Execute("EVALSHA", "cbbf1c4fab5064f419e469cc51c563f8bf51e6fb", "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Age", "33"));
_mock.Verify(x => x.Execute("EVAL",Scripts.JsonDiffResolution, "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Age", "33"));
Scripts.ShaCollection.Clear();
}

Expand All @@ -803,18 +837,18 @@ public async Task TestUpdateJsonNestedObject()
_mock.Setup(x => x.Execute("FT.SEARCH", It.IsAny<string[]>()))
.Returns(_mockReply);
_mock.Setup(x => x.ExecuteAsync("EVALSHA", It.IsAny<string[]>())).ReturnsAsync("42");
_mock.Setup(x => x.ExecuteAsync("SCRIPT", It.IsAny<string[]>())).ReturnsAsync("42");
_mock.Setup(x => x.ExecuteAsync("SCRIPT", It.IsAny<string[]>())).ReturnsAsync("cbbf1c4fab5064f419e469cc51c563f8bf51e6fb");
var collection = new RedisCollection<Person>(_mock.Object);
var steve = collection.First(x => x.Name == "Steve");
steve.Address = new Address { State = "Florida" };
await collection.UpdateAsync(steve);
var expected = $"{{{Environment.NewLine} \"State\": \"Florida\"{Environment.NewLine}}}";
_mock.Verify(x => x.ExecuteAsync("EVALSHA", "42", "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Address", expected));
_mock.Verify(x => x.ExecuteAsync("EVALSHA", "cbbf1c4fab5064f419e469cc51c563f8bf51e6fb", "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Address", expected));

steve.Address.City = "Satellite Beach";
await collection.UpdateAsync(steve);
expected = "\"Satellite Beach\"";
_mock.Verify(x => x.ExecuteAsync("EVALSHA", "42", "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Address.City", expected));
_mock.Verify(x => x.ExecuteAsync("EVALSHA", "cbbf1c4fab5064f419e469cc51c563f8bf51e6fb", "1", "Redis.OM.Unit.Tests.RediSearchTests.Person:01FVN836BNQGYMT80V7RCVY73N", "SET", "$.Address.City", expected));

Scripts.ShaCollection.Clear();
}
Expand Down Expand Up @@ -2572,7 +2606,7 @@ public void SearchWithEmptyAny()
"LIMIT",
"0",
"0"));

Assert.True(any);
}
}
Expand Down