Merge pull request #5627 from apache/nouveau-improvements

Nouveau improvements

Author: rnewson

src/nouveau/src/nouveau_api.erl

@@ -217,37 +217,20 @@ set_seq(#index{} = Index, ReqBody) ->
 %% private functions
 
 index_path(Path) when is_binary(Path) ->
-    lists:flatten(
-        io_lib:format(
-            "/index/~s",
-            [
-                couch_util:url_encode(Path)
-            ]
-        )
-    );
+    [<<"/index/">>, couch_util:url_encode(Path)];
 index_path(#index{} = Index) ->
-    lists:flatten(
-        io_lib:format(
-            "/index/~s",
-            [
-                couch_util:url_encode(nouveau_util:index_name(Index))
-            ]
-        )
-    ).
+    [<<"/index/">>, couch_util:url_encode(nouveau_util:index_name(Index))].
 
 doc_path(#index{} = Index, DocId) ->
-    lists:flatten(
-        io_lib:format(
-            "/index/~s/doc/~s",
-            [
-                couch_util:url_encode(nouveau_util:index_name(Index)),
-                couch_util:url_encode(DocId)
-            ]
-        )
-    ).
+    [
+        <<"/index/">>,
+        couch_util:url_encode(nouveau_util:index_name(Index)),
+        <<"/doc/">>,
+        couch_util:url_encode(DocId)
+    ].
 
-search_path(IndexName) ->
-    index_path(IndexName) ++ "/search".
+search_path(#index{} = Index) ->
+    [index_path(Index), <<"/search">>].
 
 jaxrs_error(400, Body) ->
     {bad_request, message(Body)};
@@ -281,6 +264,9 @@ send_if_enabled(Path, ReqHeaders, Method) ->
     send_if_enabled(Path, ReqHeaders, Method, <<>>).
 
 send_if_enabled(Path, ReqHeaders, Method, ReqBody) ->
+    send_if_enabled(Path, ReqHeaders, Method, ReqBody, 5).
+
+send_if_enabled(Path, ReqHeaders, Method, ReqBody, RemainingTries) ->
     case nouveau:enabled() of
         true ->
             case
@@ -306,6 +292,9 @@ send_if_enabled(Path, ReqHeaders, Method, ReqBody) ->
                         {error, Reason} ->
                             {error, Reason}
                     end;
+                {error, no_connection_available, _Reason} when RemainingTries > 0 ->
+                    timer:sleep(1000),
+                    send_if_enabled(Path, ReqHeaders, Method, ReqBody, RemainingTries - 1);
                 {error, _Type, Reason} ->
                     {error, Reason}
             end;

src/nouveau/src/nouveau_util.erl

@@ -73,16 +73,15 @@ design_doc_to_index(DbName, #doc{id = Id, body = {Fields}}, IndexName) ->
                 undefined ->
                     {error, InvalidDDocError};
                 Def ->
-                    Sig = ?l2b(
-                        couch_util:to_hex(
+                    Sig =
+                        couch_util:to_hex_bin(
                             crypto:hash(
                                 sha256,
                                 ?term_to_bin(
                                     {DefaultAnalyzer, FieldAnalyzers, Def}
                                 )
                             )
-                        )
-                    ),
+                        ),
                     {ok, #index{
                         dbname = DbName,
                         default_analyzer = DefaultAnalyzer,