X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=store.h;h=5d877c66c4a11619a4c8f403022d74856b1750e9;hb=d60ac6ffaac11851042a5978ac10f52293a50b50;hp=e1244f0ecd7731bfdf8cec7851bcb767b143245e;hpb=7680a5bda8a87e1f5d02ea07ef767878e3bb143c;p=cumulus.git

diff --git a/store.h b/store.h
index e1244f0..5d877c6 100644
--- a/store.h
+++ b/store.h
@@ -162,7 +162,7 @@ public:
     struct uuid get_uuid() const { return id; }
 
     // Start writing out a new object to this segment.
-    OutputStream *new_object(int *id);
+    OutputStream *new_object(int *id, const char *type);
     void finish_object();
 
     // Determine size of segment data written out so far.
@@ -173,13 +173,18 @@ public:
     static std::string format_uuid(const struct uuid u);
 
 private:
-    typedef std::vector<std::pair<int64_t, int64_t> > object_table;
+    struct index_info {
+        int64_t offset;         // File offset at which object starts
+        int64_t size;           // Size of object in bytes
+        char type[4];           // Object type code
+    };
+
+    typedef std::vector<struct index_info> object_table;
 
     ChecksumOutputStream *out;  // Output stream with checksumming enabled
     OutputStream *raw_out;      // Raw output stream, without checksumming
     struct uuid id;
 
-    int64_t object_start_offset;
     OutputStream *object_stream;
 
     object_table objects;
@@ -209,7 +214,7 @@ public:
     explicit SegmentPartitioner(SegmentStore *s);
     ~SegmentPartitioner();
 
-    OutputStream *new_object(struct uuid *uuid, int *id);
+    OutputStream *new_object(struct uuid *uuid, int *id, const char *type);
 
 private:
     size_t target_size;