gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,921 Commits 1 Branch 0 Tags
Commit Graph

11921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rojingeorge
feee7d547a Display the nodes summary once the cluster is established using redis-trib.rb 
Display the nodes summary once the cluster is established using
redis-trib.rb
After the cluster meet and join was done, when the summary was shown, it
was giving info regarding the nodes. This fix ensures that confusion
where the slaves were shown as masters.
Fix would be to reset the nodes and reload the cluster information
before checking the cluster status after creating it.
 2016-06-23 21:58:03 +05:30
rojingeorge
4aab50ac7b Merge remote-tracking branch 'refs/remotes/antirez/unstable' into unstable 2016-06-23 21:34:03 +05:30
rojingeorge
fae1ce2316 Merge remote-tracking branch 'refs/remotes/antirez/unstable' into unstable 2016-06-23 21:34:03 +05:30
Salvatore Sanfilippo
f60aa4de30 Merge pull request #3324 from mishan/fix-wrong-comment-about-sentinel-mode 
Fix incorrect comment for checkForSentinelMode function
 2016-06-23 16:39:51 +02:00
Salvatore Sanfilippo
ae1a9be8b0 Merge pull request #3324 from mishan/fix-wrong-comment-about-sentinel-mode 
Fix incorrect comment for checkForSentinelMode function
 2016-06-23 16:39:51 +02:00
antirez
18983113c5 Modules: mention RedisModule_Calloc() in the doc. 2016-06-23 16:20:48 +02:00
antirez
67950680b9 Modules: mention RedisModule_Calloc() in the doc. 2016-06-23 16:20:48 +02:00
Salvatore Sanfilippo
3a0b776b94 Merge pull request #3335 from dvirsky/rm_calloc 
added RM_Calloc implementation
 2016-06-23 16:19:14 +02:00
Salvatore Sanfilippo
8e9eef76bf Merge pull request #3335 from dvirsky/rm_calloc 
added RM_Calloc implementation
 2016-06-23 16:19:14 +02:00
antirez
c026b5cd3e Merge branch 'unstable' of github.com:/antirez/redis into unstable 2016-06-23 16:18:57 +02:00
antirez
2e9fd96c57 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2016-06-23 16:18:57 +02:00
antirez
0f484d8312 Actually remove static from #3331. 
I forgot -a when amending in the previous commit.
 2016-06-23 16:18:30 +02:00
antirez
b98fc4bfee Actually remove static from #3331. 
I forgot -a when amending in the previous commit.
 2016-06-23 16:18:30 +02:00
Salvatore Sanfilippo
28ea585fce Merge pull request #3336 from yossigo/create_string_from_string 
Add RedisModule_CreateStringFromString().
 2016-06-23 16:16:28 +02:00
Salvatore Sanfilippo
9df3006aa8 Merge pull request #3336 from yossigo/create_string_from_string 
Add RedisModule_CreateStringFromString().
 2016-06-23 16:16:28 +02:00
antirez
c0ca87dcc0 Minor change to conform PR #3331 to Redis code base style. 
Also avoid "static" in order to have symbols during crashes.
 2016-06-23 16:14:16 +02:00
antirez
3d42fa5b75 Minor change to conform PR #3331 to Redis code base style. 
Also avoid "static" in order to have symbols during crashes.
 2016-06-23 16:14:16 +02:00
Salvatore Sanfilippo
a66dd43331 Merge pull request #3331 from yossigo/fix_openkey_crash 
Fix occasional RM_OpenKey() crashes.
 2016-06-23 16:12:07 +02:00
Salvatore Sanfilippo
f3b502da78 Merge pull request #3331 from yossigo/fix_openkey_crash 
Fix occasional RM_OpenKey() crashes.
 2016-06-23 16:12:07 +02:00
Salvatore Sanfilippo
393c4686ef Merge pull request #3338 from tielei/unstable 
A string with 21 chars is not representable as a 64-bit integer.
 2016-06-23 16:06:15 +02:00
Salvatore Sanfilippo
18689db5f0 Merge pull request #3338 from tielei/unstable 
A string with 21 chars is not representable as a 64-bit integer.
 2016-06-23 16:06:15 +02:00
tielei
f648c5a70c A string with 21 chars is not representable as a 64-bit integer. 2016-06-23 19:53:56 +08:00
tielei
7b19bd3bb3 A string with 21 chars is not representable as a 64-bit integer. 2016-06-23 19:53:56 +08:00
Salvatore Sanfilippo
3d48c93122 Merge pull request #3330 from yossigo/fix_const 
Use const in Redis Module API where possible.
 2016-06-23 12:29:52 +02:00
Salvatore Sanfilippo
c8cf3a4df6 Merge pull request #3330 from yossigo/fix_const 
Use const in Redis Module API where possible.
 2016-06-23 12:29:52 +02:00
antirez
4b12c6a360 Modules: changes to logging function. 
This commit changes what provided by PR #3315 (merged) in order to
let the user specify the log level as a string.

