From 1ddca219f447d18e53c906ba09e946dbc9e61b61 Mon Sep 17 00:00:00 2001 From: Garren Smith Date: Wed, 29 Aug 2018 10:15:57 +0200 Subject: add /_partition/partition/_find and /_partition/partition/_explain endpoints --- src/chttpd/src/chttpd_db.erl | 40 ++++++++++----- src/chttpd/src/chttpd_handlers.erl | 4 ++ src/chttpd/src/chttpd_httpd_handlers.erl | 2 +- src/mango/src/mango_error.erl | 7 +++ src/mango/src/mango_httpd.erl | 85 ++++++++++++++++++++++++++++---- src/mango/src/mango_httpd_handlers.erl | 6 ++- 6 files changed, 119 insertions(+), 25 deletions(-) diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl index 60aeaa23f..f94b73686 100644 --- a/src/chttpd/src/chttpd_db.erl +++ b/src/chttpd/src/chttpd_db.erl @@ -19,7 +19,7 @@ update_doc_result_to_json/1, update_doc_result_to_json/2, handle_design_info_req/3, handle_view_cleanup_req/2, update_doc/4, http_code_from_status/1, - handle_partition_design_req/2]). + handle_partition_req/2]). -import(chttpd, [send_json/2,send_json/3,send_json/4,send_method_not_allowed/2, @@ -252,37 +252,51 @@ handle_view_cleanup_req(Req, Db) -> send_json(Req, 202, {[{ok, true}]}). -handle_partition_design_req(#httpd{ +handle_partition_req(#httpd{ path_parts=[DbName, <<"_partition">>, Partition, _Design, Name, <<"_",_/binary>> = Action | _Rest] }=Req, Db) -> - couch_doc:validate_docid(Partition, DbName), - validate_no_partition_in_qs(Req), - - case mem3:is_partitioned(DbName) of - false -> throw({bad_request, <<"Database is not partitioned">>}); - true -> ok - end, - + validate_partition_req(Req, Partition, DbName), DDoc = get_design_doc(DbName, Name), Partitioned = couch_mrview:get_partitioned_opt(DDoc#doc.body, true), case Partitioned of true -> - Handler = chttpd_handlers:partition_design_handler(Action, fun bad_action_partition_req/4), + Handler = chttpd_handlers:partition_design_handler(Action, fun bad_action_partition_design_req/4), Handler(Req, Db, DDoc, Partition); false -> throw({bad_request, <<"partition query is not supported in this design doc.">>}) end; -handle_partition_design_req(_Req, _Db) -> +handle_partition_req(#httpd{ + path_parts=[DbName, <<"_partition">>, Partition, Action | _Rest] + }=Req, Db) -> + validate_partition_req(Req, Partition, DbName), + Handler = chttpd_handlers:partition_handler(Action, fun bad_action_partition_req/3), + Handler(Req, Db, Partition); + +handle_partition_req(_Req, _Db) -> throw({bad_request, <<"missing partition key">>}). -bad_action_partition_req(Req, _Db, _DDoc, _PartitionKey) -> +bad_action_partition_design_req(Req, _Db, _DDoc, _PartitionKey) -> + chttpd:send_error(Req, 404, <<"partition_error">>, <<"Invalid path.">>). + + +bad_action_partition_req(Req, _Db, _PartitionKey) -> chttpd:send_error(Req, 404, <<"partition_error">>, <<"Invalid path.">>). +validate_partition_req(Req, Partition, DbName) -> + couch_doc:validate_docid(Partition, DbName), + validate_no_partition_in_qs(Req), + + case mem3:is_partitioned(DbName) of + false -> throw({bad_request, <<"Database is not partitioned">>}); + true -> ok + end. + + handle_design_req(#httpd{ path_parts=[_DbName, _Design, Name, <<"_",_/binary>> = Action | _Rest] }=Req, Db) -> diff --git a/src/chttpd/src/chttpd_handlers.erl b/src/chttpd/src/chttpd_handlers.erl index 5e474ac8d..f2098bef2 100644 --- a/src/chttpd/src/chttpd_handlers.erl +++ b/src/chttpd/src/chttpd_handlers.erl @@ -16,6 +16,7 @@ url_handler/2, db_handler/2, design_handler/2, + partition_handler/2, partition_design_handler/2 ]). @@ -36,6 +37,9 @@ db_handler(HandlerKey, DefaultFun) -> design_handler(HandlerKey, DefaultFun) -> select(collect(design_handler, [HandlerKey]), DefaultFun). +partition_handler(HandlerKey, DefaultFun) -> + select(collect(partition_handler, [HandlerKey]), DefaultFun). + partition_design_handler(HandlerKey, DefaultFun) -> select(collect(partition_design_handler, [HandlerKey]), DefaultFun). diff --git a/src/chttpd/src/chttpd_httpd_handlers.erl b/src/chttpd/src/chttpd_httpd_handlers.erl index 0ad499ffc..2659d39f5 100644 --- a/src/chttpd/src/chttpd_httpd_handlers.erl +++ b/src/chttpd/src/chttpd_httpd_handlers.erl @@ -32,7 +32,7 @@ url_handler(_) -> no_match. db_handler(<<"_view_cleanup">>) -> fun chttpd_db:handle_view_cleanup_req/2; db_handler(<<"_compact">>) -> fun chttpd_db:handle_compact_req/2; db_handler(<<"_design">>) -> fun chttpd_db:handle_design_req/2; -db_handler(<<"_partition">>) -> fun chttpd_db:handle_partition_design_req/2; +db_handler(<<"_partition">>) -> fun chttpd_db:handle_partition_req/2; db_handler(<<"_temp_view">>) -> fun chttpd_view:handle_temp_view_req/2; db_handler(<<"_changes">>) -> fun chttpd_db:handle_changes_req/2; db_handler(_) -> no_match. diff --git a/src/mango/src/mango_error.erl b/src/mango/src/mango_error.erl index b2bbb392a..603fb5fd4 100644 --- a/src/mango/src/mango_error.erl +++ b/src/mango/src/mango_error.erl @@ -73,6 +73,13 @@ info(mango_fields, {invalid_field_json, BadField}) -> fmt("Invalid JSON for field spec: ~w", [BadField]) }; +info(mango_httpd, partition_field_error) -> + { + 400, + <<"bad request">>, + <<"`partition` is not a valid parameter.">> + }; + info(mango_httpd, error_saving_ddoc) -> { 500, diff --git a/src/mango/src/mango_httpd.erl b/src/mango/src/mango_httpd.erl index 2e8777135..1fb152752 100644 --- a/src/mango/src/mango_httpd.erl +++ b/src/mango/src/mango_httpd.erl @@ -14,7 +14,8 @@ -export([ - handle_req/2 + handle_req/2, + handle_partition_req/3 ]). @@ -38,13 +39,7 @@ handle_req(#httpd{} = Req, Db0) -> handle_req_int(Req, Db) catch throw:{mango_error, Module, Reason} -> - case mango_error:info(Module, Reason) of - {500, ErrorStr, ReasonStr} -> - Stack = erlang:get_stacktrace(), - chttpd:send_error(Req, {ErrorStr, ReasonStr, Stack}); - {Code, ErrorStr, ReasonStr} -> - chttpd:send_error(Req, Code, ErrorStr, ReasonStr) - end + handle_req_error(Req, Module, Reason) end. @@ -58,6 +53,34 @@ handle_req_int(_, _) -> throw({not_found, missing}). +handle_partition_req(#httpd{} = Req, Db0, Partition) -> + try + Db = set_user_ctx(Req, Db0), + handle_partition_req_int(Req, Db, Partition) + catch + throw:{mango_error, Module, Reason} -> + handle_req_error(Req, Module, Reason) + end. + + +handle_partition_req_int(#httpd{path_parts=[_, _, _, <<"_explain">> | _]} = Req, Db, Partition) -> + handle_partition_explain_req(Req, Db, Partition); +handle_partition_req_int(#httpd{path_parts=[_, _, _,<<"_find">> | _]} = Req, Db, Partition) -> + handle_partition_find_req(Req, Db, Partition); +handle_partition_req_int(_, _, _) -> + throw({not_found, missing}). + + +handle_req_error(Req, Module, Reason) -> + case mango_error:info(Module, Reason) of + {500, ErrorStr, ReasonStr} -> + Stack = erlang:get_stacktrace(), + chttpd:send_error(Req, {ErrorStr, ReasonStr, Stack}); + {Code, ErrorStr, ReasonStr} -> + chttpd:send_error(Req, Code, ErrorStr, ReasonStr) + end. + + handle_index_req(#httpd{method='GET', path_parts=[_, _]}=Req, Db) -> Params = lists:flatmap(fun({K, V}) -> parse_index_param(K, V) end, chttpd:qs(Req)), @@ -170,7 +193,9 @@ handle_index_req(#httpd{path_parts=[_, _, _DDocId0, _Type, _Name]}=Req, _Db) -> handle_explain_req(#httpd{method='POST'}=Req, Db) -> chttpd:validate_ctype(Req, "application/json"), - {ok, Opts0} = mango_opts:validate_find(chttpd:json_body_obj(Req)), + {Body0} = chttpd:json_body_obj(Req), + check_for_partition_param(Body0), + {ok, Opts0} = mango_opts:validate_find({Body0}), {value, {selector, Sel}, Opts} = lists:keytake(selector, 1, Opts0), Resp = mango_crud:explain(Db, Sel, Opts), chttpd:send_json(Req, Resp); @@ -178,10 +203,24 @@ handle_explain_req(#httpd{method='POST'}=Req, Db) -> handle_explain_req(Req, _Db) -> chttpd:send_method_not_allowed(Req, "POST"). + +handle_partition_explain_req(#httpd{method='POST'}=Req, Db, Partition) -> + chttpd:validate_ctype(Req, "application/json"), + {ok, Body} = add_partition_to_query(Req, Partition), + {ok, Opts0} = mango_opts:validate_find(Body), + {value, {selector, Sel}, Opts} = lists:keytake(selector, 1, Opts0), + Resp = mango_crud:explain(Db, Sel, Opts), + chttpd:send_json(Req, Resp); + +handle_partition_explain_req(Req, _Db, _Partition) -> + chttpd:send_method_not_allowed(Req, "POST"). + handle_find_req(#httpd{method='POST'}=Req, Db) -> chttpd:validate_ctype(Req, "application/json"), - {ok, Opts0} = mango_opts:validate_find(chttpd:json_body_obj(Req)), + {Body0} = chttpd:json_body_obj(Req), + check_for_partition_param(Body0), + {ok, Opts0} = mango_opts:validate_find({Body0}), {value, {selector, Sel}, Opts} = lists:keytake(selector, 1, Opts0), {ok, Resp0} = start_find_resp(Req), {ok, AccOut} = run_find(Resp0, Db, Sel, Opts), @@ -191,6 +230,32 @@ handle_find_req(Req, _Db) -> chttpd:send_method_not_allowed(Req, "POST"). +handle_partition_find_req(#httpd{method='POST'}=Req, Db, Partition) -> + chttpd:validate_ctype(Req, "application/json"), + {ok, Body} = add_partition_to_query(Req, Partition), + {ok, Opts0} = mango_opts:validate_find(Body), + {value, {selector, Sel}, Opts} = lists:keytake(selector, 1, Opts0), + {ok, Resp0} = start_find_resp(Req), + {ok, AccOut} = run_find(Resp0, Db, Sel, Opts), + end_find_resp(AccOut); + +handle_partition_find_req(Req, _Db, _Partition) -> + chttpd:send_method_not_allowed(Req, "POST"). + +check_for_partition_param(Body) -> + case lists:keyfind(<<"partition">>, 1, Body) of + false -> ok; + _ -> ?MANGO_ERROR(partition_field_error) + end. + + +add_partition_to_query(Req, Partition) -> + {Body0} = chttpd:json_body_obj(Req), + check_for_partition_param(Body0), + Body1 = [{<<"partition">>, Partition} | Body0], + {ok, {Body1}}. + + set_user_ctx(#httpd{user_ctx=Ctx}, Db) -> {ok, NewDb} = couch_db:set_user_ctx(Db, Ctx), NewDb. diff --git a/src/mango/src/mango_httpd_handlers.erl b/src/mango/src/mango_httpd_handlers.erl index 80e5e277e..8589b7e14 100644 --- a/src/mango/src/mango_httpd_handlers.erl +++ b/src/mango/src/mango_httpd_handlers.erl @@ -12,7 +12,7 @@ -module(mango_httpd_handlers). --export([url_handler/1, db_handler/1, design_handler/1]). +-export([url_handler/1, db_handler/1, design_handler/1, partition_handler/1]). url_handler(_) -> no_match. @@ -22,3 +22,7 @@ db_handler(<<"_find">>) -> fun mango_httpd:handle_req/2; db_handler(_) -> no_match. design_handler(_) -> no_match. + +partition_handler(<<"_find">>) -> fun mango_httpd:handle_partition_req/3; +partition_handler(<<"_explain">>) -> fun mango_httpd:handle_partition_req/3; +partition_handler(_) -> no_match. -- cgit v1.2.1