John Sully
a1d9c2e827
use serverAssert() instead of assert() to get callstacks in fastlock
...
Former-commit-id: 45535e8a6377963dce5b158a9a6e448c5c22a0a8
2020-04-28 22:41:07 -04:00
John Sully
d9409d3614
Merge branch 'unstable' of https://github.com/JohnSully/KeyDB into unstable
...
Former-commit-id: c78895aaea4bbe058f49e28151238f4a4c8bae60
2020-04-28 22:24:45 -04:00
John Sully
2a73085de9
Merge branch 'unstable' of https://github.com/JohnSully/KeyDB into unstable
...
Former-commit-id: c78895aaea4bbe058f49e28151238f4a4c8bae60
2020-04-28 22:24:45 -04:00
John Sully
83118f2584
Bump version
...
Former-commit-id: 8e12ff0cd9e50867b42b165af278a7dc91fc17e1
2020-04-28 20:49:39 -04:00
John Sully
59c85050be
Bump version
...
Former-commit-id: 8e12ff0cd9e50867b42b165af278a7dc91fc17e1
2020-04-28 20:49:39 -04:00
John Sully
c400e5825b
Merge branch 'keydbpro' into PRO_RELEASE_6
...
Former-commit-id: 6e7ffcddfbde8ee310e07b510097b69104f862b8
2020-04-28 20:48:54 -04:00
John Sully
d29cc4f24c
Merge branch 'keydbpro' into PRO_RELEASE_6
...
Former-commit-id: 6e7ffcddfbde8ee310e07b510097b69104f862b8
2020-04-28 20:48:54 -04:00
John Sully
2ab2078085
Fix failure to count keys in cluster slots when reloading a FLASH database
...
Former-commit-id: f6dd863e51f91620f184ff80f08cfe518d29c87f
2020-04-28 20:48:46 -04:00
John Sully
b752ad4ceb
Fix failure to count keys in cluster slots when reloading a FLASH database
...
Former-commit-id: f6dd863e51f91620f184ff80f08cfe518d29c87f
2020-04-28 20:48:46 -04:00
Salvatore Sanfilippo
270c1f4d80
Merge pull request #7161 from guybe7/xinfo_full_count
...
XINFO STREAM FULL should have a default COUNT of 10
2020-04-28 17:19:31 +02:00
Salvatore Sanfilippo
d4a2970092
Merge pull request #7161 from guybe7/xinfo_full_count
...
XINFO STREAM FULL should have a default COUNT of 10
2020-04-28 17:19:31 +02:00
Guy Benoish
6544cf0f48
XINFO STREAM FULL should have a default COUNT of 10
2020-04-28 18:09:03 +03:00
Guy Benoish
057865a6a5
XINFO STREAM FULL should have a default COUNT of 10
2020-04-28 18:09:03 +03:00
antirez
9ec60a50c6
Fix create-cluster BIN_PATH.
2020-04-28 16:40:15 +02:00
antirez
f95a88d988
Fix create-cluster BIN_PATH.
2020-04-28 16:40:15 +02:00
Salvatore Sanfilippo
a8561470ca
Merge pull request #7134 from guybe7/xstate_command
...
Extend XINFO STREAM output
2020-04-28 16:31:00 +02:00
Salvatore Sanfilippo
e0de7c0852
Merge pull request #7134 from guybe7/xstate_command
...
Extend XINFO STREAM output
2020-04-28 16:31:00 +02:00
Guy Benoish
b83ae07117
Extend XINFO STREAM output
...
Introducing XINFO STREAM <key> FULL
2020-04-28 13:03:43 +03:00
Guy Benoish
1e2aee3919
Extend XINFO STREAM output
...
Introducing XINFO STREAM <key> FULL
2020-04-28 13:03:43 +03:00
Salvatore Sanfilippo
8d821e61d8
Merge pull request #7101 from hwware/fixunusedmarco
...
Fix not used marco in cluster.c
2020-04-28 11:22:09 +02:00
Salvatore Sanfilippo
ce25ceda58
Merge pull request #7101 from hwware/fixunusedmarco
...
Fix not used marco in cluster.c
2020-04-28 11:22:09 +02:00
Salvatore Sanfilippo
6d249b913e
Merge pull request #6942 from itamarhaber/clustrutil-binpath
...
Adds `BIN_PATH` to create-cluster
2020-04-28 11:21:06 +02:00
Salvatore Sanfilippo
615eae2c82
Merge pull request #6942 from itamarhaber/clustrutil-binpath
...
Adds `BIN_PATH` to create-cluster
2020-04-28 11:21:06 +02:00
Oran Agra
fb0a0c6451
hickup, re-fix dictEncObjKeyCompare
...
come to think of it, in theory (not in practice), getDecodedObject can
return the same original object with refcount incremented, so the
pointer comparision in the previous commit was invalid.
so now instead of checking the encoding, we explicitly check the
refcount.
2020-04-28 11:20:15 +02:00
Oran Agra
b712fba17c
hickup, re-fix dictEncObjKeyCompare
...
come to think of it, in theory (not in practice), getDecodedObject can
return the same original object with refcount incremented, so the
pointer comparision in the previous commit was invalid.
so now instead of checking the encoding, we explicitly check the
refcount.
2020-04-28 11:20:15 +02:00
Oran Agra
a8995ce3c9
fix loading race in psync2 tests
2020-04-28 11:20:15 +02:00
Oran Agra
ea63aea72d
fix loading race in psync2 tests
2020-04-28 11:20:15 +02:00
antirez
ffbe6543ab
Rework comment in dictEncObjKeyCompare().
2020-04-28 11:20:15 +02:00
antirez
64e588bfab
Rework comment in dictEncObjKeyCompare().
2020-04-28 11:20:15 +02:00
Oran Agra
d92f14e825
allow dictFind using static robj
...
since the recent addition of OBJ_STATIC_REFCOUNT and the assertion in
incrRefCount it is now impossible to use dictFind using a static robj,
because dictEncObjKeyCompare will call getDecodedObject which tries to
increment the refcount just in order to decrement it later.
2020-04-28 11:20:15 +02:00
Oran Agra
0d1e8c93bf
allow dictFind using static robj
...
since the recent addition of OBJ_STATIC_REFCOUNT and the assertion in
incrRefCount it is now impossible to use dictFind using a static robj,
because dictEncObjKeyCompare will call getDecodedObject which tries to
increment the refcount just in order to decrement it later.
2020-04-28 11:20:15 +02:00
Madelyn Olson
e853b8f137
Added crcspeed library
2020-04-28 11:20:15 +02:00
Madelyn Olson
a1bed447b3
Added crcspeed library
2020-04-28 11:20:15 +02:00
Madelyn Olson
e49a60d9df
Made crc64 test consistent
2020-04-28 11:20:15 +02:00
Madelyn Olson
a75fa3aad1
Made crc64 test consistent
2020-04-28 11:20:15 +02:00
Madelyn Olson
1652f7b897
Implemented CRC64 based on slice by 4
2020-04-28 11:20:15 +02:00
Madelyn Olson
52c75e9db1
Implemented CRC64 based on slice by 4
2020-04-28 11:20:15 +02:00
Salvatore Sanfilippo
1b5bb23ef4
Merge pull request #7160 from oranagra/refix-get_decoded_object
...
hickup, re-fix dictEncObjKeyCompare
2020-04-28 11:19:28 +02:00
Salvatore Sanfilippo
4d4c8c8a40
Merge pull request #7160 from oranagra/refix-get_decoded_object
...
hickup, re-fix dictEncObjKeyCompare
2020-04-28 11:19:28 +02:00
Oran Agra
3a8f8fa487
hickup, re-fix dictEncObjKeyCompare
...
come to think of it, in theory (not in practice), getDecodedObject can
return the same original object with refcount incremented, so the
pointer comparision in the previous commit was invalid.
so now instead of checking the encoding, we explicitly check the
refcount.
2020-04-28 12:14:46 +03:00
Oran Agra
9a3dab0a2e
hickup, re-fix dictEncObjKeyCompare
...
come to think of it, in theory (not in practice), getDecodedObject can
return the same original object with refcount incremented, so the
pointer comparision in the previous commit was invalid.
so now instead of checking the encoding, we explicitly check the
refcount.
2020-04-28 12:14:46 +03:00
Salvatore Sanfilippo
e035346fe8
Merge pull request #7155 from oranagra/psync2_tests_race
...
fix loading race in psync2 tests
2020-04-28 10:04:47 +02:00
Salvatore Sanfilippo
e8bc306850
Merge pull request #7155 from oranagra/psync2_tests_race
...
fix loading race in psync2 tests
2020-04-28 10:04:47 +02:00
Oran Agra
a29e617381
fix loading race in psync2 tests
2020-04-28 09:18:01 +03:00
Oran Agra
d31c0c5264
fix loading race in psync2 tests
2020-04-28 09:18:01 +03:00
antirez
bee51ef883
Rework comment in dictEncObjKeyCompare().
2020-04-27 22:40:15 +02:00
antirez
31781e97b6
Rework comment in dictEncObjKeyCompare().
2020-04-27 22:40:15 +02:00
Salvatore Sanfilippo
94dcdaeaf0
Merge pull request #7152 from oranagra/dict_find_static_robj
...
allow dictFind using static robj
2020-04-27 22:36:51 +02:00
Salvatore Sanfilippo
73316758be
Merge pull request #7152 from oranagra/dict_find_static_robj
...
allow dictFind using static robj
2020-04-27 22:36:51 +02:00
Oran Agra
9499903e56
allow dictFind using static robj
...
since the recent addition of OBJ_STATIC_REFCOUNT and the assertion in
incrRefCount it is now impossible to use dictFind using a static robj,
because dictEncObjKeyCompare will call getDecodedObject which tries to
increment the refcount just in order to decrement it later.
2020-04-27 23:17:19 +03:00