X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=store.h;h=1ef5db46a5f6eb2cb39ec99dcf347b4bdbbff492;hb=da87780779a2f165503d019ee0b59d10e5d31ec8;hp=516a20c76a8d21c76efb4edb69c25e445becd8c4;hpb=51859528c5de1c90c553d1f174869005711f162a;p=cumulus.git

diff --git a/store.h b/store.h
index 516a20c..1ef5db4 100644
--- a/store.h
+++ b/store.h
@@ -6,8 +6,8 @@
  * is built on top of libtar, and represents segments as TAR files and objects
  * as files within them. */
 
-#ifndef _LBS_TARSTORE_H
-#define _LBS_TARSTORE_H
+#ifndef _LBS_STORE_H
+#define _LBS_STORE_H
 
 #include <stdint.h>
 #include <libtar.h>
@@ -20,6 +20,7 @@
 #include <sstream>
 
 #include "sha1.h"
+#include "ref.h"
 
 class LbsObject;
 
@@ -59,7 +60,6 @@ public:
 private:
     size_t size;
     std::string segment_name;
-    std::ostringstream checksums;
     TAR *t;
 };
 
@@ -73,9 +73,8 @@ public:
     // (segment/object) to refer to it.  The optional parameter group can be
     // used to control object placement; objects with different group
     // parameters are kept in separate segments.
-    std::string write_object(const char *data, size_t len,
-                             const std::string &group = "",
-                             const std::list<std::string> &refs = norefs);
+    ObjectReference write_object(const char *data, size_t len,
+                                 const std::string &group = "");
 
     // Ensure all segments have been fully written.
     void sync();
@@ -84,17 +83,12 @@ private:
     struct segment_info {
         Tarfile *file;
         std::string name;           // UUID
-        std::set<std::string> refs; // Other segments this one refers to
         int count;                  // Objects written to this segment
     };
 
     std::string path;
     std::map<std::string, struct segment_info *> segments;
 
-    // An empty list which can be used as an argument to write_object to
-    // indicate that this object depends on no others.
-    static std::list<std::string> norefs;
-
     // Ensure that all segments in the given group have been fully written.
     void close_segment(const std::string &group);
 
@@ -120,23 +114,21 @@ public:
     // incrementally.  Data can be an arbitrary block of binary data of any
     // size.  The pointer to the data need only remain valid until write() is
     // called.
-    //const char *get_data() const { return data; }
-    //size_t get_data_len() const { return data_len; }
     void set_data(const char *d, size_t len) { data = d; data_len = len; }
 
     // Write an object to a segment, thus making it permanent.  This function
     // can be called at most once.
     void write(TarSegmentStore *store);
 
+    // Compute the checksum of an object, and include it in the object
+    // reference.  This should be called after write(), and the data specified
+    // by set_data() must remain valid through the call to checksum().
+    void checksum();
+
     // An object is assigned a permanent name once it has been written to a
     // segment.  Until that time, its name cannot be determined.
-    std::string get_name() const { return name; }
-
-    // Logically, one object may reference other objects (such as a metadata
-    // listing referncing actual file data blocks).  Such references should be
-    // noted explicitly.  It may eventually be used to build up a tree of
-    // checksums for later verifying integrity.
-    void add_reference(const LbsObject *o);
+    std::string get_name() const { return ref.to_string(); }
+    ObjectReference get_ref() { return ref; }
 
 private:
     std::string group;
@@ -144,7 +136,7 @@ private:
     size_t data_len;
 
     bool written;
-    std::string name;
+    ObjectReference ref;
 };
 
-#endif // _LBS_TARSTORE_H
+#endif // _LBS_STORE_H