Commit d69d0185d147a435e2851b1d9f38dddc838959f9
2011-04-04T13:05:20
Add a fake wstream to the ODB Streaming writes will no longer fail when writing to a backend that doesn't support streaming writes but supports direct ones. Now we create a fake stream on memory and then write it as a single block using the backend `write` callback.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
diff --git a/src/odb.c b/src/odb.c
index 33d5468..43d0ef9 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -149,6 +149,69 @@ int git_odb_hash(git_oid *id, const void *data, size_t len, git_otype type)
return git_odb__hash_obj(id, hdr, sizeof(hdr), &hdrlen, &raw);
}
+/**
+ * FAKE WSTREAM
+ */
+
+typedef struct {
+ git_odb_stream stream;
+ char *buffer;
+ size_t size, written;
+ git_otype type;
+} fake_wstream;
+
+static int fake_wstream__fwrite(git_oid *oid, git_odb_stream *_stream)
+{
+ fake_wstream *stream = (fake_wstream *)_stream;
+ return _stream->backend->write(oid, _stream->backend, stream->buffer, stream->size, stream->type);
+}
+
+static int fake_wstream__write(git_odb_stream *_stream, const char *data, size_t len)
+{
+ fake_wstream *stream = (fake_wstream *)_stream;
+
+ if (stream->written + len >= stream->size)
+ return GIT_ENOMEM;
+
+ memcpy(stream->buffer + stream->written, data, len);
+ stream->written += len;
+ return GIT_SUCCESS;
+}
+
+static void fake_wstream__free(git_odb_stream *_stream)
+{
+ fake_wstream *stream = (fake_wstream *)_stream;
+
+ free(stream->buffer);
+ free(stream);
+}
+
+static int init_fake_wstream(git_odb_stream **stream_p, git_odb_backend *backend, size_t size, git_otype type)
+{
+ fake_wstream *stream;
+
+ stream = git__calloc(1, sizeof(fake_wstream));
+ if (stream == NULL)
+ return GIT_ENOMEM;
+
+ stream->size = size;
+ stream->type = type;
+ stream->buffer = git__malloc(size);
+ if (stream->buffer == NULL) {
+ free(stream);
+ return GIT_ENOMEM;
+ }
+
+ stream->stream.backend = backend;
+ stream->stream.read = NULL; /* read only */
+ stream->stream.write = &fake_wstream__write;
+ stream->stream.finalize_write = &fake_wstream__fwrite;
+ stream->stream.free = &fake_wstream__free;
+ stream->stream.mode = GIT_STREAM_WRONLY;
+
+ *stream_p = (git_odb_stream *)stream;
+ return GIT_SUCCESS;
+}
/***********************************************************
*
@@ -467,6 +530,8 @@ int git_odb_open_wstream(git_odb_stream **stream, git_odb *db, size_t size, git_
if (b->writestream != NULL)
error = b->writestream(stream, b, size, type);
+ else if (b->write != NULL)
+ error = init_fake_wstream(stream, b, size, type);
}
return error;