remove the fd tuple. Do not need it

Author: SimonUnge

src/osiris_log.erl

@@ -505,8 +505,8 @@ init(#{dir := Dir,
                                 segment_size = {Size, NumChunks},
                                 current_epoch = Epoch},
                      current_file = filename:basename(Filename),
-                     segment_io = {fd, SegFd},
-                     index_io = {fd, IdxFd}};
+                     segment_io = SegFd,
+                     index_io = IdxFd};
         {1, #seg_info{file = Filename,
                       index = IdxFilename,
                       last = undefined}, _} ->
@@ -528,8 +528,8 @@ init(#{dir := Dir,
                                 tail_info = {DefaultNextOffset, empty},
                                 current_epoch = Epoch},
                      current_file = filename:basename(Filename),
-                     segment_io = {fd, SegFd},
-                     index_io = {fd, IdxFd}}
+                     segment_io = SegFd,
+                     index_io = IdxFd}
     end.
 
 -spec write([osiris:data()], state()) -> state().
@@ -1029,8 +1029,8 @@ write_chunk(Chunk,
             NumRecords,
             #?MODULE{cfg = #cfg{counter = CntRef,
                                 shared = Shared} = Cfg,
-                     segment_io = {fd, Fd},
-                     index_io = {fd, IdxFd},
+                     segment_io = Fd,
+                     index_io = IdxFd,
                      mode =
                          #write{segment_size = {SegSizeBytes, SegSizeChunks},
                                 tail_info = {Next, _}} =
@@ -1118,9 +1118,9 @@ open_new_segment(#?MODULE{cfg = #cfg{name = Name,
     counters:add(Cnt, ?C_SEGMENTS, 1),
 
     State0#?MODULE{current_file = Filename,
-                   segment_io = {fd, Fd},
+                   segment_io = Fd,
                    %% reset segment_size counter
-                   index_io = {fd, IdxFd},
+                   index_io = IdxFd,
                    mode = Write#write{segment_size = {?LOG_HEADER_SIZE, 0}}}.
 
 throw_missing({error, enoent}) ->
@@ -1256,9 +1256,7 @@ trigger_retention_eval(#?MODULE{cfg =
 
 close_fd(undefined) ->
     ok;
-close_fd({fd, Fd}) ->
-    close_fd(Fd);
-%%TODO when is_record(IoDevice, file_descriptor)?
+%%TODO when is_record(IoDevice, file_descriptor)? Or have io type?
 close_fd(Fd) ->
     _ = file:close(Fd),
     ok.

src/osiris_log.hrl

@@ -83,9 +83,9 @@
         {cfg :: #cfg{},
          mode :: #read{} | #write{},
          current_file :: undefined | file:filename_all(),
-         index_io :: undefined | {fd, file:io_device()} | {callback, function()},
+         index_io :: undefined | file:io_device(),
          %% Should the FDs be moved to the write and read config?
-         segment_io :: undefined | {fd, file:io_device()} | {callback, function()}
+         segment_io :: undefined | file:io_device()
         }).
 %% record chunk_info does not map exactly to an index record (field 'num' differs)
 -record(chunk_info,

src/osiris_log_read.erl

@@ -113,7 +113,7 @@ init_data_reader_at(ChunkId, FilePos, File,
                             chunk_selector = all,
                             position = FilePos,
                             transport = maps:get(transport, Config, tcp)},
-                        segment_io = {fd, Fd}}};
+                        segment_io = Fd}};
         Err ->
             Err
     end.
@@ -313,7 +313,7 @@ open_offset_reader_at(SegmentFile, NextChunkId, FilePos,
                                next_offset = NextChunkId,
                                transport = maps:get(transport, Options, tcp),
                                filter = FilterMatcher},
-                    segment_io = {fd, Fd}}}.
+                    segment_io = Fd}}.
 
 %% Searches the index files backwards for the ID of the last user chunk.
 last_user_chunk_location(Name, RevdIdxFiles)
@@ -1277,7 +1277,7 @@ read_header0(#?LOGSTATE{cfg = #cfg{directory = Dir,
                                      position = Pos,
                                      filter = Filter} = Read0,
                         current_file = CurFile,
-                        segment_io = {fd, Fd}} =
+                        segment_io = Fd} =
                  State) ->
     %% reads the next header if permitted
     case can_read_next(State) of
@@ -1373,7 +1373,7 @@ read_header0(#?LOGSTATE{cfg = #cfg{directory = Dir,
                                                       position = ?LOG_HEADER_SIZE},
                                     read_header0(
                                       State#?LOGSTATE{current_file = SegFile,
-                                                    segment_io = {fd, Fd2},
+                                                    segment_io = Fd2,
                                                     mode = Read});
                                 {error, enoent} ->
                                     {end_of_stream, State}
@@ -1442,7 +1442,7 @@ chunk_iterator(#?LOGSTATE{cfg = #cfg{},
            filter_size := FilterSize,
            position := Pos,
            next_position := NextPos} = Header,
-         #?LOGSTATE{segment_io = {fd, Fd}, mode = #read{next_offset = ChId} = Read} = State1} ->
+         #?LOGSTATE{segment_io = Fd, mode = #read{next_offset = ChId} = Read} = State1} ->
             State = State1#?LOGSTATE{mode = Read#read{next_offset = ChId + NumRecords,
                                                          position = NextPos}},
             case needs_handling(RType, Selector, ChType) of
@@ -1479,7 +1479,7 @@ read_chunk(#?LOGSTATE{cfg = #cfg{}} = State0) ->
            position := Pos,
            next_position := NextPos,
            trailer_size := TrailerSize},
-         #?LOGSTATE{segment_io = {fd, Fd}, mode = #read{next_offset = ChId} = Read} = State} ->
+         #?LOGSTATE{segment_io =  Fd, mode = #read{next_offset = ChId} = Read} = State} ->
             ToRead = ?HEADER_SIZE_B + FilterSize + DataSize + TrailerSize,
             {ok, ChData} = file:pread(Fd, Pos, ToRead),
             <<_:?HEADER_SIZE_B/binary,
@@ -1640,7 +1640,7 @@ send_file(Sock,
                position := Pos,
                next_position := NextPos,
                header_data := HeaderData} = Header,
-         #?LOGSTATE{segment_io = {fd, Fd},
+         #?LOGSTATE{segment_io = Fd,
                        mode = #read{next_offset = ChId} = Read0} = State1} ->
             %% read header
             %% used to write frame headers to socket