Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
61297585
Unverified
Commit
61297585
authored
Sep 27, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Sep 27, 2019
Browse files
Merge branch 'unstable' into modules_fork
parents
83e87bac
fddc4757
Changes
82
Hide whitespace changes
Inline
Side-by-side
tests/unit/multi.tcl
View file @
61297585
...
@@ -306,4 +306,18 @@ start_server {tags {"multi"}} {
...
@@ -306,4 +306,18 @@ start_server {tags {"multi"}} {
}
}
close_replication_stream $repl
close_replication_stream $repl
}
}
test
{
DISCARD should not fail during OOM
}
{
set rd
[
redis_deferring_client
]
$rd config set maxmemory 1
assert
{[
$rd
read
]
eq
{
OK
}}
r multi
catch
{
r set x 1
}
e
assert_match
{
OOM*
}
$e
r discard
$rd config set maxmemory 0
assert
{[
$rd
read
]
eq
{
OK
}}
$rd close
r ping
}
{
PONG
}
}
}
utils/tracking_collisions.c
0 → 100644
View file @
61297585
/* This is a small program used in order to understand the collison rate
* of CRC64 (ISO version) VS other stronger hashing functions in the context
* of hashing keys for the Redis "tracking" feature (client side caching
* assisted by the server).
*
* The program attempts to hash keys with common names in the form of
*
* prefix:<counter>
*
* And counts the resulting collisons generated in the 24 bits of output
* needed for the tracking feature invalidation table (16 millions + entries)
*
* Compile with:
*
* cc -O2 ./tracking_collisions.c ../src/crc64.c ../src/sha1.c
* ./a.out
*
* --------------------------------------------------------------------------
*
* Copyright (C) 2019 Salvatore Sanfilippo
* This code is released under the BSD 2 clause license.
*/
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <stdio.h>
#include "../src/crc64.h"
#include "../src/sha1.h"
#define TABLE_SIZE (1<<24)
int
Table
[
TABLE_SIZE
];
uint64_t
crc64Hash
(
char
*
key
,
size_t
len
)
{
return
crc64
(
0
,(
unsigned
char
*
)
key
,
len
);
}
uint64_t
sha1Hash
(
char
*
key
,
size_t
len
)
{
SHA1_CTX
ctx
;
unsigned
char
hash
[
20
];
SHA1Init
(
&
ctx
);
SHA1Update
(
&
ctx
,(
unsigned
char
*
)
key
,
len
);
SHA1Final
(
hash
,
&
ctx
);
uint64_t
hash64
;
memcpy
(
&
hash64
,
hash
,
sizeof
(
hash64
));
return
hash64
;
}
/* Test the hashing function provided as callback and return the
* number of collisions found. */
unsigned
long
testHashingFunction
(
uint64_t
(
*
hash
)(
char
*
,
size_t
))
{
unsigned
long
collisions
=
0
;
memset
(
Table
,
0
,
sizeof
(
Table
));
char
*
prefixes
[]
=
{
"object"
,
"message"
,
"user"
,
NULL
};
for
(
int
i
=
0
;
prefixes
[
i
]
!=
NULL
;
i
++
)
{
for
(
int
j
=
0
;
j
<
TABLE_SIZE
/
2
;
j
++
)
{
char
keyname
[
128
];
size_t
keylen
=
snprintf
(
keyname
,
sizeof
(
keyname
),
"%s:%d"
,
prefixes
[
i
],
j
);
uint64_t
bucket
=
hash
(
keyname
,
keylen
)
%
TABLE_SIZE
;
if
(
Table
[
bucket
])
{
collisions
++
;
}
else
{
Table
[
bucket
]
=
1
;
}
}
}
return
collisions
;
}
int
main
(
void
)
{
printf
(
"SHA1 : %lu
\n
"
,
testHashingFunction
(
sha1Hash
));
printf
(
"CRC64: %lu
\n
"
,
testHashingFunction
(
crc64Hash
));
return
0
;
}
Prev
1
2
3
4
5
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment