Re: [Tarantool-patches] [PATCH v3 01/10] wal: enrich row's meta information with sync replication flags

[Serge Petrenko via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

16.04.2021 10:08, Serge Petrenko via Tarantool-patches пишет:
>
>
> 16.04.2021 02:18, Vladislav Shpilevoy пишет:
>
>>
>>>   }
>>>     /**
>>> diff --git a/src/box/wal.c b/src/box/wal.c
>>> index 34af0bda6..4ec8034a3 100644
>>> --- a/src/box/wal.c
>>> +++ b/src/box/wal.c
>>> @@ -962,14 +962,14 @@ out:
>>>    */
>>>   static void
>>>   wal_assign_lsn(struct vclock *vclock_diff, struct vclock *base,
>>> -           struct xrow_header **row,
>>> -           struct xrow_header **end)
>>> +           struct journal_entry *entry)
>> 3. This part could be a separate commit, otherwise it is hard to
>> see the functional changes. Up to you if you want to split.
>
> Good idea, let's do that.
>
> Incremental diff for this commit is below and the extracted commit
> regarding wal_assign_lsn() refactoring is in reply to this email.
>

================================================================

commit d5c2ea43f89afb2e9507f14d4ad651955cee2803
Author: Serge Petrenko <sergepetrenko@tarantool.org>
Date:   Fri Apr 16 09:58:09 2021 +0300

     wal: make wal_assign_lsn accept journal entry

     Refactor wal_assign_lsn() to accept a journal entry instead of a 
pair of
     pointers to the first and last entry rows.

     Journal entry will carry additional meta information for the last row
     soon, which will be needed in wal_assign_lsn().

     Prerequisite #5445

diff --git a/src/box/wal.c b/src/box/wal.c
index 34af0bda6..95ee8e200 100644
--- a/src/box/wal.c
+++ b/src/box/wal.c
@@ -962,14 +962,14 @@ out:
   */
  static void
  wal_assign_lsn(struct vclock *vclock_diff, struct vclock *base,
-           struct xrow_header **row,
-           struct xrow_header **end)
+           struct journal_entry *entry)
  {
      int64_t tsn = 0;
-    struct xrow_header **start = row;
-    struct xrow_header **first_glob_row = row;
+    struct xrow_header **start = entry->rows;
+    struct xrow_header **end = entry->rows + entry->n_rows;
+    struct xrow_header **first_glob_row = entry->rows;
      /** Assign LSN to all local rows. */
-    for ( ; row < end; row++) {
+    for (struct xrow_header **row = start; row < end; row++) {
          if ((*row)->replica_id == 0) {
              /*
               * All rows representing local space data
@@ -1020,7 +1020,7 @@ wal_assign_lsn(struct vclock *vclock_diff, struct 
vclock *base,
       * the first global row. tsn was yet unknown when those
       * rows were processed.
       */
-    for (row = start; row < first_glob_row; row++)
+    for (struct xrow_header **row = start; row < first_glob_row; row++)
          (*row)->tsn = tsn;
  }

@@ -1098,8 +1098,7 @@ wal_write_to_disk(struct cmsg *msg)
      struct journal_entry *entry;
      struct stailq_entry *last_committed = NULL;
      stailq_foreach_entry(entry, &wal_msg->commit, fifo) {
-        wal_assign_lsn(&vclock_diff, &writer->vclock,
-                   entry->rows, entry->rows + entry->n_rows);
+        wal_assign_lsn(&vclock_diff, &writer->vclock, entry);
          entry->res = vclock_sum(&vclock_diff) +
                   vclock_sum(&writer->vclock);
          rc = xlog_write_entry(l, entry);
@@ -1319,8 +1318,7 @@ wal_write_none_async(struct journal *journal,
      struct vclock vclock_diff;

      vclock_create(&vclock_diff);
-    wal_assign_lsn(&vclock_diff, &writer->vclock, entry->rows,
-               entry->rows + entry->n_rows);
+    wal_assign_lsn(&vclock_diff, &writer->vclock, entry);
      vclock_merge(&writer->vclock, &vclock_diff);
      vclock_copy(&replicaset.vclock, &writer->vclock);
      entry->res = vclock_sum(&writer->vclock);

-- 
Serge Petrenko