Remove old store implementation.

[cumulus.git] / tarstore.cc

diff --git a/tarstore.cc b/tarstore.cc
index 2c2f523..5133c66 100644 (file)
--- a/tarstore.cc
+++ b/tarstore.cc
@@ -1,5 +1,5 @@
 /* LBS: An LFS-inspired filesystem backup system
- * Copyright (C) 2006  Michael Vrable
+ * Copyright (C) 2007  Michael Vrable
  *
  * Backup data is stored in a collection of objects, which are grouped together
  * into segments for storage purposes.  This implementation of the object store
@@ -14,15 +14,22 @@
 #include <time.h>
 #include <uuid/uuid.h>
 
+#include <list>
+#include <set>
 #include <string>
 #include <iostream>
 
 #include "tarstore.h"
 
+using std::list;
+using std::set;
 using std::string;
 
+list<string> TarSegmentStore::norefs;
+
 Tarfile::Tarfile(const string &path, const string &segment)
-    : segment_name(segment)
+    : size(0),
+      segment_name(segment)
 {
     if (tar_open(&t, (char *)path.c_str(), NULL, O_WRONLY | O_CREAT, 0600,
                  TAR_VERBOSE | TAR_GNU) == -1)
@@ -73,6 +80,8 @@ void Tarfile::internal_write_object(const string &path,
     if (th_write(t) != 0)
         throw IOException("Error writing tar header");
 
+    size += T_BLOCKSIZE;
+
     if (len == 0)
         return;
 
@@ -89,10 +98,15 @@ void Tarfile::internal_write_object(const string &path,
     memcpy(block, &data[T_BLOCKSIZE * (blocks - 1)], T_BLOCKSIZE - padding);
     if (tar_block_write(t, block) == -1)
         throw IOException("Error writing final tar block");
+
+    size += blocks * T_BLOCKSIZE;
 }
 
+static const size_t SEGMENT_SIZE = 4 * 1024 * 1024;
+
 string TarSegmentStore::write_object(const char *data, size_t len, const
-                                     std::string &group)
+                                     std::string &group,
+                                     const std::list<std::string> &refs)
 {
     struct segment_info *segment;
 
@@ -124,20 +138,48 @@ string TarSegmentStore::write_object(const char *data, size_t len, const
     segment->file->write_object(id, data, len);
     segment->count++;
 
-    return segment->name + "/" + id_buf;
+    string full_name = segment->name + "/" + id_buf;
+
+    // Store any dependencies this object has on other segments, so they can be
+    // written when the segment is closed.
+    for (list<string>::const_iterator i = refs.begin(); i != refs.end(); ++i) {
+        segment->refs.insert(*i);
+    }
+
+    // If this segment meets or exceeds the size target, close it so that
+    // future objects will go into a new segment.
+    if (segment->file->size_estimate() >= SEGMENT_SIZE)
+        close_segment(group);
+
+    return full_name;
 }
 
 void TarSegmentStore::sync()
 {
-    while (!segments.empty()) {
-        const string &name = segments.begin()->first;
-        struct segment_info *segment = segments[name];
-
-        fprintf(stderr, "Closing segment group %s (%s)\n",
-                name.c_str(), segment->name.c_str());
+    while (!segments.empty())
+        close_segment(segments.begin()->first);
+}
 
-        delete segment->file;
-        segments.erase(segments.begin());
-        delete segment;
+void TarSegmentStore::close_segment(const string &group)
+{
+    struct segment_info *segment = segments[group];
+    fprintf(stderr, "Closing segment group %s (%s)\n",
+            group.c_str(), segment->name.c_str());
+
+    string reflist;
+    for (set<string>::iterator i = segment->refs.begin();
+         i != segment->refs.end(); ++i) {
+        reflist += *i + "\n";
     }
+    segment->file->internal_write_object(segment->name + "/references",
+                                         reflist.data(), reflist.size());
+
+    delete segment->file;
+    segments.erase(segments.find(group));
+    delete segment;
+}
+
+string TarSegmentStore::object_reference_to_segment(const string &object)
+{
+    return object;
 }