Change SegRef structure

From {ra:range(), list()} -> {binary(), ra:range()}

Author: kjnilsson

docs/internals/COMPACTION.md

@@ -75,7 +75,7 @@ higher numbered segments (003, 004) will then have a symlink created (e.g. 003.l
 pointing to the lowest numbered segment (002)
 then the link is renamed to the source file: `003.link -> 003` (NB not atomic).
 
-`002-003-004.compacting` is then deleted (but 002 is still hard linked so the data
+`001-002-003.compacting` is then deleted (but 002 is still hard linked so the data
 will remain).
 
 This naming format means it is easy to identify partially compacted segments

src/ra_log.erl

@@ -64,7 +64,7 @@
 -define(WAL_RESEND_TIMEOUT, 5000).
 
 -type ra_meta_key() :: atom().
--type segment_ref() :: {ra_range:range(), File :: file:filename_all()}.
+-type segment_ref() :: {File :: binary(), ra_range:range()}.
 -type event_body() :: {written, ra_term(), ra_seq:state()} |
                       {segments, [{ets:tid(), ra:range()}], [segment_ref()]} |
                       {resend_write, ra_index()} |
@@ -234,13 +234,13 @@ init(#{uid := UId,
     %% TODO: check ra_range:add/2 actually performas the correct logic we expect
     Range = ra_range:add(MtRange, SegmentRange),
 
-    %% TODO: review this
+    %% TODO: review thi
     [begin
          ?DEBUG("~ts: deleting overwritten segment ~w",
                 [LogId, SR]),
          catch prim_file:delete(filename:join(Dir, F))
      end
-     || {_, F} = SR <- SegRefs -- ra_log_segments:segment_refs(Reader)],
+     || {F, _} = SR <- SegRefs -- ra_log_segments:segment_refs(Reader)],
 
     %% assert there is no gap between the snapshot
     %% and the first index in the log
@@ -813,7 +813,7 @@ handle_event({segments, TidRanges, NewSegs},
                            [LogId, SR]),
                     catch prim_file:delete(filename:join(Dir, F))
                    end
-                   || {_, F} = SR <- OverwrittenSegRefs],
+                   || {F, _} = SR <- OverwrittenSegRefs],
                   ok
           end,
     {State, [{bg_work, Fun, fun (_Err) -> ok end}]};
@@ -833,12 +833,12 @@ handle_event({segments_to_be_deleted, SegRefs},
     %% open a new segment with the new max open segment value
     Fun = fun () ->
                   [prim_file:delete(filename:join(Dir, F))
-                   || {_, F} <- SegRefs],
+                   || {F, _} <- SegRefs],
                   ok
           end,
     {State#?MODULE{reader = ra_log_segments:init(UId, Dir, MaxOpenSegments,
-                                              random,
-                                              ActiveSegs, Names, Counter)},
+                                                 random,
+                                                 ActiveSegs, Names, Counter)},
 
     [{bg_work, Fun, fun (_Err) -> ok end}]};
 handle_event({snapshot_written, {SnapIdx, _} = Snap, LiveIndexes, SnapKind},
@@ -1337,7 +1337,7 @@ schedule_compaction(SnapIdx, #?MODULE{cfg = #cfg{uid = _UId,
             %% never compact the current segment
             %% only take those who have a range lower than the snapshot index as
             %% we never want to compact more than that
-            SegRefs = lists:takewhile(fun ({{_Start, End}, _}) ->
+            SegRefs = lists:takewhile(fun ({_Fn, {_Start, End}}) ->
                                               End =< SnapIdx
                                       end, lists:reverse(Compactable)),
             % SnapDir = ra_snapshot:current_snapshot_dir(SnapState),
@@ -1348,12 +1348,8 @@ schedule_compaction(SnapIdx, #?MODULE{cfg = #cfg{uid = _UId,
             Self = self(),
             Fun =
             fun () ->
-                    % {ok, Indexes} = ra_snapshot:indexes(SnapDir),
-
-                    %% get all current segrefs
-                    % AllSegRefs = my_segrefs(UId, SegWriter),
                     Delete = lists:foldl(
-                               fun({Range, _} = S, Del) ->
+                               fun({_Fn, Range} = S, Del) ->
                                        case ra_seq:in_range(Range,
                                                             LiveIndexes) of
                                            [] ->

src/ra_log_segment.erl

@@ -446,7 +446,7 @@ segref(#state{range = undefined}) ->
     undefined;
 segref(#state{range = Range,
               cfg = #cfg{filename = Fn}}) ->
-    {Range, filename:basename(Fn)};
+    {ra_lib:to_binary(filename:basename(Fn)), Range};
 segref(Filename) ->
     {ok, Seg} = open(Filename, #{mode => read}),
     SegRef = segref(Seg),

src/ra_log_segment_writer.erl

@@ -183,7 +183,7 @@ handle_cast({mem_tables, UIdTidRanges, WalFile},
            "~s in ~bms",
           [System, length(RangesList), WalFile, Diff]),
     {noreply, State};
-handle_cast({truncate_segments, Who, {_Range, Name} = SegRef},
+handle_cast({truncate_segments, Who, {Name, _Range} = SegRef},
             #state{segment_conf = SegConf,
                    system = System} = State0) ->
     %% remove all segments below the provided SegRef
@@ -192,7 +192,7 @@ handle_cast({truncate_segments, Who, {_Range, Name} = SegRef},
     Files = segments_for(Who, State0),
     {_Keep, Discard} = lists:splitwith(
                          fun (F) ->
-                                 ra_lib:to_string(filename:basename(F)) =/= Name
+                                 ra_lib:to_binary(filename:basename(F)) =/= Name
                          end, lists:reverse(Files)),
     case Discard of
         [] ->
@@ -303,7 +303,7 @@ flush_mem_table_ranges({ServerUId, TidSeqs0},
     %% order they are kept by the ra_log
     SegRefs = lists:reverse(
                 lists:foldl(
-                  fun ({_, FILE}, [{_, FILE} | _] = Acc) ->
+                  fun ({FILE, _}, [{FILE, _} | _] = Acc) ->
                           Acc;
                       (Seg, Acc) ->
                           [Seg | Acc]