From commits-return-2451-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Tue May 12 22:45:57 2009 Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 77781 invoked from network); 12 May 2009 22:45:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 May 2009 22:45:49 -0000 Received: (qmail 52897 invoked by uid 500); 12 May 2009 22:45:42 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 49768 invoked by uid 500); 12 May 2009 22:45:32 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 48477 invoked by uid 99); 12 May 2009 22:45:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2009 22:45:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2009 22:45:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC9B5238894E; Tue, 12 May 2009 21:38:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r774101 - in /couchdb/trunk: share/www/script/couch_tests.js share/www/script/test/reduce_builtin.js src/couchdb/couch_query_servers.erl Date: Tue, 12 May 2009 21:38:43 -0000 To: commits@couchdb.apache.org From: jchris@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090512213843.DC9B5238894E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jchris Date: Tue May 12 21:38:43 2009 New Revision: 774101 URL: http://svn.apache.org/viewvc?rev=774101&view=rev Log: You can now specify either "_sum" or "_count" as the source code for 2 built-in Erlang reduce functions. The framework is ready for YOU to add more built in reductions. The short list includes: _avg, _stddev, _min, and _max. We could also have one function that does all that in a single function, but it might not be as fun to use. Added: couchdb/trunk/share/www/script/test/reduce_builtin.js (with props) Modified: couchdb/trunk/share/www/script/couch_tests.js couchdb/trunk/src/couchdb/couch_query_servers.erl Modified: couchdb/trunk/share/www/script/couch_tests.js URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=774101&r1=774100&r2=774101&view=diff ============================================================================== --- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original) +++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Tue May 12 21:38:43 2009 @@ -37,6 +37,7 @@ loadTest("lots_of_docs.js"); loadTest("reduce.js"); loadTest("reduce_false.js"); +loadTest("reduce_builtin.js"); loadTest("design_options.js"); loadTest("multiple_rows.js"); loadTest("large_docs.js"); Added: couchdb/trunk/share/www/script/test/reduce_builtin.js URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/reduce_builtin.js?rev=774101&view=auto ============================================================================== --- couchdb/trunk/share/www/script/test/reduce_builtin.js (added) +++ couchdb/trunk/share/www/script/test/reduce_builtin.js Tue May 12 21:38:43 2009 @@ -0,0 +1,119 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. + +couchTests.reduce_builtin = function(debug) { + var db = new CouchDB("test_suite_db"); + db.deleteDb(); + db.createDb(); + if (debug) debugger; + + var numDocs = 500 + var docs = makeDocs(1,numDocs + 1); + db.bulkSave(docs); + + var summate = function(N) {return (N+1)*N/2;}; + + // this is the same test as the reduce.js test + // only we'll let CouchDB run reduce in Erlang + var map = function (doc) { + emit(doc.integer, doc.integer); + emit(doc.integer, doc.integer)}; + + var result = db.query(map, "_sum"); + T(result.rows[0].value == 2*summate(numDocs)); + result = db.query(map, "_count"); + T(result.rows[0].value == 1000); + + result = db.query(map, "_sum", {startkey: 4, endkey: 4}); + T(result.rows[0].value == 8); + result = db.query(map, "_count", {startkey: 4, endkey: 4}); + T(result.rows[0].value == 2); + + result = db.query(map, "_sum", {startkey: 4, endkey: 5}); + T(result.rows[0].value == 18); + result = db.query(map, "_count", {startkey: 4, endkey: 5}); + T(result.rows[0].value == 4); + + result = db.query(map, "_sum", {startkey: 4, endkey: 6}); + T(result.rows[0].value == 30); + result = db.query(map, "_count", {startkey: 4, endkey: 6}); + T(result.rows[0].value == 6); + + result = db.query(map, "_sum", {group:true, limit:3}); + T(result.rows[0].value == 2); + T(result.rows[1].value == 4); + T(result.rows[2].value == 6); + + for(var i=1; i + fun + (<<"_", _/binary>> = FunSrc, Values) -> + {ok, [Result]} = builtin_reduce(rereduce, [FunSrc], [[[], V] || V <- Values], []), + Result; + (FunSrc, Values) -> [true, [Result]] = couch_os_process:prompt(Pid, [<<"rereduce">>, [FunSrc], Values]), Result @@ -99,15 +103,53 @@ reduce(_Lang, [], _KVs) -> {ok, []}; reduce(Lang, RedSrcs, KVs) -> + {OsRedSrcs, BuiltinReds} = lists:partition(fun + (<<"_", _/binary>>) -> false; + (_OsFun) -> true + end, RedSrcs), + {ok, OsResults} = os_reduce(Lang, OsRedSrcs, KVs), + {ok, BuiltinResults} = builtin_reduce(reduce, BuiltinReds, KVs, []), + recombine_reduce_results(RedSrcs, OsResults, BuiltinResults, []). + +recombine_reduce_results([], [], [], Acc) -> + {ok, lists:reverse(Acc)}; +recombine_reduce_results([<<"_", _/binary>>|RedSrcs], OsResults, [BRes|BuiltinResults], Acc) -> + recombine_reduce_results(RedSrcs, OsResults, BuiltinResults, [BRes|Acc]); +recombine_reduce_results([_OsFun|RedSrcs], [OsR|OsResults], BuiltinResults, Acc) -> + recombine_reduce_results(RedSrcs, OsResults, BuiltinResults, [OsR|Acc]). + +os_reduce(Lang, [], KVs) -> + {ok, []}; +os_reduce(Lang, OsRedSrcs, KVs) -> Pid = get_os_process(Lang), - Results = try couch_os_process:prompt(Pid, - [<<"reduce">>, RedSrcs, KVs]) of + OsResults = try couch_os_process:prompt(Pid, + [<<"reduce">>, OsRedSrcs, KVs]) of [true, Reductions] -> Reductions after ok = ret_os_process(Lang, Pid) end, - {ok, Results}. + {ok, OsResults}. +builtin_reduce(_Re, [], KVs, Acc) -> + {ok, lists:reverse(Acc)}; +builtin_reduce(Re, [<<"_sum">>|BuiltinReds], KVs, Acc) -> + Sum = builtin_sum_rows(KVs), + builtin_reduce(Re, BuiltinReds, KVs, [Sum|Acc]); +builtin_reduce(reduce, [<<"_count">>|BuiltinReds], KVs, Acc) -> + Count = length(KVs), + builtin_reduce(reduce, BuiltinReds, KVs, [Count|Acc]); +builtin_reduce(rereduce, [<<"_count">>|BuiltinReds], KVs, Acc) -> + Count = builtin_sum_rows(KVs), + builtin_reduce(rereduce, BuiltinReds, KVs, [Count|Acc]). + +builtin_sum_rows(KVs) -> + lists:foldl(fun + ([_Key, Value], Acc) when is_number(Value) -> + Acc + Value; + (_Else, _Acc) -> + throw({invalid_value, <<"builtin _sum function requires map values to be numbers">>}) + end, 0, KVs). + validate_doc_update(Lang, FunSrc, EditDoc, DiskDoc, Ctx) -> Pid = get_os_process(Lang), JsonEditDoc = couch_doc:to_json_obj(EditDoc, [revs]),