Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: neutral (athena.apache.org: local policy)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Apple Message framework v1081)
Subject: Re: svn commit: r987084 - in /couchdb/trunk/src/couchdb:
 couch_httpd_db.erl couch_stream.erl
From: Jan Lehnardt <jan@apache.org>
In-Reply-To: <20100819085511.3981623889ED@eris.apache.org>
Date: Sun, 17 Oct 2010 21:30:06 +0200
Content-Transfer-Encoding: quoted-printable
Message-Id: <EFA6A89D-071D-4033-B38D-355D1085E77A@apache.org>
References: <20100819085511.3981623889ED@eris.apache.org>
To: dev@couchdb.apache.org


On 19 Aug 2010, at 10:55, rnewson@apache.org wrote:

> Author: rnewson
> Date: Thu Aug 19 08:55:10 2010
> New Revision: 987084
>=20
> URL: http://svn.apache.org/viewvc?rev=3D987084&view=3Drev
> Log:
> Support Range header for all attachments, even without compaction =
upgrade. It's just less efficient.

How much "less"?

Cheers
Jan
--=20


>=20
> Modified:
>    couchdb/trunk/src/couchdb/couch_httpd_db.erl
>    couchdb/trunk/src/couchdb/couch_stream.erl
>=20
> Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
> URL: =
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?=
rev=3D987084&r1=3D987083&r2=3D987084&view=3Ddiff
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
> +++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Thu Aug 19 08:55:10 =
2010
> @@ -883,7 +883,8 @@ db_attachment_req(#httpd{method=3D'GET',mo
>         Headers =3D [
>             {"ETag", Etag},
>             {"Cache-Control", "must-revalidate"},
> -            {"Content-Type", binary_to_list(Type)}
> +            {"Content-Type", binary_to_list(Type)},
> +            {"Accept-Ranges", "bytes"}
>         ] ++ case ReqAcceptsAttEnc of
>         true ->
>             [{"Content-Encoding", atom_to_list(Enc)}];
> @@ -925,22 +926,13 @@ db_attachment_req(#httpd{method=3D'GET',mo
>                     AttFun(Att, fun(Seg, _) -> send_chunk(Resp, Seg) =
end, {ok, Resp}),
>                     last_chunk(Resp);
>                 _ ->
> -                    #att{data=3D{_,StreamInfo}} =3D Att, %% layering =
violation
> -                    SupportsRange =3D case StreamInfo of
> -                        [{_,_}|_] -> true;
> -                        _ -> false
> -                    end,
>                     Ranges =3D MochiReq:get(range),
>                     HasSingleRange =3D case Ranges of
>                         [_] -> true;
>                         _ -> false
>                     end,
> -                    Headers1 =3D case SupportsRange of
> -                        false ->[{<<"Accept-Ranges">>, <<"none">>}] =
++ Headers;
> -                        true -> [{<<"Accept-Ranges">>, <<"bytes">>}] =
++ Headers
> -                    end,
>                     if
> -                        Enc =3D=3D identity andalso SupportsRange =3D=3D=
 true andalso HasSingleRange =3D=3D true ->
> +                        Enc =3D=3D identity andalso HasSingleRange =3D=3D=
 true ->
>                             [{From, To}] =3D Ranges,
>                             {From1, To1} =3D case {From, To} of
>                                 {none, To} ->
> @@ -956,13 +948,13 @@ db_attachment_req(#httpd{method=3D'GET',mo
>                                 true ->
>                                     ok
>                             end,
> -                            Headers2 =3D [{<<"Content-Range">>,
> +                            Headers1 =3D [{<<"Content-Range">>,
>                                 ?l2b(io_lib:format("bytes ~B-~B/~B", =
[From1, To1, Len]))}]
> -                                ++ Headers1,
> -                            {ok, Resp} =3D start_response_length(Req, =
206, Headers2, To1 - From1 + 1),
> +                                ++ Headers,
> +                            {ok, Resp} =3D start_response_length(Req, =
206, Headers1, To1 - From1 + 1),
>                             couch_doc:range_att_foldl(Att, From1, To1 =
+ 1, fun(Seg, _) -> send(Resp, Seg) end, {ok, Resp});
>                         true ->
> -                            {ok, Resp} =3D start_response_length(Req, =
200, Headers1, Len),
> +                            {ok, Resp} =3D start_response_length(Req, =
200, Headers, Len),
>                             AttFun(Att, fun(Seg, _) -> send(Resp, Seg) =
end, {ok, Resp})
>                     end
>                 end
>=20
> Modified: couchdb/trunk/src/couchdb/couch_stream.erl
> URL: =
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_stream.erl?re=
v=3D987084&r1=3D987083&r2=3D987084&view=3Ddiff
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- couchdb/trunk/src/couchdb/couch_stream.erl (original)
> +++ couchdb/trunk/src/couchdb/couch_stream.erl Thu Aug 19 08:55:10 =
2010
> @@ -129,6 +129,9 @@ range_foldl(Fd, PosList, From, To, Fun,=20
>=20
> range_foldl(_Fd, _PosList, _From, To, Off, _Fun, Acc) when Off >=3D To =
->
>     Acc;
> +range_foldl(Fd, [Pos|Rest], From, To, Off, Fun, Acc) when =
is_integer(Pos) -> % old-style attachment
> +    {ok, Bin} =3D couch_file:pread_iolist(Fd, Pos),
> +    range_foldl(Fd, [{Pos, iolist_size(Bin)}] ++ Rest, From, To, Off, =
Fun, Acc);
> range_foldl(Fd, [{_Pos, Size}|Rest], From, To, Off, Fun, Acc) when =
=46rom > Off + Size ->
>     range_foldl(Fd, Rest, From, To, Off + Size, Fun, Acc);
> range_foldl(Fd, [{Pos, Size}|Rest], From, To, Off, Fun, Acc) ->
>=20
>=20