The define could be also used, but when this happens, they must be
decoupled from the defines in the Redis core, like in the other part of
the Redis modules implementations, so that a switch statement (or a
function) remaps between the two, otherwise we are no longer free to
change the internal Redis defines.
 2016-06-23 12:11:30 +02:00
antirez
4900e98d70 Modules: changes to logging function. 
This commit changes what provided by PR #3315 (merged) in order to
let the user specify the log level as a string.

The define could be also used, but when this happens, they must be
decoupled from the defines in the Redis core, like in the other part of
the Redis modules implementations, so that a switch statement (or a
function) remaps between the two, otherwise we are no longer free to
change the internal Redis defines.
 2016-06-23 12:11:30 +02:00
Yossi Gottlieb
715794b829 Add RedisModule_Log() logging API function. 2016-06-23 12:01:44 +02:00
Yossi Gottlieb
84f1e03f9a Add RedisModule_Log() logging API function. 2016-06-23 12:01:44 +02:00
antirez
b507289750 Commit change in autoMemoryFreed(): first -> last. 
It's more natural to call the last entry added as "last", the original
commet got me confused until I actually read the code.
 2016-06-23 09:38:30 +02:00
antirez
4b8cd3ab71 Commit change in autoMemoryFreed(): first -> last. 
It's more natural to call the last entry added as "last", the original
commet got me confused until I actually read the code.
 2016-06-23 09:38:30 +02:00
antirez
f2dbc02f65 Modules: implement zig-zag scanning in autoMemoryFreed(). 
Most of the time to check the last element is the way to go, however
there are patterns where the contrary is the best choice. Zig-zag
scanning implemented in this commmit always checks the obvious element
first (the last added -- think at a loop where the last element
allocated gets freed again and again), and continues checking one
element in the head and one in the tail.

Thanks to @dvisrky that fixed the original implementation of the
function and proposed zig zag scanning.
 2016-06-23 09:09:51 +02:00
antirez
7bc37d864f Modules: implement zig-zag scanning in autoMemoryFreed(). 
Most of the time to check the last element is the way to go, however
there are patterns where the contrary is the best choice. Zig-zag
scanning implemented in this commmit always checks the obvious element
first (the last added -- think at a loop where the last element
allocated gets freed again and again), and continues checking one
element in the head and one in the tail.

Thanks to @dvisrky that fixed the original implementation of the
function and proposed zig zag scanning.
 2016-06-23 09:09:51 +02:00
Salvatore Sanfilippo
2fe9b79897 Merge pull request #3244 from dvirsky/optimize_autoMemoryFreed 
Optimized autoMemoryFreed loop
 2016-06-23 08:59:38 +02:00
Salvatore Sanfilippo
574fc36d95 Merge pull request #3244 from dvirsky/optimize_autoMemoryFreed 
Optimized autoMemoryFreed loop
 2016-06-23 08:59:38 +02:00
Yossi Gottlieb
61172ed01e Add RedisModule_CreateStringFromString(). 2016-06-22 21:02:40 +03:00
Yossi Gottlieb
159c09f29e Add RedisModule_CreateStringFromString(). 2016-06-22 21:02:40 +03:00
Dvir Volk
dc7f3fefad added RM_Calloc implementation 2016-06-22 17:32:41 +03:00
Dvir Volk
bdc079dca4 added RM_Calloc implementation 2016-06-22 17:32:41 +03:00
antirez
4e10b08fb3 Modules doc: hint about replacing libc malloc calls. 2016-06-22 15:24:51 +02:00
antirez
aa345bf659 Modules doc: hint about replacing libc malloc calls. 2016-06-22 15:24:51 +02:00
Yossi Gottlieb
e22f3e40d5 Cleanup: remove zset reset function from RM_ZsetRangeStop(). 2016-06-22 07:34:14 +03:00
Yossi Gottlieb
5b5b2f86c5 Cleanup: remove zset reset function from RM_ZsetRangeStop(). 2016-06-22 07:34:14 +03:00
Yossi Gottlieb
a8e2034548 Fix occasional RM_OpenKey() crashes. 2016-06-21 10:22:19 +03:00
Yossi Gottlieb
fa96f33bef Fix occasional RM_OpenKey() crashes. 2016-06-21 10:22:19 +03:00
Yossi Gottlieb
8f3a4df775 Use const in Redis Module API where possible. 2016-06-20 23:08:06 +03:00
Yossi Gottlieb
ce9d66d6e4 Use const in Redis Module API where possible. 2016-06-20 23:08:06 +03:00
Salvatore Sanfilippo
0b4b7ebd95 Merge pull request #3252 from oranagra/config_fix 
fix: config set list-max-ziplist-size didn't support negative values
 2016-06-17 14:48:41 +02:00
Salvatore Sanfilippo
ee9146d440 Merge pull request #3252 from oranagra/config_fix 
fix: config set list-max-ziplist-size didn't support negative values
 2016-06-17 14:48:41 +02:00
Misha Nasledov
7a5538d3a9 Fix incorrect comment for checkForSentinelMode function 2016-06-16 16:50:53 -07:00