couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject svn commit: r962965 - in /couchdb/trunk/src/couchdb: couch_httpd_db.erl couch_query_servers.erl
Date Sun, 11 Jul 2010 01:02:14 GMT
Author: kocolosk
Date: Sun Jul 11 01:02:14 2010
New Revision: 962965

URL: http://svn.apache.org/viewvc?rev=962965&view=rev
Log:
thank you dialyzer

Modified:
    couchdb/trunk/src/couchdb/couch_httpd_db.erl
    couchdb/trunk/src/couchdb/couch_query_servers.erl

Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=962965&r1=962964&r2=962965&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Sun Jul 11 01:02:14 2010
@@ -970,9 +970,7 @@ db_attachment_req(#httpd{method=Method,m
                         end,
                         
                         
-                        fun() -> couch_httpd:recv(Req, 0) end;
-                    Length ->
-                        exit({length_not_integer, Length})
+                        fun() -> couch_httpd:recv(Req, 0) end
                     end,
                 att_len = case couch_httpd:header_value(Req,"Content-Length") of
                     undefined ->

Modified: couchdb/trunk/src/couchdb/couch_query_servers.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_query_servers.erl?rev=962965&r1=962964&r2=962965&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_query_servers.erl (original)
+++ couchdb/trunk/src/couchdb/couch_query_servers.erl Sun Jul 11 01:02:14 2010
@@ -130,8 +130,6 @@ os_reduce(Lang, OsRedSrcs, KVs) ->
     end,
     {ok, OsResults}.
 
-os_rereduce(_Lang, [], _KVs) ->
-    {ok, []};
 os_rereduce(Lang, OsRedSrcs, KVs) ->
     Proc = get_os_process(Lang),
     try proc_prompt(Proc, [<<"rereduce">>, OsRedSrcs, KVs]) of
@@ -275,23 +273,15 @@ handle_call({get_proc, #doc{body={Props}
     case ets:lookup(LangProcs, Lang) of
     [{Lang, [P|Rest]}] ->
         % find a proc in the set that has the DDoc
-        case proc_with_ddoc(DDoc, DDocKey, [P|Rest]) of
-        {ok, Proc} ->
-            rem_from_list(LangProcs, Lang, Proc),
-            {reply, {ok, Proc, get_query_server_config()}, Server};
-        Error ->
-            {reply, Error, Server}
-        end;
+        {ok, Proc} = proc_with_ddoc(DDoc, DDocKey, [P|Rest]),
+        rem_from_list(LangProcs, Lang, Proc),
+        {reply, {ok, Proc, get_query_server_config()}, Server};
     _ ->
         case (catch new_process(Langs, Lang)) of
         {ok, Proc} ->
             add_value(PidProcs, Proc#proc.pid, Proc),
-            case proc_with_ddoc(DDoc, DDocKey, [Proc]) of
-            {ok, Proc2} ->
-                {reply, {ok, Proc2, get_query_server_config()}, Server};
-            Error ->
-                {reply, Error, Server}
-            end;
+            {ok, Proc2} = proc_with_ddoc(DDoc, DDocKey, [Proc]),
+            {reply, {ok, Proc2, get_query_server_config()}, Server};
         Error ->
             {reply, Error, Server}
         end



Mime
View raw message