diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-10-30 11:00:07 -0500 |
|---|---|---|
| committer | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-12-20 15:23:58 -0600 |
| commit | 96877dc8d60fc097672b831f3c1d41407f88c3c9 (patch) | |
| tree | 5767b97fa6087d77f0d44f33f408dcb14587d8dd | |
| parent | 1bdca62752f03db145d14252d9c233ffcbce779c (diff) | |
| download | couchdb-96877dc8d60fc097672b831f3c1d41407f88c3c9.tar.gz | |
Remove deprecated clauses
Co-authored-by: Garren Smith <garren.smith@gmail.com>
| -rw-r--r-- | src/clouseau_rpc.erl | 11 | ||||
| -rw-r--r-- | src/dreyfus_index.erl | 37 |
2 files changed, 6 insertions, 42 deletions
diff --git a/src/clouseau_rpc.erl b/src/clouseau_rpc.erl index 345b499e6..38bf651d4 100644 --- a/src/clouseau_rpc.erl +++ b/src/clouseau_rpc.erl @@ -18,8 +18,8 @@ -include("dreyfus.hrl"). -export([open_index/3]). --export([await/2, commit/2, get_update_seq/1, info/1, search/6, search/2]). --export([group1/7, group2/8, group2/2]). +-export([await/2, commit/2, get_update_seq/1, info/1, search/2]). +-export([group1/7, group2/2]). -export([delete/2, update/3, cleanup/1, cleanup/2, rename/1]). -export([analyze/2, version/0, disk_size/1]). -export([set_purge_seq/2, get_purge_seq/1, get_root_dir/0]). @@ -50,10 +50,6 @@ set_purge_seq(Ref, Seq) -> get_purge_seq(Ref) -> rpc(Ref, get_purge_seq). -%% @deprecated -search(Ref, Query, Limit, Refresh, Bookmark, Sort) -> - rpc(Ref, {search, Query, Limit, Refresh, Bookmark, Sort}). - search(Ref, Args) -> case rpc(Ref, {search, Args}) of {ok, Response} when is_list(Response) -> @@ -71,9 +67,6 @@ search(Ref, Args) -> group1(Ref, Query, GroupBy, Refresh, Sort, Offset, Limit) -> rpc(Ref, {group1, Query, GroupBy, Refresh, Sort, Offset, Limit}). -group2(Ref, Query, GroupBy, Refresh, Groups, GroupSort, DocSort, DocLimit) -> - rpc(Ref, {group2, Query, GroupBy, Refresh, Groups, GroupSort, DocSort, DocLimit}). - group2(Ref, Args) -> rpc(Ref, {group2, Args}). diff --git a/src/dreyfus_index.erl b/src/dreyfus_index.erl index c6d4d856a..32ab40f08 100644 --- a/src/dreyfus_index.erl +++ b/src/dreyfus_index.erl @@ -339,20 +339,8 @@ args_to_proplist2(#index_query_args{} = Args) -> search_int(Pid, QueryArgs0) -> QueryArgs = dreyfus_util:upgrade(QueryArgs0), - case QueryArgs of - #index_query_args{counts=nil,ranges=nil,drilldown=[],include_fields=nil, - highlight_fields=nil} -> - clouseau_rpc:search( - Pid, - QueryArgs#index_query_args.q, - QueryArgs#index_query_args.limit, - QueryArgs#index_query_args.stale =:= false, - QueryArgs#index_query_args.bookmark, - QueryArgs#index_query_args.sort); - _ -> - Props = args_to_proplist(QueryArgs), - clouseau_rpc:search(Pid, Props) - end. + Props = args_to_proplist(QueryArgs), + clouseau_rpc:search(Pid, Props). group1_int(Pid, QueryArgs0) -> QueryArgs = dreyfus_util:upgrade(QueryArgs0), @@ -371,25 +359,8 @@ group1_int(Pid, QueryArgs0) -> group2_int(Pid, QueryArgs0) -> QueryArgs = dreyfus_util:upgrade(QueryArgs0), - case QueryArgs of - #index_query_args{include_fields=nil, highlight_fields=nil} -> %remove after upgrade - #index_query_args{ - q = Query, - stale = Stale, - sort = DocSort, - limit = DocLimit, - grouping = #grouping{ - by = GroupBy, - groups = Groups, - sort = GroupSort - } - } = QueryArgs, - clouseau_rpc:group2(Pid, Query, GroupBy, Stale =:= false, Groups, - GroupSort, DocSort, DocLimit); - _ -> - Props = args_to_proplist2(QueryArgs), - clouseau_rpc:group2(Pid, Props) - end. + Props = args_to_proplist2(QueryArgs), + clouseau_rpc:group2(Pid, Props). info_int(Pid) -> clouseau_rpc:info(Pid). |