Skip to content

Commit 19d59ba

Browse files
maca88maca88
committed
Moved lua scripts to embedded resources
1 parent 92ceedf commit 19d59ba

23 files changed

+275
-188
lines changed

‎StackExRedis/NHibernate.Caches.StackExRedis/DefaultRegionStrategy.cs‎

Lines changed: 30 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -14,125 +14,37 @@ namespace NHibernate.Caches.StackExRedis
1414
public partial class DefaultRegionStrategy : AbstractRegionStrategy
1515
{
1616
private const string InvalidVersionMessage = "Invalid version";
17+
private static readonly string UpdateVersionLuaScript;
18+
private static readonly string InitializeVersionLuaScript;
19+
private static readonly string GetLuaScript;
20+
private static readonly string GetManyLuaScript;
21+
private static readonly string PutLuaScript;
22+
private static readonly string PutManyLuaScript;
23+
private static readonly string RemoveLuaScript;
24+
private static readonly string RemoveManyLuaScript;
25+
private static readonly string LockLuaScript;
26+
private static readonly string LockManyLuaScript;
27+
private static readonly string UnlockLuaScript;
28+
private static readonly string UnlockManyLuaScript;
29+
30+
static DefaultRegionStrategy()
31+
{
32+
UpdateVersionLuaScript = LuaScriptProvider.GetScript<DefaultRegionStrategy>("UpdateVersion");
33+
InitializeVersionLuaScript = LuaScriptProvider.GetScript<DefaultRegionStrategy>("InitializeVersion");
34+
// For each operation we have to prepend the check version script
35+
const string checkVersion = "CheckVersion";
36+
GetLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(Get));
37+
GetManyLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(GetMany));
38+
PutLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(Put));
39+
PutManyLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(PutMany));
40+
RemoveLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(Remove));
41+
RemoveManyLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(RemoveMany));
42+
LockLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(Lock));
43+
LockManyLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(LockMany));
44+
UnlockLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(Unlock));
45+
UnlockManyLuaScript = LuaScriptProvider.GetConcatenatedScript<DefaultRegionStrategy>(checkVersion, nameof(UnlockMany));
46+
}
1747

