Assorted minor code cleanups.

[cumulus.git] / ref.cc

diff --git a/ref.cc b/ref.cc
index ff710d2..3019c20 100644 (file)
--- a/ref.cc
+++ b/ref.cc
@@ -28,6 +28,10 @@ string generate_uuid()
     return string(buf);
 }
 
+ObjectReference::ObjectReference()
+    : segment(""), object("")
+{
+}
 
 ObjectReference::ObjectReference(const std::string& segment, int sequence)
     : segment(segment)
@@ -50,6 +54,9 @@ ObjectReference::ObjectReference(const std::string& segment,
 
 string ObjectReference::to_string() const
 {
+    if (is_null())
+        return "/";
+
     string result = segment + "/" + object;
 
     if (checksum_valid)
@@ -67,8 +74,107 @@ string ObjectReference::to_string() const
 /* Parse a string object reference and return a pointer to a new
  * ObjectReference.  The caller is responsible for freeing the object.  NULL is
  * returned if there is an error in the syntax. */
-ObjectReference *ObjectReference::parse(const std::string& s)
+ObjectReference ObjectReference::parse(const std::string& str)
 {
-    // TODO: Implement
-    return NULL;
+    const char *s = str.c_str();
+    const char *t;
+
+    // Segment
+    t = s;
+    while ((*t >= '0' && *t <= '9') || (*t >= 'a' && *t <= 'f') || (*t == '-'))
+        t++;
+    if (*t != '/')
+        return ObjectReference();
+    string segment(s, t - s);
+
+    // Object sequence number
+    t++;
+    s = t;
+    while ((*t >= '0' && *t <= '9') || (*t >= 'a' && *t <= 'f'))
+        t++;
+    if (*t != '\0' && *t != '(' && *t != '[')
+        return ObjectReference();
+    string object(s, t - s);
+
+    // Checksum
+    string checksum;
+    if (*t == '(') {
+        t++;
+        s = t;
+        while (*t != ')' && *t != '\0')
+            t++;
+        if (*t != ')')
+            return ObjectReference();
+        checksum = string(s, t - s);
+        t++;
+    }
+
+    // Range
+    bool have_range = false;
+    int64_t range1, range2;
+    if (*t == '[') {
+        t++;
+        s = t;
+        while (*t >= '0' && *t <= '9')
+            t++;
+        if (*t != '+')
+            return ObjectReference();
+
+        string val(s, t - s);
+        range1 = atoll(val.c_str());
+
+        t++;
+        s = t;
+        while (*t >= '0' && *t <= '9')
+            t++;
+        if (*t != ']')
+            return ObjectReference();
+
+        val = string(s, t - s);
+        range2 = atoll(val.c_str());
+
+        have_range = true;
+    }
+
+    ObjectReference ref(segment, object);
+    if (checksum.size() > 0)
+        ref.set_checksum(checksum);
+
+    if (have_range)
+        ref.set_range(range1, range2);
+
+    return ref;
+}
+
+/* Attempt to merge a new object reference into the current one.  Returns a
+ * boolean indicating success; if successful this reference is modified so that
+ * it refers to the range of bytes originally covered by this reference plus
+ * the reference passed in.  Merging only succeeds if both references refer to
+ * the same object and the byte ranges are contiguous. */
+bool ObjectReference::merge(ObjectReference ref)
+{
+    // Exception: We can always merge into a null object
+    if (is_null()) {
+        *this = ref;
+        return true;
+    }
+
+    if (segment != ref.segment)
+        return false;
+    if (object != ref.object)
+        return false;
+
+    // TODO: Allow the case where only one checksum was filled in
+    if (checksum_valid != ref.checksum_valid || checksum != ref.checksum)
+        return false;
+
+    if (!range_valid || !ref.range_valid)
+        return false;
+
+    if (range_start + range_length == ref.range_start) {
+        range_length += ref.range_length;
+        return true;
+    } else {
+        return false;
+    }
 }