Rename committed_offset field to committed_chk_id

Author: acogoluegnes

src/osiris_writer.erl

@@ -77,7 +77,7 @@
          data_listeners = [] :: [{pid(), osiris:offset()}],
          offset_listeners = [] ::
              [{pid(), osiris:offset(), mfa() | undefined}],
-         committed_offset = -1 :: osiris:offset()}). %% committed chunk ID
+         committed_chk_id = -1 :: osiris:offset()}). %% committed chunk ID
 
 -opaque state() :: #?MODULE{}.
 
@@ -259,15 +259,15 @@ handle_continue(#{name := Name,
                        replicas = Replicas,
                        directory = Dir,
                        counter = CntRef},
-              committed_offset = LastChunkId,
+              committed_chk_id = LastChunkId,
               replica_state = maps:from_list([{R, {0, {0, -1, 0}}} || R <- Replicas]),
               log = Log,
               tracking = Trk}}.
 
 handle_batch(Commands,
              #?MODULE{cfg = #cfg{counter = Cnt} = Cfg,
                       duplicates = Dupes0,
-                      committed_offset = ChkId0,
+                      committed_chk_id = ChkId0,
                       tracking = Trk0} =
                  State0) ->
 
@@ -327,7 +327,7 @@ handle_batch(Commands,
                             counters:put(Cnt, ?C_COMMITTED_CHUNK_ID, ChkId),
                             counters:put(Cnt, ?C_COMMITTED_OFFSET, LastOffset),
                             Pending = notify_writers(P, ChkId, Cfg),
-                            State2#?MODULE{committed_offset = ChkId,
+                            State2#?MODULE{committed_chk_id = ChkId,
                                            duplicates = RemDupes,
                                            pending_corrs = Pending};
                         false ->
@@ -359,7 +359,7 @@ format_status(#?MODULE{cfg = #cfg{name = Name,
                        replica_state = ReplicaState,
                        data_listeners = DataListeners,
                        offset_listeners = OffsetListeners,
-                       committed_offset = CommittedOffset}) ->
+                       committed_chk_id = CommittedChunkId}) ->
     #{name => Name,
       external_reference => ExtRef,
       replica_nodes => Replicas,
@@ -370,7 +370,7 @@ format_status(#?MODULE{cfg = #cfg{name = Name,
       num_pending_correlations => queue:len(PendingCorrs),
       num_data_listeners => length(DataListeners),
       num_offset_listeners => length(OffsetListeners),
-      committed_offset => CommittedOffset
+      committed_chunk_id => CommittedChunkId
      }.
 
 %% Internal
@@ -513,8 +513,8 @@ handle_command({call, From, get_reader_context},
                                   name = Name,
                                   directory = Dir,
                                   counter = CntRef},
-                         log = Log,
-                         committed_offset = COffs} =
+                         committed_chk_id = CChkId,
+                         log = Log} =
                     State,
                 Records,
                 Replies,
@@ -526,7 +526,8 @@ handle_command({call, From, get_reader_context},
         {reply, From,
          #{dir => Dir,
            name => Name,
-           committed_offset => max(0, COffs),
+           committed_chunk_id => max(0, CChkId),
+           committed_offset => max(0, osiris_log:committed_offset(Log)),
            shared => Shared,
            reference => Ref,
            readers_counter_fun => fun(Inc) -> counters:add(CntRef, ?C_READERS, Inc) end
@@ -589,7 +590,7 @@ notify_data_listeners(#?MODULE{log = Seg, data_listeners = L0} =
 notify_offset_listeners(#?MODULE{cfg =
                                      #cfg{reference = Ref,
                                           event_formatter = EvtFmt},
-                                 committed_offset = COffs,
+                                 committed_chk_id = COffs,
                                  offset_listeners = L0} =
                             State) ->
     {Notify, L} =