18-
private static readonly string CheckVersionCode = $@"
19-
local version = redis.call('get', KEYS[#KEYS])
20-
if version ~= ARGV[#ARGV] then
21-
return redis.error_reply('{InvalidVersionMessage}')
22-
end";
23-
24-
private const string UpdateVersionLuaScript = @"
25-
local version = redis.call('incr', KEYS[1])
26-
if version > tonumber(ARGV[1]) then
27-
version = 1
28-
redis.call('set', KEYS[1], version)
29-
end
30-
return version";
31-
32-
private const string InitializeVersionLuaScript = @"
33-
if redis.call('exists', KEYS[1]) == 1 then
34-
return redis.call('get', KEYS[1])
35-
else
36-
redis.call('set', KEYS[1], 1)
37-
return 1
38-
end";
39-
40-
private static readonly string GetLuaScript = $@"
41-
{CheckVersionCode}
42-
local value = redis.call('get', KEYS[1])
43-
if value ~= nil and ARGV[1] == '1' then
44-
redis.call('pexpire', KEYS[1], ARGV[2])
45-
end
46-
return value";
47-
48-
private static readonly string GetManyLuaScript = $@"
49-
{CheckVersionCode}
50-
local values = {{}}
51-
local sliding = ARGV[#ARGV-2]
52-
local expirationMs = ARGV[#ARGV-1]
53-
for i=1,#KEYS-1 do
54-
local value = redis.call('get', KEYS[i])
55-
if value ~= nil and sliding == '1' then
56-
redis.call('pexpire', KEYS[i], expirationMs)
57-
end
58-
values[i] = value
59-
end
60-
return values";
61-
62-
private static readonly string PutLuaScript = $@"
63-
{CheckVersionCode}
64-
return redis.call('set', KEYS[1], ARGV[1], 'px', ARGV[3])";
65-
66-
private static readonly string PutManyLuaScript = $@"
67-
{CheckVersionCode}
68-
local expirationMs = ARGV[#ARGV-1]
69-
for i=1,#KEYS-1 do
70-
redis.call('set', KEYS[i], ARGV[i], 'px', expirationMs)
71-
end";
72-
73-
private static readonly string RemoveLuaScript = $@"
74-
{CheckVersionCode}
75-
return redis.call('del', KEYS[1])";
76-
77-
private static readonly string RemoveManyLuaScript = $@"
78-
{CheckVersionCode}
79-
local removedKeys = 0
80-
for i=1,#KEYS-1 do
81-
removedKeys = removedKeys + redis.call('del', KEYS[i])
82-
end
83-
return removedKeys";
84-
85-
private static readonly string LockLuaScript = $@"
86-
{CheckVersionCode}
87-
if redis.call('set', KEYS[1], ARGV[1], 'nx', 'px', ARGV[2]) == false then
88-
return 0
89-
else
90-
return 1
91-
end";
92-
93-
private static readonly string LockManyLuaScript = $@"
94-
{CheckVersionCode}
95-
local lockValue = ARGV[#ARGV-2]
96-
local expirationMs = ARGV[#ARGV-1]
97-
local lockedKeys = {{}}
98-
local lockedKeyIndex = 1
99-
local locked = true
100-
for i=1,#KEYS-1 do
101-
if redis.call('set', KEYS[i], lockValue, 'nx', 'px', expirationMs) == false then
102-
locked = 0
103-
break
104-
else
105-
lockedKeys[lockedKeyIndex] = KEYS[i]
106-
lockedKeyIndex = lockedKeyIndex + 1
107-
end
108-
end
109-
if locked == true then
110-
return 1
111-
else
112-
for i=1,#lockedKeys do
113-
redis.call('del', lockedKeys[i])
114-
end
115-
return 0
116-
end";
117-
118-
private static readonly string UnlockLuaScript = $@"
119-
{CheckVersionCode}
120-
if redis.call('get', KEYS[1]) == ARGV[1] then
121-
return redis.call('del', KEYS[1])
122-
else
123-
return 0
124-
end";
125-
126-
private static readonly string UnlockManyLuaScript = $@"
127-
{CheckVersionCode}
128-
local lockValue = ARGV[1]
129-
local removedKeys = 0
130-
for i=1,#KEYS-1 do
131-
if redis.call('get', KEYS[i]) == lockValue then
132-
removedKeys = removedKeys + redis.call('del', KEYS[i])
133-
end
134-
end
135-
return removedKeys";
13648

13749
private readonly RedisKey[] _regionKeyArray;
13850
private readonly RedisValue[] _maxVersionNumber;

‎StackExRedis/NHibernate.Caches.StackExRedis/FastRegionStrategy.cs‎

Lines changed: 24 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -13,69 +13,22 @@ namespace NHibernate.Caches.StackExRedis
1313
/// </summary>
1414
public partial class FastRegionStrategy : AbstractRegionStrategy
1515
{
16-
private const string SlidingGetLuaScript = @"
17-
local value = redis.call('get', KEYS[1])
18-
if value ~= nil then
19-
redis.call('pexpire', KEYS[1], ARGV[2])
20-
end
21-
return value";
22-
23-
private const string SlidingGetManyLuaScript = @"
24-
local expirationMs = ARGV[2]
25-
local values = redis.call('MGET', unpack(KEYS));
26-
for i=1,#KEYS do
27-
if values[i] ~= nil then
28-
redis.call('pexpire', KEYS[i], expirationMs)
29-
end
30-
end
31-
return values";
32-
33-
private const string ExpirationPutManyLuaScript = @"
34-
local expirationMs = ARGV[#ARGV]
35-
for i=1,#KEYS do
36-
redis.call('set', KEYS[i], ARGV[i], 'px', expirationMs)
37-
end";
38-
39-
private const string LockManyLuaScript = @"
40-
local lockValue = ARGV[#ARGV-1]
41-
local expirationMs = ARGV[#ARGV]
42-
local lockedKeys = {}
43-
local lockedKeyIndex = 1
44-
local locked = true
45-
for i=1,#KEYS do
46-
if redis.call('set', KEYS[i], lockValue, 'nx', 'px', expirationMs) == false then
47-
locked = false
48-
break
49-
else
50-
lockedKeys[lockedKeyIndex] = KEYS[i]
51-
lockedKeyIndex = lockedKeyIndex + 1
52-
end
53-
end
54-
if locked == true then
55-
return 1
56-
else
57-
for i=1,#lockedKeys do
58-
redis.call('del', lockedKeys[i])
59-
end
60-
return 0
61-
end";
62-
63-
private const string UnlockLuaScript = @"
64-
if redis.call('get', KEYS[1]) == ARGV[1] then
65-
return redis.call('del', KEYS[1])
66-
else
67-
return 0
68-
end";
69-
70-
private const string UnlockManyLuaScript = @"
71-
local lockValue = ARGV[1]
72-
local removedKeys = 0
73-
for i=1,#KEYS do
74-
if redis.call('get', KEYS[i]) == lockValue then
75-
removedKeys = removedKeys + redis.call('del', KEYS[i])
76-
end
77-
end
78-
return removedKeys";
16+
private static readonly string SlidingGetLuaScript;
17+
private static readonly string SlidingGetManyLuaScript;
18+
private static readonly string ExpirationPutManyLuaScript;
19+
private static readonly string LockManyLuaScript;
20+
private static readonly string UnlockLuaScript;
21+
private static readonly string UnlockManyLuaScript;
22+
23+
static FastRegionStrategy()
24+
{
25+
SlidingGetLuaScript = LuaScriptProvider.GetScript<FastRegionStrategy>("SlidingGet");
26+
SlidingGetManyLuaScript = LuaScriptProvider.GetScript<FastRegionStrategy>("SlidingGetMany");
27+
ExpirationPutManyLuaScript = LuaScriptProvider.GetScript<FastRegionStrategy>("ExpirationPutMany");
28+
LockManyLuaScript = LuaScriptProvider.GetScript<FastRegionStrategy>(nameof(LockMany));
29+
UnlockLuaScript = LuaScriptProvider.GetScript<FastRegionStrategy>(nameof(Unlock));
30+
UnlockManyLuaScript = LuaScriptProvider.GetScript<FastRegionStrategy>(nameof(UnlockMany));
31+
}
7932

8033

8134
/// <summary>
@@ -85,14 +38,15 @@ public FastRegionStrategy(ConnectionMultiplexer connectionMultiplexer,
8538
RedisCacheRegionConfiguration configuration, IDictionary<string, string> properties)
8639
: base(connectionMultiplexer, configuration, properties)
8740
{
88-
if (ExpirationEnabled)
41+
if (!ExpirationEnabled)
42+
{
43+
return;
44+
}
45+
PutManyScript = ExpirationPutManyLuaScript;
46+
if (UseSlidingExpiration)
8947
{
90-
PutManyScript = ExpirationPutManyLuaScript;
91-
if (UseSlidingExpiration)
92-
{
93-
GetScript = SlidingGetLuaScript;
94-
GetManyScript = SlidingGetManyLuaScript;
95-
}
48+
GetScript = SlidingGetLuaScript;
49+
GetManyScript = SlidingGetManyLuaScript;
9650
}
9751
}
9852

‎StackExRedis/NHibernate.Caches.StackExRedis/Lua/DefaultRegionStrategy/CheckVersion.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
local version = redis.call('get', KEYS[#KEYS])
2+
if version ~= ARGV[#ARGV] then
3+
return redis.error_reply('Invalid version')
4+
end

‎StackExRedis/NHibernate.Caches.StackExRedis/Lua/DefaultRegionStrategy/Get.lua‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
local value = redis.call('get', KEYS[1])
2+
if value ~= nil and ARGV[1] == '1' then
3+
redis.call('pexpire', KEYS[1], ARGV[2])
4+
end
5+
return value

‎StackExRedis/NHibernate.Caches.StackExRedis/Lua/DefaultRegionStrategy/GetMany.lua‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
local values = {{}}
2+
local sliding = ARGV[#ARGV-2]
3+
local expirationMs = ARGV[#ARGV-1]
4+
for i=1,#KEYS-1 do
5+
local value = redis.call('get', KEYS[i])
6+
if value ~= nil and sliding == '1' then
7+
redis.call('pexpire', KEYS[i], expirationMs)
8+
end
9+
values[i] = value
10+
end
11+
return values

‎StackExRedis/NHibernate.Caches.StackExRedis/Lua/DefaultRegionStrategy/InitializeVersion.lua‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
if redis.call('exists', KEYS[1]) == 1 then
2+
return redis.call('get', KEYS[1])
3+
else
4+
redis.call('set', KEYS[1], 1)
5+
return 1
6+
end

‎StackExRedis/NHibernate.Caches.StackExRedis/Lua/DefaultRegionStrategy/Lock.lua‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
if redis.call('set', KEYS[1], ARGV[1], 'nx', 'px', ARGV[2]) == false then
2+
return 0
3+
else
4+
return 1
5+
end

‎StackExRedis/NHibernate.Caches.StackExRedis/Lua/DefaultRegionStrategy/LockMany.lua‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
local lockValue = ARGV[#ARGV-2]
2+
local expirationMs = ARGV[#ARGV-1]
3+
local lockedKeys = {{}}
4+
local lockedKeyIndex = 1
5+
local locked = true
6+
for i=1,#KEYS-1 do
7+
if redis.call('set', KEYS[i], lockValue, 'nx', 'px', expirationMs) == false then
8+
locked = 0
9+
break
10+
else
11+
lockedKeys[lockedKeyIndex] = KEYS[i]
12+
lockedKeyIndex = lockedKeyIndex + 1
13+
end
14+
end
15+
if locked == true then
16+
return 1
17+
else
18+
for i=1,#lockedKeys do
19+
redis.call('del', lockedKeys[i])
20+
end
21+
return 0
22+
end

‎StackExRedis/NHibernate.Caches.StackExRedis/Lua/DefaultRegionStrategy/Put.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
return redis.call('set', KEYS[1], ARGV[1], 'px', ARGV[3])

‎StackExRedis/NHibernate.Caches.StackExRedis/Lua/DefaultRegionStrategy/PutMany.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
local expirationMs = ARGV[#ARGV-1]
2+
for i=1,#KEYS-1 do
3+
redis.call('set', KEYS[i], ARGV[i], 'px', expirationMs)
4+
end

0 commit comments

Comments
 (0)