Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
68fb3019
Commit
68fb3019
authored
Apr 13, 2014
by
antirez
Browse files
hllSparseAdd() sanity check for span != 0 added.
parent
e7e6aa49
Changes
1
Show whitespace changes
Inline
Side-by-side
src/hyperloglog.c
View file @
68fb3019
...
@@ -612,6 +612,7 @@ sds hllSparseToDense(sds sparse) {
...
@@ -612,6 +612,7 @@ sds hllSparseToDense(sds sparse) {
*
*
* On success, the function returns 1 if the cardinality changed, or 0
* On success, the function returns 1 if the cardinality changed, or 0
* if the register for this element was not updated.
* if the register for this element was not updated.
* On error (if the representation is invalid) -1 is returned.
*
*
* As a side effect the function may promote the HLL representation from
* As a side effect the function may promote the HLL representation from
* sparse to dense: this happens when a register requires to be set to a value
* sparse to dense: this happens when a register requires to be set to a value
...
@@ -645,6 +646,7 @@ int hllSparseAdd(robj *o, unsigned char *ele, size_t elesize) {
...
@@ -645,6 +646,7 @@ int hllSparseAdd(robj *o, unsigned char *ele, size_t elesize) {
first
=
0
;
first
=
0
;
prev
=
NULL
;
/* Points to previos opcode at the end of the loop. */
prev
=
NULL
;
/* Points to previos opcode at the end of the loop. */
next
=
NULL
;
/* Points to the next opcode at the end of the loop. */
next
=
NULL
;
/* Points to the next opcode at the end of the loop. */
span
=
0
;
while
(
p
<
end
)
{
while
(
p
<
end
)
{
/* Set span to the number of registers covered by this opcode. */
/* Set span to the number of registers covered by this opcode. */
if
(
HLL_SPARSE_IS_ZERO
(
p
))
span
=
HLL_SPARSE_ZERO_LEN
(
p
);
if
(
HLL_SPARSE_IS_ZERO
(
p
))
span
=
HLL_SPARSE_ZERO_LEN
(
p
);
...
@@ -656,6 +658,7 @@ int hllSparseAdd(robj *o, unsigned char *ele, size_t elesize) {
...
@@ -656,6 +658,7 @@ int hllSparseAdd(robj *o, unsigned char *ele, size_t elesize) {
p
+=
(
HLL_SPARSE_IS_XZERO
(
p
))
?
2
:
1
;
p
+=
(
HLL_SPARSE_IS_XZERO
(
p
))
?
2
:
1
;
first
+=
span
;
first
+=
span
;
}
}
if
(
span
==
0
)
return
-
1
;
/* Invalid format. */
next
=
HLL_SPARSE_IS_XZERO
(
p
)
?
p
+
2
:
p
+
1
;
next
=
HLL_SPARSE_IS_XZERO
(
p
)
?
p
+
2
:
p
+
1
;
if
(
next
>=
end
)
next
=
NULL
;
if
(
next
>=
end
)
next
=
NULL
;
...
...
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