summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2019-02-25 18:37:48 +0000
committerRobert Newson <rnewson@apache.org>2019-02-25 18:37:48 +0000
commit50682f928e6d2b371415c53cca2180c14bdd3408 (patch)
tree2471a7af94136eee3004ff2d34e415e8d4a794c7
parent390b91949220366a0c64aa74bffb46fa0b22c4b6 (diff)
downloadcouchdb-50682f928e6d2b371415c53cca2180c14bdd3408.tar.gz
Fix compilation errors and use of macro
A bit of confusion with HAS_ and HAVE_ led to me not noticing that the dreyfus/hastings bits didn't compile.
-rw-r--r--src/ken_server.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ken_server.erl b/src/ken_server.erl
index 25da5ac06..91f18c16b 100644
--- a/src/ken_server.erl
+++ b/src/ken_server.erl
@@ -309,15 +309,15 @@ update_ddoc_indexes(Name, #doc{}=Doc, State) ->
false ->
ok
end,
- SearchUpdated = search_updated(Doc, Seq, State),
- STUpdated = st_updated(Doc, Seq, State),
+ SearchUpdated = search_updated(Name, Doc, Seq, State),
+ STUpdated = st_updated(Name, Doc, Seq, State),
case {ViewUpdated, SearchUpdated, STUpdated} of
{ok, ok, ok} -> ok;
_ -> resubmit
end.
--ifdef(HAS_DREYFUS).
-search_updated(Doc, Seq, State) ->
+-ifdef(HAVE_DREYFUS).
+search_updated(Name, Doc, Seq, State) ->
case should_update(Doc, <<"indexes">>) of true ->
try dreyfus_index:design_doc_to_indexes(Doc) of
SIndexes -> update_ddoc_search_indexes(Name, SIndexes, Seq, State)
@@ -332,8 +332,8 @@ search_updated(_Doc, _Seq, _State) ->
ok.
-endif.
--ifdef(HAS_HASTINGS).
-st_updated(Doc, Seq, State) ->
+-ifdef(HAVE_HASTINGS).
+st_updated(Name, Doc, Seq, State) ->
case should_update(Doc, <<"st_indexes">>) of true ->
try
hastings_index:design_doc_to_indexes(Doc) of