This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch fix-erlang-21-eunit-failures
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 5c93d7c3c49801a955c1a4a9d8ae266f2d3bbe69
Author: Paul J. Davis <paul.joseph.da...@gmail.com>
AuthorDate: Thu Jun 21 13:02:01 2018 -0500
Fix Mochiweb parameterized module errors
---
src/chttpd/src/chttpd.erl | 3 +++
src/chttpd/src/chttpd_db.erl | 3 +++
src/chttpd/src/chttpd_external.erl | 2 ++
src/chttpd/src/chttpd_prefer_header.erl | 11 ++++++-----
src/chttpd/src/chttpd_rewrite.erl | 3 +++
src/chttpd/test/chttpd_prefer_header_test.erl | 7 +++++--
src/couch/src/couch_httpd.erl | 3 +++
src/couch/src/couch_httpd_auth.erl | 5 ++++-
src/couch/src/couch_httpd_db.erl | 3 +++
src/couch/src/couch_httpd_proxy.erl | 6 ++++--
src/couch/src/couch_httpd_rewrite.erl | 15 +++++++++------
src/couch/src/couch_httpd_vhost.erl | 2 ++
src/fabric/src/fabric_doc_attachments.erl | 2 ++
src/fabric/src/fabric_doc_atts.erl | 2 ++
14 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/src/chttpd/src/chttpd.erl b/src/chttpd/src/chttpd.erl
index ae94ae6..658b63c 100644
--- a/src/chttpd/src/chttpd.erl
+++ b/src/chttpd/src/chttpd.erl
@@ -11,6 +11,9 @@
% the License.
-module(chttpd).
+
+-compile(tuple_calls).
+
-include_lib("couch/include/couch_db.hrl").
-include_lib("chttpd/include/chttpd.hrl").
diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl
index ed0adea..228ebf1 100644
--- a/src/chttpd/src/chttpd_db.erl
+++ b/src/chttpd/src/chttpd_db.erl
@@ -11,6 +11,9 @@
% the License.
-module(chttpd_db).
+
+-compile(tuple_calls).
+
-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
diff --git a/src/chttpd/src/chttpd_external.erl
b/src/chttpd/src/chttpd_external.erl
index 64664b9..fa35c6b 100644
--- a/src/chttpd/src/chttpd_external.erl
+++ b/src/chttpd/src/chttpd_external.erl
@@ -12,6 +12,8 @@
-module(chttpd_external).
+-compile(tuple_calls).
+
-export([handle_external_req/2, handle_external_req/3]).
-export([send_external_response/2]).
-export([json_req_obj_fields/0, json_req_obj/2, json_req_obj/3,
json_req_obj/4]).
diff --git a/src/chttpd/src/chttpd_prefer_header.erl
b/src/chttpd/src/chttpd_prefer_header.erl
index f550e80..9028e41 100644
--- a/src/chttpd/src/chttpd_prefer_header.erl
+++ b/src/chttpd/src/chttpd_prefer_header.erl
@@ -12,6 +12,7 @@
-module(chttpd_prefer_header).
+-compile(tuple_calls).
-export([
maybe_return_minimal/2
@@ -23,9 +24,9 @@
maybe_return_minimal(#httpd{mochi_req = MochiReq}, Headers) ->
case get_prefer_header(MochiReq) of
- "return=minimal" ->
+ "return=minimal" ->
filter_headers(Headers, get_header_list());
- _ ->
+ _ ->
Headers
end.
@@ -34,13 +35,13 @@ get_prefer_header(Req) ->
case Req:get_header_value("Prefer") of
Value when is_list(Value) ->
string:to_lower(Value);
- undefined ->
+ undefined ->
undefined
end.
filter_headers(Headers, IncludeList) ->
- lists:filter(fun({HeaderName, _}) ->
+ lists:filter(fun({HeaderName, _}) ->
lists:member(HeaderName, IncludeList)
end, Headers).
@@ -51,4 +52,4 @@ get_header_list() ->
split_list(S) ->
- re:split(S, "\\s*,\\s*", [trim, {return, list}]).
+ re:split(S, "\\s*,\\s*", [trim, {return, list}]).
diff --git a/src/chttpd/src/chttpd_rewrite.erl
b/src/chttpd/src/chttpd_rewrite.erl
index 039390e..08c9ef3 100644
--- a/src/chttpd/src/chttpd_rewrite.erl
+++ b/src/chttpd/src/chttpd_rewrite.erl
@@ -16,6 +16,9 @@
%% @doc Module for URL rewriting by pattern matching.
-module(chttpd_rewrite).
+
+-compile(tuple_calls).
+
-export([handle_rewrite_req/3]).
-include_lib("couch/include/couch_db.hrl").
diff --git a/src/chttpd/test/chttpd_prefer_header_test.erl
b/src/chttpd/test/chttpd_prefer_header_test.erl
index a8a5b3d..d4fc290 100644
--- a/src/chttpd/test/chttpd_prefer_header_test.erl
+++ b/src/chttpd/test/chttpd_prefer_header_test.erl
@@ -11,6 +11,9 @@
% the License.
-module(chttpd_prefer_header_test).
+
+-compile(tuple_calls).
+
-include_lib("couch/include/couch_db.hrl").
-include_lib("eunit/include/eunit.hrl").
@@ -48,7 +51,7 @@ minimal_options_headers() ->
default_no_exclude_header_test() ->
Headers = chttpd_prefer_header:maybe_return_minimal(
- mock_request([]),
+ mock_request([]),
default_headers()
),
?assertEqual(default_headers(), Headers).
@@ -67,7 +70,7 @@ empty_header_test() ->
setup() ->
ok = meck:new(config),
- ok = meck:expect(config, get, fun("chttpd", "prefer_minimal", _) ->
+ ok = meck:expect(config, get, fun("chttpd", "prefer_minimal", _) ->
"Cache-Control, Content-Length, Content-Type, ETag, Server, Vary"
end),
ok.
diff --git a/src/couch/src/couch_httpd.erl b/src/couch/src/couch_httpd.erl
index 050282a..b4f01af 100644
--- a/src/couch/src/couch_httpd.erl
+++ b/src/couch/src/couch_httpd.erl
@@ -11,6 +11,9 @@
% the License.
-module(couch_httpd).
+
+-compile(tuple_calls).
+
-include_lib("couch/include/couch_db.hrl").
-export([start_link/0, start_link/1, stop/0, handle_request/5]).
diff --git a/src/couch/src/couch_httpd_auth.erl
b/src/couch/src/couch_httpd_auth.erl
index 74cbe5a..21119af 100644
--- a/src/couch/src/couch_httpd_auth.erl
+++ b/src/couch/src/couch_httpd_auth.erl
@@ -11,6 +11,9 @@
% the License.
-module(couch_httpd_auth).
+
+-compile(tuple_calls).
+
-include_lib("couch/include/couch_db.hrl").
-export([party_mode_handler/1]).
@@ -148,7 +151,7 @@ proxy_authentication_handler(Req) ->
%% @deprecated
proxy_authentification_handler(Req) ->
proxy_authentication_handler(Req).
-
+
proxy_auth_user(Req) ->
XHeaderUserName = config:get("couch_httpd_auth", "x_auth_username",
"X-Auth-CouchDB-UserName"),
diff --git a/src/couch/src/couch_httpd_db.erl b/src/couch/src/couch_httpd_db.erl
index 99b1192..220a032 100644
--- a/src/couch/src/couch_httpd_db.erl
+++ b/src/couch/src/couch_httpd_db.erl
@@ -11,6 +11,9 @@
% the License.
-module(couch_httpd_db).
+
+-compile(tuple_calls).
+
-include_lib("couch/include/couch_db.hrl").
-export([handle_request/1, handle_compact_req/2, handle_design_req/2,
diff --git a/src/couch/src/couch_httpd_proxy.erl
b/src/couch/src/couch_httpd_proxy.erl
index 7e9aed7..db650da 100644
--- a/src/couch/src/couch_httpd_proxy.erl
+++ b/src/couch/src/couch_httpd_proxy.erl
@@ -11,6 +11,8 @@
% the License.
-module(couch_httpd_proxy).
+-compile(tuple_calls).
+
-export([handle_proxy_req/2]).
-include_lib("couch/include/couch_db.hrl").
@@ -38,7 +40,7 @@ handle_proxy_req(Req, ProxyDest) ->
{error, Reason} ->
throw({error, Reason})
end.
-
+
get_method(#httpd{mochi_req=MochiReq}) ->
case MochiReq:get(method) of
@@ -146,7 +148,7 @@ stream_chunked_body({stream, MReq, 0, Buf, BRem}) ->
case CRem of
0 ->
BodyData = lists:reverse(Buf, Data),
- {ok, BodyData, {trailers, MReq, [], ?PKT_SIZE}};
+ {ok, BodyData, {trailers, MReq, [], ?PKT_SIZE}};
_ ->
stream_chunked_body(
{stream, MReq, CRem, [Data | Buf], BRem-size(Data)}
diff --git a/src/couch/src/couch_httpd_rewrite.erl
b/src/couch/src/couch_httpd_rewrite.erl
index e2a2421..a162443 100644
--- a/src/couch/src/couch_httpd_rewrite.erl
+++ b/src/couch/src/couch_httpd_rewrite.erl
@@ -16,6 +16,9 @@
%% @doc Module for URL rewriting by pattern matching.
-module(couch_httpd_rewrite).
+
+-compile(tuple_calls).
+
-export([handle_rewrite_req/3]).
-include_lib("couch/include/couch_db.hrl").
@@ -278,7 +281,7 @@ replace_var(Value, Bindings, Formats) when is_list(Value) ->
end, [], Value));
replace_var(Value, _Bindings, _Formats) ->
Value.
-
+
maybe_json(Key, Value) ->
case lists:member(Key, [<<"key">>, <<"startkey">>, <<"start_key">>,
<<"endkey">>, <<"end_key">>, <<"keys">>]) of
@@ -321,7 +324,7 @@ format(<<"bool">>, Value) when is_list(Value) ->
_ -> Value
end;
format(_Format, Value) ->
- Value.
+ Value.
%% doc: build new patch from bindings. bindings are query args
%% (+ dynamic query rewritten if needed) and bindings found in
@@ -337,7 +340,7 @@ make_new_path([?MATCH_ALL|_Rest], _Bindings, Remaining,
Acc) ->
make_new_path([{bind, P}|Rest], Bindings, Remaining, Acc) ->
P2 = case couch_util:get_value({bind, P}, Bindings) of
undefined -> << "undefined">>;
- P1 ->
+ P1 ->
iolist_to_binary(P1)
end,
make_new_path(Rest, Bindings, Remaining, [P2|Acc]);
@@ -455,15 +458,15 @@ path_to_list([P|R], Acc, DotDotCount) ->
maybe_encode_bindings([]) ->
[];
-maybe_encode_bindings(Props) ->
- lists:foldl(fun
+maybe_encode_bindings(Props) ->
+ lists:foldl(fun
({{bind, <<"*">>}, _V}, Acc) ->
Acc;
({{bind, K}, V}, Acc) ->
V1 = iolist_to_binary(maybe_json(K, V)),
[{K, V1}|Acc]
end, [], Props).
-
+
decode_query_value({K,V}) ->
case lists:member(K, ["key", "startkey", "start_key",
"endkey", "end_key", "keys"]) of
diff --git a/src/couch/src/couch_httpd_vhost.erl
b/src/couch/src/couch_httpd_vhost.erl
index f23f41d..d8f9521 100644
--- a/src/couch/src/couch_httpd_vhost.erl
+++ b/src/couch/src/couch_httpd_vhost.erl
@@ -15,6 +15,8 @@
-vsn(1).
-behaviour(config_listener).
+-compile(tuple_calls).
+
-export([start_link/0, reload/0, get_state/0, dispatch_host/1]).
-export([urlsplit_netloc/2, redirect_to_vhost/2]).
-export([host/1, split_host_port/1]).
diff --git a/src/fabric/src/fabric_doc_attachments.erl
b/src/fabric/src/fabric_doc_attachments.erl
index 7c6ba66..723b9e8 100644
--- a/src/fabric/src/fabric_doc_attachments.erl
+++ b/src/fabric/src/fabric_doc_attachments.erl
@@ -12,6 +12,8 @@
-module(fabric_doc_attachments).
+-compile(tuple_calls).
+
-include_lib("fabric/include/fabric.hrl").
-include_lib("couch/include/couch_db.hrl").
diff --git a/src/fabric/src/fabric_doc_atts.erl
b/src/fabric/src/fabric_doc_atts.erl
index 7ef5dd8..a3aae80 100644
--- a/src/fabric/src/fabric_doc_atts.erl
+++ b/src/fabric/src/fabric_doc_atts.erl
@@ -12,6 +12,8 @@
-module(fabric_doc_atts).
+-compile(tuple_calls).
+
-include_lib("fabric/include/fabric.hrl").
-include_lib("couch/include/couch_db.hrl").
