Merge osiris_log.hrl back into osiris.hrl

Author: the-mikedavis

src/osiris.hrl

@@ -47,6 +47,24 @@
 -define(FILE_OPTS_WRITE, [raw, binary, write, read]).
 -define(INDEX_RECORD_SIZE_B, 29).
 
+%% record chunk_info does not map exactly to an index record (field 'num' differs)
+-record(chunk_info,
+        {id :: osiris:offset(),
+         timestamp :: non_neg_integer(),
+         epoch :: osiris:epoch(),
+         num :: non_neg_integer(),
+         type :: osiris_log:chunk_type(),
+         %% size of data + filter + trailer
+         size :: non_neg_integer(),
+         %% position in segment file
+         pos :: integer()
+        }).
+-record(seg_info,
+        {file :: file:filename_all(),
+         size = 0 :: non_neg_integer(),
+         index :: file:filename_all(),
+         first :: undefined | #chunk_info{},
+         last :: undefined | #chunk_info{}}).
 
 %% chunk types
 -define(CHNK_USER, 0).

src/osiris_log.erl

@@ -8,7 +8,6 @@
 -module(osiris_log).
 
 -include("src/osiris.hrl").
--include("src/osiris_log.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -export([init/1,

src/osiris_log.hrl

@@ -1,6 +1,6 @@
 -module(osiris_log_manifest).
 
--include("src/osiris_log.hrl").
+-include("src/osiris.hrl").
 
 -type log_kind() :: writer | acceptor | data_reader | offset_reader.