diff options
author | John Christopher Anderson <jchris@apache.org> | 2009-02-13 03:55:36 +0000 |
---|---|---|
committer | John Christopher Anderson <jchris@apache.org> | 2009-02-13 03:55:36 +0000 |
commit | 76508853716f2c0567bb08dfb586a6f326ee54e2 (patch) | |
tree | 3826927aa79d2cb2c7ea3e3405e4c9a2538c08d6 /src/couchdb/couch_db.erl | |
parent | da592618240eb9b8c165905f1d9ab4c4a3665b02 (diff) |
Accept standalone attachment PUTs with Transfer-Encoding: chunked
Includes a patch to mochiweb_request that is under review for inclusion upstream.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@743971 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db.erl')
-rw-r--r-- | src/couchdb/couch_db.erl | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl index c35bb913..e9612b47 100644 --- a/src/couchdb/couch_db.erl +++ b/src/couchdb/couch_db.erl @@ -24,7 +24,6 @@ -export([start_link/3,make_doc/2,set_admins/2,get_admins/1,ensure_full_commit/1]). -export([init/1,terminate/2,handle_call/3,handle_cast/2,code_change/3,handle_info/2]). - -include("couch_db.hrl"). @@ -400,8 +399,14 @@ doc_flush_binaries(Doc, Fd) -> % written to a different file SizeAcc + Len; {_Key, {_Type, Bin}} when is_binary(Bin) -> + % we have a new binary to write SizeAcc + size(Bin); + {_Key, {_Type, {Fun, undefined}}} when is_function(Fun) -> + % function without a known length + % we'll have to alloc as we go with this one, for now, nothing + SizeAcc; {_Key, {_Type, {Fun, Len}}} when is_function(Fun) -> + % function to yield binary data with known length SizeAcc + Len end end, @@ -409,7 +414,6 @@ doc_flush_binaries(Doc, Fd) -> {ok, OutputStream} = couch_stream:open(Fd), ok = couch_stream:ensure_buffer(OutputStream, PreAllocSize), - NewBins = lists:map( fun({Key, {Type, BinValue}}) -> NewBinValue = @@ -436,6 +440,18 @@ doc_flush_binaries(Doc, Fd) -> Bin when is_binary(Bin) -> {ok, StreamPointer} = couch_stream:write(OutputStream, Bin), {Fd, StreamPointer, size(Bin)}; + {StreamFun, undefined} when is_function(StreamFun) -> + % we will throw an error if the client + % sends a chunk larger than this size + MaxChunkSize = list_to_integer(couch_config:get("couchdb", + "max_attachment_chunk_size","4294967296")), + WriterFun = make_writer_fun(OutputStream), + % StreamFun(MaxChunkSize, WriterFun) + % will call our WriterFun + % once for each chunk of the attachment. + {ok, {TotalLength, NewStreamPointer}} = + StreamFun(MaxChunkSize, WriterFun, {0, nil}), + {Fd, NewStreamPointer, TotalLength}; {Fun, Len} when is_function(Fun) -> {ok, StreamPointer} = write_streamed_attachment(OutputStream, Fun, Len, nil), @@ -445,8 +461,27 @@ doc_flush_binaries(Doc, Fd) -> end, Bins), {ok, _FinalPos} = couch_stream:close(OutputStream), - Doc#doc{attachments = NewBins}. + + +make_writer_fun(Stream) -> + % WriterFun({Length, Binary}, State) + % WriterFun({0, _Footers}, State) + % Called with Length == 0 on the last time. + % WriterFun returns NewState. + fun + ({0, _Footers}, {FinalLen, SpFin}) -> + % last block, return the final tuple + {ok, {FinalLen, SpFin}}; + ({Length, Bin}, {Total, nil}) -> + % save StreamPointer + {ok, StreamPointer} = couch_stream:write(Stream, Bin), + {Total+Length, StreamPointer}; + ({Length, Bin}, {Total, SpAcc}) -> + % write the Bin to disk + {ok, _Sp} = couch_stream:write(Stream, Bin), + {Total+Length, SpAcc} + end. write_streamed_attachment(_Stream, _F, 0, SpAcc) -> {ok, SpAcc}; |