<HTML><BODY><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Пятница, 27 декабря 2019, 21:42 +03:00 от Vladislav Shpilevoy <v.shpilevoy@tarantool.org>:<br><br><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15774721431420522513_BODY">I've just noticed that we have '.' in the end of the commit<br>
title. I dropped it force pushed this commit, as an obvious<br>
fix.<br><br>
Also see some other changes below. They are pushed on top of<br>
this commit. Squash if you agree. Or change it, if I miss<br>
something.</div></div></div></div></blockquote><br>Hi! Looks good, thanks. Squashed.<br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15774721431420522513_BODY"><br><br>
================================================================================<br><br>
commit 77455d8aeb1f5f26920bbc6d213b9d32edcfd6bb<br>
Author: Vladislav Shpilevoy <<a href="mailto:v.shpilevoy@tarantool.org">v.shpilevoy@tarantool.org</a>><br>
Date: Fri Dec 27 19:08:54 2019 +0300<br><br>
Review fix 4/5<br><br>
diff --git a/src/box/vclock.h b/src/box/vclock.h<br>
index e1625410e..eb0fb5d8b 100644<br>
--- a/src/box/vclock.h<br>
+++ b/src/box/vclock.h<br>
@@ -266,7 +266,10 @@ enum { VCLOCK_ORDER_UNDEFINED = INT_MAX };<br>
* \brief Compare vclocks<br>
* \param a vclock<br>
* \param b vclock<br>
- * \param ignore_zero Whether to order by 0-th component or not<br>
+ * \param ignore_zero Whether to order by 0-th component or not.<br>
+ * The 0 component is ignored on anonymous replicas when<br>
+ * they apply rows from remote master. Because anon<br>
+ * replicas use the component for local purposes.<br>
*<br>
* \retval 1 if \a vclock is ordered after \a other<br>
* \retval -1 if \a vclock is ordered before than \a other<br>
@@ -275,7 +278,7 @@ enum { VCLOCK_ORDER_UNDEFINED = INT_MAX };<br>
*/<br>
static inline int<br>
vclock_compare_generic(const struct vclock *a, const struct vclock *b,<br>
- bool ignore_zero)<br>
+ bool ignore_zero)<br>
{<br>
bool le = true, ge = true;<br>
unsigned int map = a->map | b->map;<br>
@@ -283,11 +286,6 @@ vclock_compare_generic(const struct vclock *a, const struct vclock *b,<br>
bit_iterator_init(&it, &map, sizeof(map), true);<br><br>
size_t replica_id = bit_iterator_next(&it);<br>
- /*<br>
- * Ignore 0-th component in comparisons.<br>
- * It is empty for normal replicas and should<br>
- * be ignored for anonymous ones.<br>
- */<br>
if (replica_id == 0 && ignore_zero)<br>
replica_id = bit_iterator_next(&it);<br><br></div></div></div></div></blockquote>
<br>
<br>-- <br>Sergey Petrenko<br></BODY></HTML>