svn commit: r726220 - in /couchdb/site/htdocs: community/code.html community/code.txt community/committers.html community/lists.html community/lists.txt index.html index.txt
Author: jan Date: Sat Dec 13 07:28:34 2008 New Revision: 726220 URL: http://svn.apache.org/viewvc?rev=726220&view=rev Log: updated miling list info, svn repo URL & removed incubator notice from the frontpage. Modified: couchdb/site/htdocs/community/code.html couchdb/site/htdocs/community/code.txt couchdb/site/htdocs/community/committers.html couchdb/site/htdocs/community/lists.html couchdb/site/htdocs/community/lists.txt couchdb/site/htdocs/index.html couchdb/site/htdocs/index.txt Modified: couchdb/site/htdocs/community/code.html URL: http://svn.apache.org/viewvc/couchdb/site/htdocs/community/code.html?rev=726220&r1=726219&r2=726220&view=diff == --- couchdb/site/htdocs/community/code.html (original) +++ couchdb/site/htdocs/community/code.html Sat Dec 13 07:28:34 2008 @@ -72,18 +72,18 @@ Source Code The CouchDB source code can be found in the -https://svn.apache.org/repos/asf/incubator/couchdb";>Subversion repository +https://svn.apache.org/repos/asf/couchdb";>Subversion repository which can also be -http://svn.apache.org/viewvc/incubator/couchdb/";>browsed online. +http://svn.apache.org/viewvc/couchdb/";>browsed online. You can check out the code using the svn command: -svn co http://svn.apache.org/repos/asf/incubator/couchdb/trunk couchdb +svn co http://svn.apache.org/repos/asf/couchdb/trunk couchdb -Committers should use the secure repositor: +Committers should use the secure repository: -svn co https://svn.apache.org/repos/asf/incubator/couchdb/trunk couchdb +svn co https://svn.apache.org/repos/asf/couchdb/trunk couchdb If you live near Europe you may experience a faster connection with svn.eu.apache.org. Modified: couchdb/site/htdocs/community/code.txt URL: http://svn.apache.org/viewvc/couchdb/site/htdocs/community/code.txt?rev=726220&r1=726219&r2=726220&view=diff == --- couchdb/site/htdocs/community/code.txt (original) +++ couchdb/site/htdocs/community/code.txt Sat Dec 13 07:28:34 2008 @@ -6,17 +6,17 @@ = The CouchDB source code can be found in the -[Subversion repository](https://svn.apache.org/repos/asf/incubator/couchdb) +[Subversion repository](https://svn.apache.org/repos/asf/couchdb) which can also be -[browsed online](http://svn.apache.org/viewvc/incubator/couchdb/). +[browsed online](http://svn.apache.org/viewvc/couchdb/). You can check out the code using the `svn` command: -svn co http://svn.apache.org/repos/asf/incubator/couchdb/trunk couchdb +svn co http://svn.apache.org/repos/asf/couchdb/trunk couchdb -Committers should use the secure repositor: +Committers should use the secure repository: -svn co https://svn.apache.org/repos/asf/incubator/couchdb/trunk couchdb +svn co https://svn.apache.org/repos/asf/couchdb/trunk couchdb If you live near Europe you may experience a faster connection with `svn.eu.apache.org`. Modified: couchdb/site/htdocs/community/committers.html URL: http://svn.apache.org/viewvc/couchdb/site/htdocs/community/committers.html?rev=726220&r1=726219&r2=726220&view=diff == --- couchdb/site/htdocs/community/committers.html (original) +++ couchdb/site/htdocs/community/committers.html Sat Dec 13 07:28:34 2008 @@ -71,29 +71,29 @@ Committers -http://jchris.mfdz.com";>J. Chris Anderson, jchris@apache.org +http://jchris.mfdz.com";>J. Chris Anderson, jchris@apache.org Upgraded the Erlang JSON term format. Integrates community patches, particularly related to the HTTP API and the MapReduce system. Give talks and presentations about CouchDB, with an eye toward recruiting more developers. -http://damienkatz.net/";>Damien Katz, damien@apache.org +http://damienkatz.net/";>Damien Katz, damien@apache.org Original developer and remains the project lead. -http://jan.prima.de/";>Jan Lehnardt, jan@apache.org +http://jan.prima.de/";>Jan Lehnardt, jan@apache.org Worked on the original UNIX port and now works on all ends in CouchDB. He is a freelancing CouchDB consultant and gives presentations around the world. -http://www.cmlenz.net/";>Christopher Lenz, cmlenz@apache.org +http://www.cmlenz.net/";>Christopher Lenz, cmlenz@apache.org Developed and maintains Futon, the Web administration console. He works on the JavaScript view engine, SpiderMonkey and MochiWeb integration in addition to an external Python client. -http://bytesexual.org/nslater";>Noah Slater, nslater@apache.org +http://bytesexual.org/nslater";>Noah Slater, nslater@apache.org Developed and maintains the Autotools build system and application infrastructure. He is CouchDB’s rel
svn commit: r727050 - /couchdb/trunk/src/couchdb/couch_file.erl
Author: jan
Date: Tue Dec 16 05:42:35 2008
New Revision: 727050
URL: http://svn.apache.org/viewvc?rev=727050&view=rev
Log:
do not fail on heavily loaded systems. wait forever for syscalls to return
Modified:
couchdb/trunk/src/couchdb/couch_file.erl
Modified: couchdb/trunk/src/couchdb/couch_file.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_file.erl?rev=727050&r1=727049&r2=727050&view=diff
==
--- couchdb/trunk/src/couchdb/couch_file.erl (original)
+++ couchdb/trunk/src/couchdb/couch_file.erl Tue Dec 16 05:42:35 2008
@@ -56,7 +56,7 @@
%%--
pread(Fd, Pos, Bytes) when Bytes > 0 ->
-gen_server:call(Fd, {pread, Pos, Bytes}).
+gen_server:call(Fd, {pread, Pos, Bytes}, infinity).
%%--
@@ -67,7 +67,7 @@
%%--
pwrite(Fd, Pos, Bin) ->
-gen_server:call(Fd, {pwrite, Pos, Bin}).
+gen_server:call(Fd, {pwrite, Pos, Bin}, infinity).
%%--
%% Purpose: To append a segment of zeros to the end of the file.
@@ -78,7 +78,7 @@
%%--
expand(Fd, Bytes) when Bytes > 0 ->
-gen_server:call(Fd, {expand, Bytes}).
+gen_server:call(Fd, {expand, Bytes}, infinity).
%%--
@@ -135,7 +135,7 @@
% length in bytes
bytes(Fd) ->
-gen_server:call(Fd, bytes).
+gen_server:call(Fd, bytes, infinity).
%%--
%% Purpose: Truncate a file to the number of bytes.
@@ -144,7 +144,7 @@
%%--
truncate(Fd, Pos) ->
-gen_server:call(Fd, {truncate, Pos}).
+gen_server:call(Fd, {truncate, Pos}, infinity).
%%--
%% Purpose: Ensure all bytes written to the file are flushed to disk.
svn commit: r729992 - in /couchdb/trunk: share/www/script/couch_tests.js src/couchdb/couch_httpd_db.erl
Author: jan
Date: Mon Dec 29 12:14:37 2008
New Revision: 729992
URL: http://svn.apache.org/viewvc?rev=729992&view=rev
Log:
add etags to standalone attachment requests. Closes COUCHDB-184
Modified:
couchdb/trunk/share/www/script/couch_tests.js
couchdb/trunk/src/couchdb/couch_httpd_db.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=729992&r1=729991&r2=729992&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Mon Dec 29 12:14:37
2008
@@ -795,11 +795,13 @@
}
}
-T(db.save(binAttDoc).ok);
+var save_response = db.save(binAttDoc);
+T(save_response.ok);
var xhr = CouchDB.request("GET", "/test_suite_db/bin_doc/foo.txt");
T(xhr.responseText == "This is a base64 encoded text");
T(xhr.getResponseHeader("Content-Type") == "text/plain");
+T(xhr.getResponseHeader("Etag") == save_response.rev);
// empty attachment
var binAttDoc2 = {
Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=729992&r1=729991&r2=729992&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Mon Dec 29 12:14:37 2008
@@ -513,12 +513,13 @@
db_attachment_req(#httpd{method='GET'}=Req, Db, DocId, FileNameParts) ->
FileName = list_to_binary(mochiweb_util:join(lists:map(fun
binary_to_list/1, FileNameParts),"/")),
case couch_db:open_doc(Db, DocId, []) of
-{ok, #doc{attachments=Attachments}} ->
+{ok, #doc{attachments=Attachments, revs=[LastRev|_OldRevs]}} ->
case proplists:get_value(FileName, Attachments) of
undefined ->
throw({not_found, "Document is missing attachment"});
{Type, Bin} ->
{ok, Resp} = start_chunked_response(Req, 200, [
+{"ETag", binary_to_list(LastRev)},
{"Cache-Control", "must-revalidate"},
{"Content-Type", binary_to_list(Type)}%,
% My understanding of http://www.faqs.org/rfcs/rfc2616.html
svn commit: r731521 - in /couchdb/trunk: src/couchdb/couch_config_writer.erl test/couch_config_writer_test.erl
Author: jan
Date: Mon Jan 5 02:38:39 2009
New Revision: 731521
URL: http://svn.apache.org/viewvc?rev=731521&view=rev
Log:
Fix ini-section duplication. When we tried to assign a value to a config-item
that happened to be set to that value already, a new and duplicated ini section
with that config parameter was written to the ini file.
Modified:
couchdb/trunk/src/couchdb/couch_config_writer.erl
couchdb/trunk/test/couch_config_writer_test.erl
Modified: couchdb/trunk/src/couchdb/couch_config_writer.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_config_writer.erl?rev=731521&r1=731520&r2=731521&view=diff
==
--- couchdb/trunk/src/couchdb/couch_config_writer.erl (original)
+++ couchdb/trunk/src/couchdb/couch_config_writer.erl Mon Jan 5 02:38:39 2009
@@ -42,11 +42,15 @@
% produce the contents for the config file
NewFileContents =
-case NewFileContents2 = save_loop({{SectionName, OptionList}, Value},
Lines, "", "", []) of
+case {NewFileContents2, DoneOptions} = save_loop({{SectionName,
OptionList}, Value}, Lines, "", "", []) of
% we didn't change anything, that means we couldn't find a matching
% [ini section] in which case we just append a new one.
-OldFileContents ->
-append_new_ini_section({{SectionName, OptionList}, Value},
OldFileContents);
+{OldFileContents, DoneOptions} ->
+% but only if we haven't actually written anything.
+case lists:member(OptionList, DoneOptions) of
+true -> OldFileContents;
+_ -> append_new_ini_section({{SectionName, OptionList},
Value}, OldFileContents)
+end;
_ ->
NewFileContents2
end,
@@ -110,9 +114,9 @@
case lists:member(Option, DoneOptions) of
% append Deferred Option
false when Section == OldSection ->
-NewFileContents ++ "\n" ++ Option ++ " = " ++ Value ++ "\n";
+{NewFileContents ++ "\n" ++ Option ++ " = " ++ Value ++ "\n",
DoneOptions};
% we're out of new lines, just return the new file's contents
-_ -> NewFileContents
+_ -> {NewFileContents, DoneOptions}
end.
append_new_ini_section({{SectionName, Option}, Value}, OldFileContents) ->
Modified: couchdb/trunk/test/couch_config_writer_test.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/test/couch_config_writer_test.erl?rev=731521&r1=731520&r2=731521&view=diff
======
--- couchdb/trunk/test/couch_config_writer_test.erl (original)
+++ couchdb/trunk/test/couch_config_writer_test.erl Mon Jan 5 02:38:39 2009
@@ -11,7 +11,8 @@
fun() -> replace_existing_variable3() end,
fun() -> append_new_variable() end,
fun() -> append_new_module() end,
-fun() -> overwrite_variable_further_down() end
+fun() -> overwrite_variable_further_down() end,
+fun() -> double_append_new_section_bug() end
].
@@ -149,6 +150,33 @@
",
run_operation_and_compare_results(Contents, Expect, [{{"erlang",
"option"}, "value"}, {{"erlang", "option2"}, "value2"}]).
+double_append_new_section_bug() ->
+% create file
+Contents = "[section]
+variable = value
+
+[another_section]
+another_var = another_value
+
+[erlang]
+option = value
+
+option2 = value2
+",
+
+Expect = "[section]
+variable = value
+
+[another_section]
+another_var = another_value
+
+[erlang]
+option = value
+
+option2 = value2
+",
+run_operation_and_compare_results(Contents, Expect, [{{"another_section",
"another_var"}, "another_value"}]).
+
run_operation_and_compare_results(Contents, Expect, Config) when not
is_list(Config) ->
run_operation_and_compare_results(Contents, Expect, [Config]);
svn commit: r732528 - /couchdb/trunk/src/couchdb/Makefile.am
Author: jan Date: Wed Jan 7 14:02:11 2009 New Revision: 732528 URL: http://svn.apache.org/viewvc?rev=732528&view=rev Log: Rebuild all .erl files when couch_db.hrl has been modified. Closes COUCHDB-199. Modified: couchdb/trunk/src/couchdb/Makefile.am Modified: couchdb/trunk/src/couchdb/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/Makefile.am?rev=732528&r1=732527&r2=732528&view=diff == --- couchdb/trunk/src/couchdb/Makefile.am (original) +++ couchdb/trunk/src/couchdb/Makefile.am Wed Jan 7 14:02:11 2009 @@ -147,7 +147,7 @@ # $(ERL) -noshell -run edoc_run files [\"$<\"] -%.beam: %.erl +%.beam: %.erl couch_db.hrl $(ERLC) $< install-data-hook:
svn commit: r733674 - /couchdb/trunk/src/couchdb/couch_config.erl
Author: jan
Date: Mon Jan 12 02:27:21 2009
New Revision: 733674
URL: http://svn.apache.org/viewvc?rev=733674&view=rev
Log:
Fix Whitespace
Modified:
couchdb/trunk/src/couchdb/couch_config.erl
Modified: couchdb/trunk/src/couchdb/couch_config.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_config.erl?rev=733674&r1=733673&r2=733674&view=diff
==
--- couchdb/trunk/src/couchdb/couch_config.erl (original)
+++ couchdb/trunk/src/couchdb/couch_config.erl Mon Jan 12 02:27:21 2009
@@ -40,7 +40,6 @@
all() ->
lists:sort(ets:tab2list(?MODULE)).
-
get(Section) when is_binary(Section) ->
?MODULE:get(?b2l(Section));
get(Section) ->
@@ -111,8 +110,6 @@
Fun
end,
{reply, ok, Config#config{notify_funs=[{Pid, Fun2}|PidFuns]}}.
-
-
%% @spec load_ini_file(IniFile::filename()) -> ok
%% @doc Parses an ini file and stores Key/Value Pairs into the ets table.
@@ -163,7 +160,6 @@
%% @doc Unused
handle_cast(foo, State) -> {noreply, State}.
-
handle_info({'DOWN', _, _, DownPid, _}, #config{notify_funs=PidFuns}=Config) ->
% remove any funs registered by the downed process
FilteredPidFuns = [{Pid,Fun} || {Pid,Fun} <- PidFuns, Pid /= DownPid],
svn commit: r735284 - /couchdb/trunk/share/www/script/couch_tests.js
Author: jan
Date: Sat Jan 17 05:25:49 2009
New Revision: 735284
URL: http://svn.apache.org/viewvc?rev=735284&view=rev
Log:
Add some tests for using _attachments in views.
Modified:
couchdb/trunk/share/www/script/couch_tests.js
Modified: couchdb/trunk/share/www/script/couch_tests.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=735284&r1=735283&r2=735284&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Sat Jan 17 05:25:49
2009
@@ -1010,7 +1010,7 @@
var xhr = CouchDB.request("GET", "/test_suite_db/bin_doc4/attachment.txt");
T(xhr.status == 200);
T(xhr.responseText == "This is a string");
-
+
},
attachment_paths : function(debug) {
@@ -1147,6 +1147,93 @@
},
+ attachment_views: function(debug) {
+
+var db = new CouchDB("test_suite_db");
+db.deleteDb();
+db.createDb();
+if (debug) debugger;
+
+// count attachments in a view
+
+db.bulkSave(makeDocs(0, 10));
+
+db.bulkSave(makeDocs(10, 20, {
+ _attachments:{
+"foo.txt": {
+ content_type:"text/plain",
+ data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+}
+ }
+}));
+
+db.bulkSave(makeDocs(20, 30, {
+ _attachments:{
+"foo.txt": {
+ content_type:"text/plain",
+ data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+},
+"bar.txt": {
+ content_type:"text/plain",
+ data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+}
+ }
+}));
+
+db.bulkSave(makeDocs(30, 40, {
+ _attachments:{
+"foo.txt": {
+ content_type:"text/plain",
+ data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+},
+"bar.txt": {
+ content_type:"text/plain",
+ data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+},
+"baz.txt": {
+ content_type:"text/plain",
+ data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+}
+ }
+}));
+
+var mapFunction = function(doc) {
+ var count = 0;
+
+ for(var idx in doc._attachments) {
+count = count + 1;
+ }
+
+ emit(parseInt(doc._id), count);
+}
+
+var reduceFunction = function(key, values) {
+ return sum(values);
+}
+
+var result = db.query(mapFunction, reduceFunction);
+
+T(result.rows.length == 1);
+T(result.rows[0].value == 60);
+
+var result = db.query(mapFunction, reduceFunction, {
+ startkey:10,
+ endkey:19
+});
+
+T(result.rows.length == 1);
+T(result.rows[0].value == 10);
+
+var result = db.query(mapFunction, reduceFunction, {
+ startkey:20,
+ endkey:29
+});
+
+T(result.rows.length == 1);
+T(result.rows[0].value == 20);
+
+ },
+
design_paths : function(debug) {
var db = new CouchDB("test_suite_db");
db.deleteDb();
@@ -2096,7 +2183,14 @@
for(test in repTests)
if(repTests[test].init) repTests[test].init(dbA, dbB);
- T(CouchDB.replicate(A, B).ok);
+ try {
+T(CouchDB.replicate(A, B).ok);
+ } catch (e) {
+if(window.location.host.match(/localhost/)) {
+ alert("Hi, the replication test failed. The most likely cause is
that 'localhost' resolves to ::1 (IPv6) and CouchDB only listenes at 127.0.0.1
(IPv4). Try 127.0.0.1 to access Futon and run this test suite again.");
+}
+throw e;
+ }
for(test in repTests)
if(repTests[test].afterAB1) repTests[test].afterAB1(dbA, dbB);
svn commit: r735285 - /couchdb/trunk/share/www/script/couch_tests.js
Author: jan
Date: Sat Jan 17 05:34:43 2009
New Revision: 735285
URL: http://svn.apache.org/viewvc?rev=735285&view=rev
Log:
Back out unintentionally committed changes from r735284.
Modified:
couchdb/trunk/share/www/script/couch_tests.js
Modified: couchdb/trunk/share/www/script/couch_tests.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=735285&r1=735284&r2=735285&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Sat Jan 17 05:34:43
2009
@@ -2183,14 +2183,7 @@
for(test in repTests)
if(repTests[test].init) repTests[test].init(dbA, dbB);
- try {
-T(CouchDB.replicate(A, B).ok);
- } catch (e) {
-if(window.location.host.match(/localhost/)) {
- alert("Hi, the replication test failed. The most likely cause is
that 'localhost' resolves to ::1 (IPv6) and CouchDB only listenes at 127.0.0.1
(IPv4). Try 127.0.0.1 to access Futon and run this test suite again.");
-}
-throw e;
- }
+ T(CouchDB.replicate(A, B).ok);
for(test in repTests)
if(repTests[test].afterAB1) repTests[test].afterAB1(dbA, dbB);
svn commit: r735287 - /couchdb/trunk/share/www/script/couch_tests.js
Author: jan
Date: Sat Jan 17 05:36:23 2009
New Revision: 735287
URL: http://svn.apache.org/viewvc?rev=735287&view=rev
Log:
Fix coding-style.
Modified:
couchdb/trunk/share/www/script/couch_tests.js
Modified: couchdb/trunk/share/www/script/couch_tests.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=735287&r1=735286&r2=735287&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Sat Jan 17 05:36:23
2009
@@ -2179,30 +2179,38 @@
};
}
};
+
var test;
- for(test in repTests)
-if(repTests[test].init) repTests[test].init(dbA, dbB);
-
+ for(test in repTests) {
+if(repTests[test].init) {
+ repTests[test].init(dbA, dbB);
+}
+ }
+
T(CouchDB.replicate(A, B).ok);
-
- for(test in repTests)
+
+ for(test in repTests) {
if(repTests[test].afterAB1) repTests[test].afterAB1(dbA, dbB);
-
+ }
+
T(CouchDB.replicate(B, A).ok);
-
- for(test in repTests)
+
+ for(test in repTests) {
if(repTests[test].afterBA1) repTests[test].afterBA1(dbA, dbB);
-
+ }
+
T(CouchDB.replicate(A, B).ok);
-
- for(test in repTests)
+
+ for(test in repTests) {
if(repTests[test].afterAB2) repTests[test].afterAB2(dbA, dbB);
-
+ }
+
T(CouchDB.replicate(B, A).ok);
-
- for(test in repTests)
+
+ for(test in repTests) {
if(repTests[test].afterBA2) repTests[test].afterBA2(dbA, dbB);
-
+ }
+
}
},
svn commit: r736304 - in /couchdb/site/htdocs: ./ community/ docs/
Author: jan Date: Wed Jan 21 04:57:05 2009 New Revision: 736304 URL: http://svn.apache.org/viewvc?rev=736304&view=rev Log: Add links to pre-incubation mailing list archives. Modified: couchdb/site/htdocs/community/code.html couchdb/site/htdocs/community/committers.html couchdb/site/htdocs/community/index.html couchdb/site/htdocs/community/issues.html couchdb/site/htdocs/community/lists.html couchdb/site/htdocs/community/lists.txt couchdb/site/htdocs/community/standards.html couchdb/site/htdocs/docs/index.html couchdb/site/htdocs/docs/intro.html couchdb/site/htdocs/docs/overview.html couchdb/site/htdocs/downloads.html couchdb/site/htdocs/index.html couchdb/site/htdocs/roadmap.html couchdb/site/htdocs/screenshots.html Modified: couchdb/site/htdocs/community/code.html URL: http://svn.apache.org/viewvc/couchdb/site/htdocs/community/code.html?rev=736304&r1=736303&r2=736304&view=diff == --- couchdb/site/htdocs/community/code.html (original) +++ couchdb/site/htdocs/community/code.html Wed Jan 21 04:57:05 2009 @@ -62,8 +62,8 @@ Mailing Lists Issue Tracking Source Code -Coding Standards Committers +Coding Standards http://planet.couchdb.com/";>Planet Modified: couchdb/site/htdocs/community/committers.html URL: http://svn.apache.org/viewvc/couchdb/site/htdocs/community/committers.html?rev=736304&r1=736303&r2=736304&view=diff == --- couchdb/site/htdocs/community/committers.html (original) +++ couchdb/site/htdocs/community/committers.html Wed Jan 21 04:57:05 2009 @@ -62,8 +62,8 @@ Mailing Lists Issue Tracking Source Code -Coding Standards Committers +Coding Standards http://planet.couchdb.com/";>Planet @@ -71,29 +71,29 @@ Committers -http://damienkatz.net/";>Damien Katz, damien@apache.org +http://damienkatz.net/";>Damien Katz, damien@apache.org Original developer and remains the project lead. -http://jan.prima.de/";>Jan Lehnardt, jan@apache.org +http://jan.prima.de/";>Jan Lehnardt, jan@apache.org Worked on the original UNIX port and now works on all ends in CouchDB. He is a freelancing CouchDB consultant and gives presentations around the world. -http://bytesexual.org/nslater";>Noah Slater, nslater@apache.org +http://bytesexual.org/nslater";>Noah Slater, nslater@apache.org Developed and maintains the Autotools build system and application infrastructure. He is CouchDB’s release manager and maintains a number of related packages for Debian GNU/Linux. -http://www.cmlenz.net/";>Christopher Lenz, cmlenz@apache.org +http://www.cmlenz.net/";>Christopher Lenz, cmlenz@apache.org Developed and maintains Futon, the Web administration console. He works on the JavaScript view engine, SpiderMonkey and MochiWeb integration in addition to an external Python client. -http://jchris.mfdz.com";>J. Chris Anderson, jchris@apache.org +http://jchris.mfdz.com";>J. Chris Anderson, jchris@apache.org Upgraded the Erlang JSON term format. Integrates community patches, particularly related to the HTTP API and the MapReduce system. Give talks and Modified: couchdb/site/htdocs/community/index.html URL: http://svn.apache.org/viewvc/couchdb/site/htdocs/community/index.html?rev=736304&r1=736303&r2=736304&view=diff ====== --- couchdb/site/htdocs/community/index.html (original) +++ couchdb/site/htdocs/community/index.html Wed Jan 21 04:57:05 2009 @@ -60,8 +60,8 @@ Mailing Lists Issue Tracking Source Code -Coding Standards Committers +Coding Standards http://planet.couchdb.com/";>Planet @@ -73,8 +73,8 @@ Mailing Lists Issue Tracking Source Code -Coding Standards Committers +Coding Standards http://planet.couchdb.com/";>Planet Modified: couchdb/site/htdocs/community/issues.html URL: http://svn.apache.org/viewvc/couchdb/site/htdocs/community/issues.html?rev=736304&r1=736303&r2=736304&view=diff ====== --- couchdb/site/htdocs/community/issues.html (original) +++ couchdb/site/htdocs/community/issues.html Wed Jan 21 04:57:05 2009 @@ -62,8 +62,8 @@ Mailing Lists Issue Tracking Source Code -Coding Standards Committers +Coding Standards http://planet.couchdb.com/";>Planet Modified: couchdb/site/htdocs/community/lists.html URL: http://svn.apache.org/viewvc/couchdb/site/htdocs/community/lists.html?rev=736304&r1=736303&r2=736304&view=diff ====== --- couchdb/site/htdocs/community/lists.html (original) +++ couchdb/site/htdocs/community/lists.html W
svn commit: r736990 - in /couchdb/trunk/etc/couchdb: local.ini local_dev.ini
Author: jan Date: Fri Jan 23 02:40:48 2009 New Revision: 736990 URL: http://svn.apache.org/viewvc?rev=736990&view=rev Log: - document [admin] section in local.ini - remove test-run leftovers from local_dev.ini Modified: couchdb/trunk/etc/couchdb/local.ini couchdb/trunk/etc/couchdb/local_dev.ini Modified: couchdb/trunk/etc/couchdb/local.ini URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/local.ini?rev=736990&r1=736989&r2=736990&view=diff == --- couchdb/trunk/etc/couchdb/local.ini (original) +++ couchdb/trunk/etc/couchdb/local.ini Fri Jan 23 02:40:48 2009 @@ -12,7 +12,16 @@ ;bind_address = 127.0.0.1 [log] -;level = info +;level = debug [update_notification] ;unique notifier name=/full/path/to/exe -with "cmd line arg" + +; To create an admin account uncomment the '[admins]' section below and add a +; line in the format 'username = password'. When you next start CouchDB, it +; will change the password to a hash (so that your passwords don't linger +; around in plain-text files). You can add more admin accounts with more +; 'username = password' lines. Don't forget to restart CouchDB after +; changing this. +;[admins] +;admin = mysecretpassword \ No newline at end of file Modified: couchdb/trunk/etc/couchdb/local_dev.ini URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/local_dev.ini?rev=736990&r1=736989&r2=736990&view=diff == --- couchdb/trunk/etc/couchdb/local_dev.ini (original) +++ couchdb/trunk/etc/couchdb/local_dev.ini Fri Jan 23 02:40:48 2009 @@ -15,11 +15,4 @@ level = error [update_notification] -;unique notifier name=/full/path/to/exe -with "cmd line arg" - - -[test] -foo = bar - -[test] -foo = bar +;unique notifier name=/full/path/to/exe -with "cmd line arg" \ No newline at end of file
svn commit: r737016 - /couchdb/trunk/NOTICE
Author: jan Date: Fri Jan 23 03:51:54 2009 New Revision: 737016 URL: http://svn.apache.org/viewvc?rev=737016&view=rev Log: bump year, happy 2009 Modified: couchdb/trunk/NOTICE Modified: couchdb/trunk/NOTICE URL: http://svn.apache.org/viewvc/couchdb/trunk/NOTICE?rev=737016&r1=737015&r2=737016&view=diff == --- couchdb/trunk/NOTICE (original) +++ couchdb/trunk/NOTICE Fri Jan 23 03:51:54 2009 @@ -1,5 +1,5 @@ Apache CouchDB -Copyright 2008 The Apache Software Foundation +Copyright 2009 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
svn commit: r737327 - /couchdb/trunk/README
Author: jan Date: Sat Jan 24 10:39:09 2009 New Revision: 737327 URL: http://svn.apache.org/viewvc?rev=737327&view=rev Log: - s/OS X/Mac OS X/ as it is the correct and complete name - Integrate patch by Florian Ebeling that extends the Mac OS X installation instructions. Closes COUCHDB-148. Thanks Florian. Modified: couchdb/trunk/README Modified: couchdb/trunk/README URL: http://svn.apache.org/viewvc/couchdb/trunk/README?rev=737327&r1=737326&r2=737327&view=diff == --- couchdb/trunk/README (original) +++ couchdb/trunk/README Sat Jan 24 10:39:09 2009 @@ -33,7 +33,7 @@ apt-get install automake autoconf libtool help2man -The OS X version of these dependencies may be out of date so it is recommended +The Mac OS X version of these dependencies may be out of date so it is recommended that you use MacPorts (http://www.macports.org/) to install newer versions using the `port` command: @@ -51,7 +51,7 @@ Installation and First Run -- -UNIX-like Operating Systems (inc. OS X) +UNIX-like Operating Systems (inc. Mac OS X) ~~~ Dependencies @@ -84,10 +84,10 @@ `libcurl-dev` supplied by Ubuntu. You may need to specify an alternate package name for libcurl bindings. -OS X - +Mac OS X + -To install GNU Make and the GNU Compiler Collection on OS X you should install +To install GNU Make and the GNU Compiler Collection on Mac OS X you should install the Xcode Tools metapackage by running the following command: open /Applications/Installers/Xcode\ Tools/XcodeTools.mpkg @@ -156,7 +156,7 @@ adduser --system --home /usr/local/var/lib/couchdb --no-create-home \ --shell /bin/bash --group --gecos "CouchDB Administrator" couchdb -OS X provides the standard Accounts option from the System Preferences +Mac OS X provides the standard Accounts option from the System Preferences application or you can optionally use the Workgroup Manager application which can be downloaded as part of the Server Admin Tools: @@ -193,18 +193,30 @@ From here you should run the test suite. -OS X - +Mac OS X + If you get error when running Apache CouchDB that look like the following: -dyld: Library not loaded: libicuuc.38.dy +dyld: Library not loaded: libicuuc.38.dylib -You should make sure that your `~/.profile` file contains the following line: +It seems that your installation is messed up. The dynamically linked object +file usually contains the path to the dynamic library it was linked against. +Invoke the command: -export DYLD_LIBRARY_PATH=/opt/local/lib:$DYLD_LIBRARY_PATH +otool -L /usr/local/lib/couchdb/erlang/lib/couch-0.9.0a708993-incubating/priv/lib/couch_erl_driver.so -This should have been added for you by MacPorts but may be missing. +e.g. to see where CouchDB expects the ICU libraries. In that case you should +invoke: + +make distclean +./configure +make +sudo make install + +It is not necessary to set dyld(1) environment variables like +DYLD_LIBARY_PATH. These are necessary only for debugging or testing binary +compatibility. Running as a Daemon ^^^ @@ -244,8 +256,8 @@ sudo update-rc.d couchdb defaults -OS X - +Mac OS X + You can use the `launchctl` command to control the Apache CouchDB daemon. @@ -253,22 +265,26 @@ sudo launchctl load /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist -Then you can start Apache CouchDB by running : - -sudo launchctl start org.apache.couchdb - You can stop the Apache CouchDB daemon by running the following command: sudo launchctl unload /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist -If you wish to change the launchd configuration, such as which user to run -Apache CouchDB as, you must edit the -`/usr/local/Library/LaunchDaemons/org.apache.couchdb.plist` file as -appropriate. +You can change the launchd configuration, such as which user to run +Apache CouchDB as, by running the command +`open /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist`. It will open +Apple's `Property List Editor'. See launchd.plist(5) for available options in +launchd property lists. One is the `OnDemand' property, which makes it possible +to start and stop the service using launchctl if set to `true'. By default, +launchd immediately restarts a stopped service and makes the `launchctl stop' +behave effectively like a restart. If set to `true', use these commands to start +and stop Apache CouchDB: -If you wish the Apache CouchDB daemon to run as a system service you need to -copy the `/usr/local/Library/LaunchDaemons/org.apache.couchdb.plist` file into -your system wide `/Library/LaunchDaemons` directory. +sudo launchctl start org.apache.couchdb +sudo launchctl stop org.apache.couchdb + +If you wi
svn commit: r737334 - in /couchdb/trunk/src/couchdb: couch_db_update_notifier.erl couch_os_process.erl
Author: jan
Date: Sat Jan 24 11:39:21 2009
New Revision: 737334
URL: http://svn.apache.org/viewvc?rev=737334&view=rev
Log:
Don't let a failing db update notification client bring down the entire
view_server. Patch by Adam Kocoloski. Closes COUCHDB-206.
Thanks Adam.
Modified:
couchdb/trunk/src/couchdb/couch_db_update_notifier.erl
couchdb/trunk/src/couchdb/couch_os_process.erl
Modified: couchdb/trunk/src/couchdb/couch_db_update_notifier.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db_update_notifier.erl?rev=737334&r1=737333&r2=737334&view=diff
==
--- couchdb/trunk/src/couchdb/couch_db_update_notifier.erl (original)
+++ couchdb/trunk/src/couchdb/couch_db_update_notifier.erl Sat Jan 24 11:39:21
2009
@@ -63,7 +63,11 @@
handle_info({'EXIT', Pid, Reason}, Pid) ->
?LOG_ERROR("Update notification process ~p died: ~p", [Pid, Reason]),
-{stop, nil}.
+remove_handler;
+handle_info({'EXIT', _, _}, Pid) ->
+%% the db_update event manager traps exits and forwards this message to all
+%% its handlers. Just ignore as it wasn't our os_process that exited.
+{ok, Pid}.
code_change(_OldVsn, State, _Extra) ->
{ok, State}.
Modified: couchdb/trunk/src/couchdb/couch_os_process.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_os_process.erl?rev=737334&r1=737333&r2=737334&view=diff
==
--- couchdb/trunk/src/couchdb/couch_os_process.erl (original)
+++ couchdb/trunk/src/couchdb/couch_os_process.erl Sat Jan 24 11:39:21 2009
@@ -151,7 +151,7 @@
handle_info({Port, {exit_status, Status}}, #os_proc{port=Port}=OsProc) ->
?LOG_ERROR("OS Process died with status: ~p", [Status]),
-{stop, error, OsProc};
+{stop, {exit_status, Status}, OsProc};
handle_info(Msg, OsProc) ->
?LOG_DEBUG("OS Proc: Unknown info: ~p", [Msg]),
{noreply, OsProc}.
svn commit: r737335 - /couchdb/trunk/src/couchdb/couch_js.c
Author: jan Date: Sat Jan 24 11:48:42 2009 New Revision: 737335 URL: http://svn.apache.org/viewvc?rev=737335&view=rev Log: Make command line test suite succeed again. Patch by Bob Dionne. Closes COUCHDB-212. Thanks Bob. Modified: couchdb/trunk/src/couchdb/couch_js.c Modified: couchdb/trunk/src/couchdb/couch_js.c URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_js.c?rev=737335&r1=737334&r2=737335&view=diff == --- couchdb/trunk/src/couchdb/couch_js.c (original) +++ couchdb/trunk/src/couchdb/couch_js.c Sat Jan 24 11:48:42 2009 @@ -616,6 +616,7 @@ curl_easy_setopt(handle,CURLOPT_WRITEHEADER,b); curl_easy_setopt(handle,CURLOPT_URL,url); curl_easy_setopt(handle,CURLOPT_HTTPGET,1); + curl_easy_setopt(handle,CURLOPT_FOLLOWLOCATION,1); curl_easy_setopt(handle,CURLOPT_NOPROGRESS,1); curl_easy_setopt(handle,CURLOPT_IPRESOLVE,CURL_IPRESOLVE_V4); @@ -864,8 +865,12 @@ b_data->pos = 0; data = JSValToChar(context,(argv+1)); + readlen = strlen(data); + + + // TODO: remove strlen - append_Buffer(b_data->buffer,data,strlen(data)); + append_Buffer(b_data->buffer,data,readlen); free(data); @@ -887,6 +892,9 @@ curl_easy_setopt(handle,CURLOPT_READDATA,b_data); curl_easy_setopt(handle,CURLOPT_URL,url); curl_easy_setopt(handle,CURLOPT_UPLOAD,1); + curl_easy_setopt(handle,CURLOPT_INFILESIZE,readlen); + + // Curl structure struct curl_slist *slist = generateCurlHeaders(context,argv+2); @@ -900,6 +908,8 @@ // Use only ipv4 curl_easy_setopt(handle,CURLOPT_IPRESOLVE,CURL_IPRESOLVE_V4); + + // Perform int exitcode;
svn commit: r737346 - /couchdb/trunk/share/www/script/couch_tests.js
Author: jan
Date: Sat Jan 24 12:27:15 2009
New Revision: 737346
URL: http://svn.apache.org/viewvc?rev=737346&view=rev
Log:
Guess port based on protocol if we run on standard ports and in the browser.
Closes COUCHDB-213.
Modified:
couchdb/trunk/share/www/script/couch_tests.js
Modified: couchdb/trunk/share/www/script/couch_tests.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=737346&r1=737345&r2=737346&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Sat Jan 24 12:27:15
2009
@@ -11,8 +11,13 @@
// the License.
// Used by replication test
-CouchDB.host = (typeof window == 'undefined' || !window) ?
- "127.0.0.1:5984" : window.location.host;
+if (typeof window == 'undefined' || !window) {
+ CouchDB.host = "127.0.0.1:5984";
+ CouchDB.inBrowser = false;
+} else {
+ CouchDB.host = window.location.host;
+ CouchDB.inBrowser = true;
+}
var tests = {
@@ -2843,9 +2848,32 @@
// test that /_config returns all the settings
var xhr = CouchDB.request("GET", "/_config");
var config = JSON.parse(xhr.responseText);
-var port = CouchDB.host.split(':').pop()
+
+/*
+ if we run on standard ports, we can't extract
+ the number from the URL. Instead we try to guess
+ from the protocol what port we are running on.
+ If we can't guess, we don't test for the port.
+ Overengineering FTW.
+*/
+var server_port = CouchDB.host.split(':');
+if(server_port.length == 1 && CouchDB.inBrowser) {
+ var proto = window.location.protocol;
+ if(proto == "http:") {
+port = 80;
+ }
+ if(proto == "https:") {
+port = 443;
+ }
+} else {
+ port = server_port.pop();
+}
+
+if(port) {
+ T(config.httpd.port == port);
+}
+
T(config.couchdb.database_dir);
-T(config.httpd.port == port);
T(config.daemons.httpd);
T(config.httpd_global_handlers._config);
T(config.log.level);
svn commit: r740269 - /couchdb/trunk/share/www/script/couch_tests.js
Author: jan
Date: Tue Feb 3 10:53:36 2009
New Revision: 740269
URL: http://svn.apache.org/viewvc?rev=740269&view=rev
Log:
Do not change local.ini during test suite run. Patch by BradfordW. Thanks.
Modified:
couchdb/trunk/share/www/script/couch_tests.js
Modified: couchdb/trunk/share/www/script/couch_tests.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=740269&r1=740268&r2=740269&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Tue Feb 3 10:53:36
2009
@@ -2974,7 +2974,8 @@
// test that settings can be altered
xhr = CouchDB.request("PUT", "/_config/test/foo",{
- body : JSON.stringify("bar")
+ body : JSON.stringify("bar"),
+ headers: {"X-Couch-Persist": "false"}
});
T(xhr.status == 200);
xhr = CouchDB.request("GET", "/_config/test");
svn commit: r743787 - /couchdb/trunk/src/ibrowse/Makefile.am
Author: jan Date: Thu Feb 12 15:52:37 2009 New Revision: 743787 URL: http://svn.apache.org/viewvc?rev=743787&view=rev Log: Fix `make distcheck` (which builds releases and nightlies) Modified: couchdb/trunk/src/ibrowse/Makefile.am Modified: couchdb/trunk/src/ibrowse/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ibrowse/Makefile.am?rev=743787&r1=743786&r2=743787&view=diff == --- couchdb/trunk/src/ibrowse/Makefile.am (original) +++ couchdb/trunk/src/ibrowse/Makefile.am Thu Feb 12 15:52:37 2009 @@ -38,7 +38,8 @@ EXTRA_DIST = \ $(ibrowse_file_collection) \ -$(ibrowseebin_static_file) +$(ibrowseebin_static_file) \ +ibrowse.hrl CLEANFILES = \ $(ibrowseebin_make_generated_file_list)
svn commit: r743833 - /couchdb/trunk/acinclude.m4.in
Author: jan Date: Thu Feb 12 18:47:06 2009 New Revision: 743833 URL: http://svn.apache.org/viewvc?rev=743833&view=rev Log: Remove -incubator suffix from release artifacts. Modified: couchdb/trunk/acinclude.m4.in Modified: couchdb/trunk/acinclude.m4.in URL: http://svn.apache.org/viewvc/couchdb/trunk/acinclude.m4.in?rev=743833&r1=743832&r2=743833&view=diff == --- couchdb/trunk/acinclude.m4.in (original) +++ couchdb/trunk/acinclude.m4.in Thu Feb 12 18:47:06 2009 @@ -21,11 +21,10 @@ m4_define([LOCAL_VERSION_REVISION], [0]) m4_define([LOCAL_VERSION_STAGE], [a]) m4_define([LOCAL_VERSION_RELEASE], [%release%]) -m4_define([LOCAL_VERSION_STATUS], [incubating]) m4_define([LOCAL_VERSION_PRIMARY], [LOCAL_VERSION_MAJOR.LOCAL_VERSION_MINOR.LOCAL_VERSION_REVISION]) m4_define([LOCAL_VERSION_SECONDARY], -[LOCAL_VERSION_STAGE[]LOCAL_VERSION_RELEASE-LOCAL_VERSION_STATUS]) +[LOCAL_VERSION_STAGE[]LOCAL_VERSION_RELEASE]) m4_define([LOCAL_VERSION], [LOCAL_VERSION_PRIMARY[]LOCAL_VERSION_SECONDARY])
svn commit: r745459 - /couchdb/trunk/configure.ac
Author: jan Date: Wed Feb 18 09:54:24 2009 New Revision: 745459 URL: http://svn.apache.org/viewvc?rev=745459&view=rev Log: Reorder LIB_FLAGS so JS_LIB_FLAGS can override defaults. Closes COUCHDB-170. Modified: couchdb/trunk/configure.ac Modified: couchdb/trunk/configure.ac URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=745459&r1=745458&r2=745459&view=diff == --- couchdb/trunk/configure.ac (original) +++ couchdb/trunk/configure.ac Wed Feb 18 09:54:24 2009 @@ -76,7 +76,7 @@ AC_ARG_VAR([FLAGS], [general flags to prepend to LDFLAGS and CPPFLAGS]) -LIB_FLAGS="-L/usr/local/lib -L/opt/local/lib $JS_LIB_FLAGS" +LIB_FLAGS="170$JS_LIB_FLAGS -L/usr/local/lib -L/opt/local/lib" LIBS="$LIB_FLAGS $LIBS" # XP_UNIX required for jsapi.h and has been tested to work on Linux and Darwin. FLAGS="$LIB_FLAGS $ERLANG_FLAGS $JS_FLAGS -DXP_UNIX $FLAGS"
svn commit: r745475 - /couchdb/trunk/configure.ac
Author: jan Date: Wed Feb 18 10:58:07 2009 New Revision: 745475 URL: http://svn.apache.org/viewvc?rev=745475&view=rev Log: Fix copy und paste error. Modified: couchdb/trunk/configure.ac Modified: couchdb/trunk/configure.ac URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=745475&r1=745474&r2=745475&view=diff == --- couchdb/trunk/configure.ac (original) +++ couchdb/trunk/configure.ac Wed Feb 18 10:58:07 2009 @@ -76,7 +76,7 @@ AC_ARG_VAR([FLAGS], [general flags to prepend to LDFLAGS and CPPFLAGS]) -LIB_FLAGS="170$JS_LIB_FLAGS -L/usr/local/lib -L/opt/local/lib" +LIB_FLAGS="$JS_LIB_FLAGS -L/usr/local/lib -L/opt/local/lib" LIBS="$LIB_FLAGS $LIBS" # XP_UNIX required for jsapi.h and has been tested to work on Linux and Darwin. FLAGS="$LIB_FLAGS $ERLANG_FLAGS $JS_FLAGS -DXP_UNIX $FLAGS"
svn commit: r746691 - in /couchdb/trunk: etc/couchdb/ share/ share/www/script/ src/couchdb/
Author: jan
Date: Sun Feb 22 13:50:38 2009
New Revision: 746691
URL: http://svn.apache.org/viewvc?rev=746691&view=rev
Log:
Add runtime statistics -- without EUnit tests for now.
Modified:
couchdb/trunk/etc/couchdb/default.ini.tpl.in
couchdb/trunk/share/Makefile.am
couchdb/trunk/share/www/script/couch.js
couchdb/trunk/share/www/script/couch_test_runner.js
couchdb/trunk/share/www/script/couch_tests.js
couchdb/trunk/src/couchdb/Makefile.am
couchdb/trunk/src/couchdb/couch_httpd.erl
couchdb/trunk/src/couchdb/couch_httpd_db.erl
couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl
couchdb/trunk/src/couchdb/couch_httpd_view.erl
couchdb/trunk/src/couchdb/couch_server.erl
couchdb/trunk/src/couchdb/couch_server_sup.erl
Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL:
http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=746691&r1=746690&r2=746691&view=diff
==
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Sun Feb 22 13:50:38 2009
@@ -35,6 +35,8 @@
db_update_notifier={couch_db_update_notifier_sup, start_link, []}
query_servers={couch_query_servers, start_link, []}
httpd={couch_httpd, start_link, []}
+stats_aggregator={couch_stats_aggregator, start, []}
+stats_collector={couch_stats_collector, start, []}
[httpd_global_handlers]
/ = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>}
@@ -42,12 +44,12 @@
_utils = {couch_httpd_misc_handlers, handle_utils_dir_req,
"%localdatadir%/www"}
_all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req}
-_stats = {couch_httpd_misc_handlers, handle_stats_req}
_active_tasks = {couch_httpd_misc_handlers, handle_task_status_req}
_config = {couch_httpd_misc_handlers, handle_config_req}
_replicate = {couch_httpd_misc_handlers, handle_replicate_req}
_uuids = {couch_httpd_misc_handlers, handle_uuids_req}
_restart = {couch_httpd_misc_handlers, handle_restart_req}
+_stats = {couch_httpd_stats_handlers, handle_stats_req}
[httpd_db_handlers]
_view = {couch_httpd_view, handle_view_req}
Modified: couchdb/trunk/share/Makefile.am
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=746691&r1=746690&r2=746691&view=diff
==
--- couchdb/trunk/share/Makefile.am (original)
+++ couchdb/trunk/share/Makefile.am Sun Feb 22 13:50:38 2009
@@ -112,5 +112,4 @@
www/script/test/purge.js \
www/script/test/config.js \
www/script/test/security_validation.js \
-www/script/test/max_dbs_open.js \
www/style/layout.css
Modified: couchdb/trunk/share/www/script/couch.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch.js?rev=746691&r1=746690&r2=746691&view=diff
==
--- couchdb/trunk/share/www/script/couch.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch.js [utf-8] Sun Feb 22 13:50:38 2009
@@ -312,6 +312,23 @@
return req;
}
+CouchDB.requestStats = function(module, key, aggregate, options) {
+ var options, optionsOrLast = Array.prototype.pop.apply(arguments);
+ if (typeof optionsOrLast == "string") {
+options = null;
+Array.prototype.push.apply(arguments, [optionsOrLast]);
+ } else {
+options = optionsOrLast;
+ }
+
+ var request_options = {};
+ request_options.headers = {"Content-Type": "application/json"};
+
+ var stat = CouchDB.request("GET", "/_stats/" +
Array.prototype.join.apply(arguments,["/"]) + (options ?
+("?" + CouchDB.params(options)) : ""), request_options).responseText;
+ return JSON.parse(stat)[module][key];
+}
+
CouchDB.uuids_cache = [];
CouchDB.newUuids = function(n) {
@@ -344,3 +361,13 @@
throw result;
}
}
+
+CouchDB.params = function(options) {
+ options = options || {};
+ var returnArray = [];
+ for(var key in options) {
+var value = options[key];
+returnArray.push(key + "=" + value);
+ }
+ return returnArray.join("&");
+}
\ No newline at end of file
Modified: couchdb/trunk/share/www/script/couch_test_runner.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_test_runner.js?rev=746691&r1=746690&r2=746691&view=diff
==
--- couchdb/trunk/share/www/script/couch_test_runner.js (original)
+++ couchdb/trunk/share/www/script/couch_test_runner.js Sun Feb 22 13:50:38 2009
@@ -152,13 +152,13 @@
// display the line that failed.
// Example:
// T(MyValue==1);
-function T(arg1, arg2) {
+function T(arg1, arg2, testName) {
if (!arg1) {
if (currentRow) {
if ($("td.details ol"
svn commit: r746734 - in /couchdb/trunk/src/couchdb: couch_httpd_stats_handlers.erl couch_stats.hrl couch_stats_aggregator.erl couch_stats_collector.erl
Author: jan
Date: Sun Feb 22 15:31:19 2009
New Revision: 746734
URL: http://svn.apache.org/viewvc?rev=746734&view=rev
Log:
add missing files
Added:
couchdb/trunk/src/couchdb/couch_httpd_stats_handlers.erl
couchdb/trunk/src/couchdb/couch_stats.hrl
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
couchdb/trunk/src/couchdb/couch_stats_collector.erl
Added: couchdb/trunk/src/couchdb/couch_httpd_stats_handlers.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_stats_handlers.erl?rev=746734&view=auto
==
--- couchdb/trunk/src/couchdb/couch_httpd_stats_handlers.erl (added)
+++ couchdb/trunk/src/couchdb/couch_httpd_stats_handlers.erl Sun Feb 22
15:31:19 2009
@@ -0,0 +1,41 @@
+% 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.
+
+-module(couch_httpd_stats_handlers).
+-include("couch_db.hrl").
+-include("couch_stats.hrl").
+
+-export([handle_stats_req/1]).
+-import(couch_httpd,
+[send_json/2,send_json/3,send_json/4,send_method_not_allowed/2,
+start_json_response/2,send_chunk/2,end_json_response/1,
+start_chunked_response/3, send_error/4]).
+
+-define(b2a(V), list_to_atom(binary_to_list(V))).
+
+handle_stats_req(#httpd{method='GET', path_parts=[_]}=Req) ->
+send_json(Req, couch_stats_aggregator:all());
+
+handle_stats_req(#httpd{method='GET', path_parts=[_Stats, Module, Key]}=Req) ->
+Time = parse_stats_query(Req),
+Stats = couch_stats_aggregator:get_json({?b2a(Module), ?b2a(Key)}, Time),
+Response = {[{Module, {[{Key, Stats}]}}]},
+send_json(Req, Response);
+
+handle_stats_req(Req) ->
+send_method_not_allowed(Req, "GET").
+
+parse_stats_query(Req) ->
+case couch_httpd:qs(Req) of
+[{"range", Time}] -> list_to_atom(Time);
+_ -> '0'
+end.
Added: couchdb/trunk/src/couchdb/couch_stats.hrl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_stats.hrl?rev=746734&view=auto
==
--- couchdb/trunk/src/couchdb/couch_stats.hrl (added)
+++ couchdb/trunk/src/couchdb/couch_stats.hrl Sun Feb 22 15:31:19 2009
@@ -0,0 +1,21 @@
+% 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.
+
+-record(aggregates, {
+min=0,
+max=0,
+mean=0.0,
+variance = 0.0,
+stddev=0.0,
+count=0,
+last=0
+}).
Added: couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_stats_aggregator.erl?rev=746734&view=auto
==
--- couchdb/trunk/src/couchdb/couch_stats_aggregator.erl (added)
+++ couchdb/trunk/src/couchdb/couch_stats_aggregator.erl Sun Feb 22 15:31:19
2009
@@ -0,0 +1,325 @@
+% 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.
+
+-module(couch_stats_aggregator).
+-include("couch_stats.hrl").
+
+-behaviour(gen_server).
+
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+terminate/2, code_change/3]).
+
+-export([start/0, stop/0,
+ get/1, get/2, get_json/1, get_json/2, all/0,
+ time_passed/0, clear_aggregates/1]).
+
+-record(state, {
+aggregates = []
+}).
+
+-define(COLLECTOR, couch_stats_collector).
+-define(QUEUE_MAX_LENGTH,
svn commit: r746768 - /couchdb/trunk/src/couchdb/Makefile.am
Author: jan Date: Sun Feb 22 16:55:15 2009 New Revision: 746768 URL: http://svn.apache.org/viewvc?rev=746768&view=rev Log: add couch_stats.hrl to distribution files Modified: couchdb/trunk/src/couchdb/Makefile.am Modified: couchdb/trunk/src/couchdb/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/Makefile.am?rev=746768&r1=746767&r2=746768&view=diff == --- couchdb/trunk/src/couchdb/Makefile.am (original) +++ couchdb/trunk/src/couchdb/Makefile.am Sun Feb 22 16:55:15 2009 @@ -77,7 +77,7 @@ couch_view_group.erl \ couch_db_updater.erl -EXTRA_DIST = $(source_files) couch_db.hrl +EXTRA_DIST = $(source_files) couch_db.hrl couch_stats.hrl compiled_files = \ couch.app \
svn commit: r746771 - /couchdb/trunk/etc/init/couchdb.tpl.in
Author: jan Date: Sun Feb 22 17:06:14 2009 New Revision: 746771 URL: http://svn.apache.org/viewvc?rev=746771&view=rev Log: Add pidfile to init script. Patch by Joshua Bronson. Thanks. Modified: couchdb/trunk/etc/init/couchdb.tpl.in Modified: couchdb/trunk/etc/init/couchdb.tpl.in URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/init/couchdb.tpl.in?rev=746771&r1=746770&r2=746771&view=diff == --- couchdb/trunk/etc/init/couchdb.tpl.in (original) +++ couchdb/trunk/etc/init/couchdb.tpl.in Sun Feb 22 17:06:14 2009 @@ -63,6 +63,9 @@ # Start Apache CouchDB as a background process. command="$COUCHDB -b" +if test -n "$COUCHDB_PID_FILE"; then +command="$command -p $COUCHDB_PID_FILE" +fi if test -n "$COUCHDB_STDOUT_FILE"; then command="$command -o $COUCHDB_STDOUT_FILE" fi
svn commit: r746817 - /couchdb/trunk/share/www/script/test/max_dbs_open.js
Author: jan Date: Sun Feb 22 20:58:12 2009 New Revision: 746817 URL: http://svn.apache.org/viewvc?rev=746817&view=rev Log: remove old test file. Removed: couchdb/trunk/share/www/script/test/max_dbs_open.js
svn commit: r747852 - in /couchdb/trunk: share/ share/www/script/ share/www/script/test/ src/couchdb/
Author: jan
Date: Wed Feb 25 16:39:55 2009
New Revision: 747852
URL: http://svn.apache.org/viewvc?rev=747852&view=rev
Log:
add js test suite for stats, enable access for a previously internal metric
Added:
couchdb/trunk/share/www/script/test/stats.js
Modified:
couchdb/trunk/share/Makefile.am
couchdb/trunk/share/www/script/couch.js
couchdb/trunk/share/www/script/couch_tests.js
couchdb/trunk/src/couchdb/couch_httpd_stats_handlers.erl
couchdb/trunk/src/couchdb/couch_server.erl
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Modified: couchdb/trunk/share/Makefile.am
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=747852&r1=747851&r2=747852&view=diff
==
--- couchdb/trunk/share/Makefile.am (original)
+++ couchdb/trunk/share/Makefile.am Wed Feb 25 16:39:55 2009
@@ -112,4 +112,5 @@
www/script/test/purge.js \
www/script/test/config.js \
www/script/test/security_validation.js \
+www/script/test/stats.js \
www/style/layout.css
Modified: couchdb/trunk/share/www/script/couch.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch.js?rev=747852&r1=747851&r2=747852&view=diff
==
--- couchdb/trunk/share/www/script/couch.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch.js [utf-8] Wed Feb 25 16:39:55 2009
@@ -312,20 +312,13 @@
return req;
}
-CouchDB.requestStats = function(module, key, aggregate, options) {
- var options, optionsOrLast = Array.prototype.pop.apply(arguments);
- if (typeof optionsOrLast == "string") {
-options = null;
-Array.prototype.push.apply(arguments, [optionsOrLast]);
- } else {
-options = optionsOrLast;
+CouchDB.requestStats = function(module, key, test) {
+ var query_arg = "";
+ if(test !== null) {
+query_arg = "?flush=true";
}
- var request_options = {};
- request_options.headers = {"Content-Type": "application/json"};
-
- var stat = CouchDB.request("GET", "/_stats/" +
Array.prototype.join.apply(arguments,["/"]) + (options ?
-("?" + CouchDB.params(options)) : ""), request_options).responseText;
+ var stat = CouchDB.request("GET", "/_stats/" + module + "/" + key +
query_arg).responseText;
return JSON.parse(stat)[module][key];
}
Modified: couchdb/trunk/share/www/script/couch_tests.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=747852&r1=747851&r2=747852&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Wed Feb 25 16:39:55
2009
@@ -66,6 +66,7 @@
loadTest("purge.js");
loadTest("config.js");
loadTest("security_validation.js");
+loadTest("stats.js");
function makeDocs(start, end, templateDoc) {
var templateDocSrc = templateDoc ? JSON.stringify(templateDoc) : "{}"
Added: couchdb/trunk/share/www/script/test/stats.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/stats.js?rev=747852&view=auto
==
--- couchdb/trunk/share/www/script/test/stats.js (added)
+++ couchdb/trunk/share/www/script/test/stats.js Wed Feb 25 16:39:55 2009
@@ -0,0 +1,463 @@
+// 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.stats = function(debug) {
+ if (debug) debugger;
+
+ var open_databases_tests = {
+'should increment the number of open databases when creating a db':
function(name) {
+ var db = new CouchDB("test_suite_db");
+ db.deleteDb();
+ var open_databases = requestStatsTest("couchdb",
"open_databases").current;
+ db.createDb();
+
+ var new_open_databases = requestStatsTest("couchdb",
"open_databases").current;
+ TEquals(open_databases + 1, new_open_databases, name);
+ },
+'should increment the number of open databases when opening a db':
function(name) {
+ var db = new CouchDB("test_suite_db");
+ db.de
svn commit: r748217 - in /couchdb/trunk: share/www/script/test/stats.js src/couchdb/couch_db.erl src/couchdb/couch_httpd_db.erl src/couchdb/couch_stats.hrl src/couchdb/couch_stats_aggregator.erl
Author: jan
Date: Thu Feb 26 17:28:25 2009
New Revision: 748217
URL: http://svn.apache.org/viewvc?rev=748217&view=rev
Log:
- add descriptions to metrics
- move document_* metrics to couch_db module and merge them into database_*
metrics
Modified:
couchdb/trunk/share/www/script/test/stats.js
couchdb/trunk/src/couchdb/couch_db.erl
couchdb/trunk/src/couchdb/couch_httpd_db.erl
couchdb/trunk/src/couchdb/couch_stats.hrl
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Modified: couchdb/trunk/share/www/script/test/stats.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/stats.js?rev=748217&r1=748216&r2=748217&view=diff
==
--- couchdb/trunk/share/www/script/test/stats.js (original)
+++ couchdb/trunk/share/www/script/test/stats.js Thu Feb 26 17:28:25 2009
@@ -86,40 +86,40 @@
}
};
- var document_read_count_tests = {
- 'should increase read document counter when a document is read':
function(name) {
+ var database_read_count_tests = {
+ 'should increase database reads counter when a document is read':
function(name) {
var db = new CouchDB("test_suite_db");
db.deleteDb();
db.createDb();
db.save({"_id":"test"});
- var reads = requestStatsTest("httpd", "document_reads").current;
+ var reads = requestStatsTest("couchdb", "database_reads").current;
db.open("test");
- var new_reads = requestStatsTest("httpd", "document_reads").current;
+ var new_reads = requestStatsTest("couchdb", "database_reads").current;
TEquals(reads + 1 , new_reads, name);
},
- 'should not increase read document counter when a non-document is read':
function(name) {
+ 'should not increase database read counter when a non-document is read':
function(name) {
var db = new CouchDB("test_suite_db");
db.deleteDb();
db.createDb();
db.save({"_id":"test"});
- var reads = requestStatsTest("httpd", "document_reads").current;
+ var reads = requestStatsTest("couchdb", "database_reads").current;
CouchDB.request("GET", "/");
- var new_reads = requestStatsTest("httpd", "document_reads").current;
+ var new_reads = requestStatsTest("couchdb", "database_reads").current;
TEquals(reads, new_reads, name);
},
- 'should increase read document counter when a document\'s revisions are
read': function(name) {
+ 'should increase database read counter when a document\'s revisions are
read': function(name) {
var db = new CouchDB("test_suite_db");
db.deleteDb();
db.createDb();
db.save({"_id":"test"});
- var reads = requestStatsTest("httpd", "document_reads").current;
+ var reads = requestStatsTest("couchdb", "database_reads").current;
db.open("test", {"open_revs":"all"});
- var new_reads = requestStatsTest("httpd", "document_reads").current;
+ var new_reads = requestStatsTest("couchdb", "database_reads").current;
TEquals(reads + 1 , new_reads, name);
}
@@ -208,18 +208,18 @@
};
var document_write_count_tests = {
- 'should increment counter for document creates': function(name) {
+ 'should increment database changes counter for document creates':
function(name) {
var db = new CouchDB("test_suite_db");
db.deleteDb();
db.createDb();
- var creates = requestStatsTest("httpd", "document_creates").current;
+ var creates = requestStatsTest("couchdb", "database_changes").current;
db.save({"a":"1"});
- var new_creates = requestStatsTest("httpd", "document_creates").current;
+ var new_creates = requestStatsTest("couchdb", "database_changes").current;
TEquals(creates + 1, new_creates, name);
},
- 'should not increment counter for document creates when updating a doc':
function(name) {
+ 'should increment database changes counter for document updates':
function(name) {
var db = new CouchDB("test_suite_db");
db.deleteDb();
db.createDb();
@@ -227,38 +227,13 @@
var doc = {"_id":"test"};
db.save(doc);
- var creates = requestStatsTest("httpd", "document_creates").current;
+ var updates = requestStatsTest("couchdb", "database_changes").current;
db.save(doc);
- var
svn commit: r748309 - /couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Author: jan
Date: Thu Feb 26 21:21:36 2009
New Revision: 748309
URL: http://svn.apache.org/viewvc?rev=748309&view=rev
Log:
Add style guide for stats descriptions and adjust existing descriptions
accordingly. Thanks to Noah Slater for suggesting the style.
Modified:
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Modified: couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_stats_aggregator.erl?rev=748309&r1=748308&r2=748309&view=diff
==
--- couchdb/trunk/src/couchdb/couch_stats_aggregator.erl (original)
+++ couchdb/trunk/src/couchdb/couch_stats_aggregator.erl Thu Feb 26 21:21:36
2009
@@ -295,38 +295,42 @@
% handles the time_passed message. But don't tell anyone, the math is
% correct :) -- Jan
+
+% Style guide for descriptions: Start with a lowercase letter & do not add
+% a trailing full-stop / period.
+
% please keep this in alphabetical order
-ets:insert(?MODULE, {{couchdb, database_changes}, <<"Number of times a
database was changed">>}),
-ets:insert(?MODULE, {{couchdb, database_reads}, <<"Number of times a
document was read from a database">>}),
-ets:insert(?MODULE, {{couchdb, open_databases}, <<"Number of open
databases">>}),
-ets:insert(?MODULE, {{couchdb, os_files_open}, <<"Number of file
descriptors CouchDB has open.">>}),
-ets:insert(?MODULE, {{couchdb, request_time}, <<"Length of a request
inside CouchDB without Mochiweb">>}),
-
-ets:insert(?MODULE, {{http_status_codes, '200'}, <<"Number of HTTP 200 OK
responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '201'}, <<"Number of HTTP 201
Created responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '202'}, <<"Number of HTTP 202
Accepted responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '301'}, <<"Number of HTTP 301
Moved Permanently responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '304'}, <<"Number of HTTP 304 Not
Modified responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '400'}, <<"Number of HTTP 400 Bad
Request responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '401'}, <<"Number of HTTP 401
Unauthorized responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '403'}, <<"Number of HTTP 403
Forbidden responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '404'}, <<"Number of HTTP 404 Not
Found responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '405'}, <<"Number of HTTP 405
Method Not Allowed responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '409'}, <<"Number of HTTP 409
Conflict responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '412'}, <<"Number of HTTP 412
Precondition Failed responses">>}),
-ets:insert(?MODULE, {{http_status_codes, '500'}, <<"Number of HTTP 500
Internal Server Error responses">>}),
-
-ets:insert(?MODULE, {{httpd, bulk_requests}, <<"Number of bulk
requests">>}),
-ets:insert(?MODULE, {{httpd, copy_requests}, <<"Number of HTTP COPY
requests">>}),
-ets:insert(?MODULE, {{httpd, delete_requests}, <<"Number of HTTP DELETE
requests">>}),
-ets:insert(?MODULE, {{httpd, get_requests}, <<"Number of HTTP GET
requests">>}),
-ets:insert(?MODULE, {{httpd, head_requests}, <<"Number of HTTP HEAD
requests">>}),
-ets:insert(?MODULE, {{httpd, move_requests}, <<"Number of HTTP MOVE
requests">>}),
-ets:insert(?MODULE, {{httpd, post_requests}, <<"Number of HTTP POST
requests">>}),
-ets:insert(?MODULE, {{httpd, requests}, <<"Number of HTTP requests">>}),
-ets:insert(?MODULE, {{httpd, temporary_view_reads}, <<"Number of temporary
view reads">>}),
-ets:insert(?MODULE, {{httpd, view_reads}, <<"Number of view reads">>}),
-ets:insert(?MODULE, {{httpd, put_requests}, <<"Number of HTTP PUT
requests">>}).
+ets:insert(?MODULE, {{couchdb, database_changes}, <<"number of times a
database was changed">>}),
+ets:insert(?MODULE, {{couchdb, database_reads}, <<"number of times a
document was read from a database">>}),
+ets:in
svn commit: r748326 - /couchdb/trunk/src/couchdb/couch_server_sup.erl
Author: jan
Date: Thu Feb 26 21:41:32 2009
New Revision: 748326
URL: http://svn.apache.org/viewvc?rev=748326&view=rev
Log:
remove the no longer existing couch_file_stats from couch_primary_services
Modified:
couchdb/trunk/src/couchdb/couch_server_sup.erl
Modified: couchdb/trunk/src/couchdb/couch_server_sup.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_server_sup.erl?rev=748326&r1=748325&r2=748326&view=diff
==
--- couchdb/trunk/src/couchdb/couch_server_sup.erl (original)
+++ couchdb/trunk/src/couchdb/couch_server_sup.erl Thu Feb 26 21:41:32 2009
@@ -145,12 +145,6 @@
brutal_kill,
supervisor,
[couch_server]},
-{couch_file_stats,
-{couch_file_stats, start_link, []},
-permanent,
-brutal_kill,
-supervisor,
-[couch_file_stats]},
{couch_db_update_event,
{gen_event, start_link, [{local, couch_db_update}]},
permanent,
svn commit: r748582 - in /couchdb/trunk: share/www/script/test/stats.js src/couchdb/couch_httpd.erl src/couchdb/couch_httpd_db.erl src/couchdb/couch_stats.hrl src/couchdb/couch_stats_aggregator.erl
Author: jan
Date: Fri Feb 27 16:44:53 2009
New Revision: 748582
URL: http://svn.apache.org/viewvc?rev=748582&view=rev
Log:
- group HTTP method stats into httpd_requests_methods as per Christopher Lenz's
suggestion
- renamed http_status_codes to httpd_status_codes
- better internal variable naming
- remove comments that were leftovers from earlier refactoring
Modified:
couchdb/trunk/share/www/script/test/stats.js
couchdb/trunk/src/couchdb/couch_httpd.erl
couchdb/trunk/src/couchdb/couch_httpd_db.erl
couchdb/trunk/src/couchdb/couch_stats.hrl
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Modified: couchdb/trunk/share/www/script/test/stats.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/stats.js?rev=748582&r1=748581&r2=748582&view=diff
==
--- couchdb/trunk/share/www/script/test/stats.js (original)
+++ couchdb/trunk/share/www/script/test/stats.js Fri Feb 27 16:44:53 2009
@@ -187,22 +187,22 @@
var http_requests_by_method_tests = {
'should count GET requests': function(name) {
- var requests = requestStatsTest("httpd", "get_requests").current;
- var new_requests = requestStatsTest("httpd", "get_requests").current;
+ var requests = requestStatsTest("httpd_request_methods", "GET").current;
+ var new_requests = requestStatsTest("httpd_request_methods",
"GET").current;
TEquals(requests + 1, new_requests, name);
},
'should not count GET requests for POST request': function(name) {
- var requests = requestStatsTest("httpd", "get_requests").current;
+ var requests = requestStatsTest("httpd_request_methods", "GET").current;
CouchDB.request("POST", "/");
- var new_requests = requestStatsTest("httpd", "get_requests").current;
+ var new_requests = requestStatsTest("httpd_request_methods",
"GET").current;
TEquals(requests + 1, new_requests, name);
},
'should count POST requests': function(name) {
- var requests = requestStatsTest("httpd", "post_requests").current;
+ var requests = requestStatsTest("httpd_request_methods", "POST").current;
CouchDB.request("POST", "/");
- var new_requests = requestStatsTest("httpd", "post_requests").current;
+ var new_requests = requestStatsTest("httpd_request_methods",
"POST").current;
TEquals(requests + 1, new_requests, name);
}
@@ -341,9 +341,9 @@
var db = new CouchDB("nonexistant_db");
db.deleteDb();
- var not_founds = requestStatsTest("http_status_codes", "404").current;
+ var not_founds = requestStatsTest("httpd_status_codes", "404").current;
CouchDB.request("GET", "/nonexistant_db");
- var new_not_founds = requestStatsTest("http_status_codes", "404").current;
+ var new_not_founds = requestStatsTest("httpd_status_codes",
"404").current;
TEquals(not_founds + 1, new_not_founds, name);
},
Modified: couchdb/trunk/src/couchdb/couch_httpd.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=748582&r1=748581&r2=748582&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd.erl Fri Feb 27 16:44:53 2009
@@ -176,8 +176,7 @@
{ok, Resp}.
increment_method_stats(Method) ->
-CounterName = list_to_atom(string:to_lower(atom_to_list(Method)) ++
"_requests"),
-couch_stats_collector:increment({httpd, CounterName}).
+couch_stats_collector:increment({httpd_request_methods, Method}).
special_test_authentication_handler(Req) ->
case header_value(Req, "WWW-Authenticate") of
@@ -338,7 +337,7 @@
start_chunked_response(#httpd{mochi_req=MochiReq}, Code, Headers) ->
-couch_stats_collector:increment({http_status_codes, Code}),
+couch_stats_collector:increment({httpd_status_codes, Code}),
{ok, MochiReq:respond({Code, Headers ++ server_header(), chunked})}.
send_chunk(Resp, Data) ->
@@ -346,7 +345,7 @@
{ok, Resp}.
send_response(#httpd{mochi_req=MochiReq}, Code, Headers, Body) ->
-couch_stats_collector:increment({http_status_codes, Code}),
+couch_stats_collector:increment({httpd_status_codes, Code}),
if Code >= 400 ->
?LOG_DEBUG("HTTPd ~p error response:~n ~s", [Code, Body]);
true -> ok
Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL:
http:
svn commit: r748622 - in /couchdb/trunk: share/www/script/test/stats.js src/couchdb/couch_stats_aggregator.erl
Author: jan
Date: Fri Feb 27 18:07:37 2009
New Revision: 748622
URL: http://svn.apache.org/viewvc?rev=748622&view=rev
Log:
- remove unused aggregate metrics field
- return an empty object when there are no stats
Modified:
couchdb/trunk/share/www/script/test/stats.js
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Modified: couchdb/trunk/share/www/script/test/stats.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/stats.js?rev=748622&r1=748621&r2=748622&view=diff
==
--- couchdb/trunk/share/www/script/test/stats.js (original)
+++ couchdb/trunk/share/www/script/test/stats.js Fri Feb 27 18:07:37 2009
@@ -393,7 +393,7 @@
options.headers = {"Accept": "application/json"};
var summary = JSON.parse(CouchDB.request("GET", "/_stats",
options).responseText);
var aggregates = ["mean", "min", "max", "stddev",
- "current", "resolution"];
+ "current"];
for(var i in aggregates) {
T(summary.httpd.requests[aggregates[i]] >= 0, aggregates[i] + " >= 0",
name);
Modified: couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_stats_aggregator.erl?rev=748622&r1=748621&r2=748622&view=diff
==
--- couchdb/trunk/src/couchdb/couch_stats_aggregator.erl (original)
+++ couchdb/trunk/src/couchdb/couch_stats_aggregator.erl Fri Feb 27 18:07:37
2009
@@ -260,7 +260,6 @@
{min, Min},
{max, Max},
{stddev, Stddev},
-{resolution, 1},
{description, Description}
]}.
@@ -271,7 +270,7 @@
% Thanks to Paul Davis
do_get_all(#state{aggregates=Stats}=State) ->
case Stats of
-[] -> {[{ok, no_stats_yet}]};
+[] -> {[{}]};
_ ->
[{LastMod, LastVals} | LastRestMods] = lists:foldl(fun({{Module, Key},
_Count}, AccIn) ->
case AccIn of
svn commit: r749412 - /couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Author: jan
Date: Mon Mar 2 18:50:39 2009
New Revision: 749412
URL: http://svn.apache.org/viewvc?rev=749412&view=rev
Log:
fix error for when no stats have been collected yet and /_stats is queried
Modified:
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Modified: couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_stats_aggregator.erl?rev=749412&r1=749411&r2=749412&view=diff
==
--- couchdb/trunk/src/couchdb/couch_stats_aggregator.erl (original)
+++ couchdb/trunk/src/couchdb/couch_stats_aggregator.erl Mon Mar 2 18:50:39
2009
@@ -270,7 +270,7 @@
% Thanks to Paul Davis
do_get_all(#state{aggregates=Stats}=State) ->
case Stats of
-[] -> {[{}]};
+[] -> {[]};
_ ->
[{LastMod, LastVals} | LastRestMods] = lists:foldl(fun({{Module, Key},
_Count}, AccIn) ->
case AccIn of
svn commit: r749419 - /couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Author: jan
Date: Mon Mar 2 19:26:45 2009
New Revision: 749419
URL: http://svn.apache.org/viewvc?rev=749419&view=rev
Log:
fix capitalisation for MochiWeb in stats description
Modified:
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Modified: couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_stats_aggregator.erl?rev=749419&r1=749418&r2=749419&view=diff
==
--- couchdb/trunk/src/couchdb/couch_stats_aggregator.erl (original)
+++ couchdb/trunk/src/couchdb/couch_stats_aggregator.erl Mon Mar 2 19:26:45
2009
@@ -303,7 +303,7 @@
ets:insert(?MODULE, {{couchdb, database_reads}, <<"number of times a
document was read from a database">>}),
ets:insert(?MODULE, {{couchdb, open_databases}, <<"number of open
databases">>}),
ets:insert(?MODULE, {{couchdb, os_files_open}, <<"number of file
descriptors CouchDB has open">>}),
-ets:insert(?MODULE, {{couchdb, request_time}, <<"length of a request
inside CouchDB without Mochiweb">>}),
+ets:insert(?MODULE, {{couchdb, request_time}, <<"length of a request
inside CouchDB without MochiWeb">>}),
ets:insert(?MODULE, {{httpd, bulk_requests}, <<"number of bulk
requests">>}),
ets:insert(?MODULE, {{httpd, requests}, <<"number of HTTP requests">>}),
svn commit: r749583 - in /couchdb/trunk: share/www/script/test/stats.js src/couchdb/couch_db.erl src/couchdb/couch_file.erl src/couchdb/couch_stats_aggregator.erl
Author: jan
Date: Tue Mar 3 11:33:14 2009
New Revision: 749583
URL: http://svn.apache.org/viewvc?rev=749583&view=rev
Log:
stats metrics renamed: os_open_files -> open_os_files, database_changes ->
database_writes
Modified:
couchdb/trunk/share/www/script/test/stats.js
couchdb/trunk/src/couchdb/couch_db.erl
couchdb/trunk/src/couchdb/couch_file.erl
couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
Modified: couchdb/trunk/share/www/script/test/stats.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/stats.js?rev=749583&r1=749582&r2=749583&view=diff
==
--- couchdb/trunk/share/www/script/test/stats.js (original)
+++ couchdb/trunk/share/www/script/test/stats.js Tue Mar 3 11:33:14 2009
@@ -56,21 +56,21 @@
value: max.toString()}],
function () {
- var files_open = requestStatsTest("couchdb",
"os_files_open").current;
+ var files_open = requestStatsTest("couchdb",
"open_os_files").current;
for(var i=0; i= open_databases, name);
+ var open_databases = requestStatsTest("couchdb",
"open_os_files").max;
+ T(open_databases > 0 && max >= open_databases, name);
for(var i=0; ihttp://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db.erl?rev=749583&r1=749582&r2=749583&view=diff
==
--- couchdb/trunk/src/couchdb/couch_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_db.erl Tue Mar 3 11:33:14 2009
@@ -286,7 +286,7 @@
update_docs(#db{update_pid=UpdatePid}=Db, Docs, Options, true).
update_docs(Db, Docs, Options, false) ->
-couch_stats_collector:increment({couchdb, database_changes}),
+couch_stats_collector:increment({couchdb, database_writes}),
DocBuckets = group_alike_docs(Docs),
Ids = [Id || [#doc{id=Id}|_] <- DocBuckets],
@@ -323,7 +323,7 @@
write_and_commit(Db, DocBuckets2, Options);
update_docs(Db, Docs, Options, true) ->
-couch_stats_collector:increment({couchdb, database_changes}),
+couch_stats_collector:increment({couchdb, database_writes}),
% go ahead and generate the new revision ids for the documents.
Docs2 = lists:map(
Modified: couchdb/trunk/src/couchdb/couch_file.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_file.erl?rev=749583&r1=749582&r2=749583&view=diff
==
--- couchdb/trunk/src/couchdb/couch_file.erl (original)
+++ couchdb/trunk/src/couchdb/couch_file.erl Tue Mar 3 11:33:14 2009
@@ -285,14 +285,14 @@
true ->
{ok, 0} = file:position(Fd, 0),
ok = file:truncate(Fd),
-couch_stats_collector:increment({couchdb, os_files_open}),
+couch_stats_collector:increment({couchdb, open_os_files}),
{ok, Fd};
false ->
ok = file:close(Fd),
init_status_error(ReturnPid, Ref, file_exists)
end;
false ->
-couch_stats_collector:increment({couchdb, os_files_open}),
+couch_stats_collector:increment({couchdb, open_os_files}),
{ok, Fd}
end;
Error ->
@@ -304,7 +304,7 @@
{ok, Fd_Read} ->
{ok, Fd} = file:open(Filepath, [read, write, raw, binary]),
ok = file:close(Fd_Read),
-couch_stats_collector:increment({couchdb, os_files_open}),
+couch_stats_collector:increment({couchdb, open_os_files}),
{ok, Fd};
Error ->
init_status_error(ReturnPid, Ref, Error)
@@ -313,7 +313,7 @@
terminate(_Reason, _Fd) ->
-couch_stats_collector:decrement({couchdb, os_files_open}),
+couch_stats_collector:decrement({couchdb, open_os_files}),
ok.
Modified: couchdb/trunk/src/couchdb/couch_stats_aggregator.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_stats_aggregator.erl?rev=749583&r1=749582&r2=749583&view=diff
==
--- couchdb/trunk/src/couchdb/couch_stats_aggregator.erl (original)
+++ couchdb/trunk/src/couchdb/couch_stats_aggregator.erl Tue Mar 3 11:33:14
2009
@@ -299,10 +299,10 @@
% a trailing full-stop / period.
% please keep this in alphabetical order
-ets:insert(?MODULE, {{couchdb, database_changes}, <<"number of times a
database was changed">>}),
+ets:insert(?MODULE, {{couchdb, database_writes}, <<"number of times a
database was changed">>}),
ets:insert(?MODULE, {{couchdb, database_r
svn commit: r749852 - in /couchdb/trunk: share/www/script/test/show_documents.js src/couchdb/couch_httpd_db.erl src/couchdb/couch_httpd_show.erl src/couchdb/couch_query_servers.erl
Author: jan
Date: Wed Mar 4 00:15:07 2009
New Revision: 749852
URL: http://svn.apache.org/viewvc?rev=749852&view=rev
Log:
allow for handling 404s in document show functions
Modified:
couchdb/trunk/share/www/script/test/show_documents.js
couchdb/trunk/src/couchdb/couch_httpd_db.erl
couchdb/trunk/src/couchdb/couch_httpd_show.erl
couchdb/trunk/src/couchdb/couch_query_servers.erl
Modified: couchdb/trunk/share/www/script/test/show_documents.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/show_documents.js?rev=749852&r1=749851&r2=749852&view=diff
==
--- couchdb/trunk/share/www/script/test/show_documents.js (original)
+++ couchdb/trunk/share/www/script/test/show_documents.js Wed Mar 4 00:15:07
2009
@@ -21,11 +21,15 @@
_id:"_design/template",
language: "javascript",
shows: {
- "hello" : stringFun(function(doc) {
+ "hello" : stringFun(function(doc, req) {
if (doc) {
- return "Hello World";
+ return "Hello World";
} else {
- return "Empty World";
+ if(req.docId) {
+return "New World";
+ } else {
+return "Empty World";
+ }
}
}),
"just-name" : stringFun(function(doc, req) {
@@ -122,161 +126,167 @@
var xhr = CouchDB.request("GET", "/test_suite_db/_show/");
T(xhr.status == 404);
T(JSON.parse(xhr.responseText).reason == "Invalid path.");
-
+
// hello template world
xhr = CouchDB.request("GET", "/test_suite_db/_show/template/hello/"+docid);
T(xhr.responseText == "Hello World");
-
+
// hello template world (no docid)
- xhr = CouchDB.request("GET", "/test_suite_db/_show/template/hello");
+ xhr = CouchDB.request("GET", "/test_suite_db/_show/template/hello/");
T(xhr.responseText == "Empty World");
+ // // hello template world (non-existing docid)
+ xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/hello/nonExistingDoc");
+ T(xhr.responseText == "New World");
// show with doc
xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/just-name/"+docid);
T(xhr.responseText == "Just Rusty");
- // show with missing doc
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/just-name/missingdoc");
- T(xhr.status == 404);
- var resp = JSON.parse(xhr.responseText);
- T(resp.error == "not_found");
- T(resp.reason == "missing");
- // show with missing func
- xhr = CouchDB.request("GET", "/test_suite_db/_show/template/missing/"+docid);
- T(xhr.status == 404);
-
- // missing design doc
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/missingdoc/just-name/"+docid);
- T(xhr.status == 404);
- var resp = JSON.parse(xhr.responseText);
- T(resp.error == "not_found");
-
- // query parameters
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/req-info/"+docid+"?foo=bar", {
-headers: {
- "Accept": "text/html;text/plain;*/*",
- "X-Foo" : "bar"
-}
- });
- var resp = JSON.parse(xhr.responseText);
- T(equals(resp.headers["X-Foo"], "bar"));
- T(equals(resp.query, {foo:"bar"}));
- T(equals(resp.verb, "GET"));
- T(equals(resp.path[4], docid));
- T(equals(resp.info.db_name, "test_suite_db"));
-
- // returning a content-type
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/xml-type/"+docid);
- T("application/xml" == xhr.getResponseHeader("Content-Type"));
- T("Accept" == xhr.getResponseHeader("Vary"));
-
- // accept header switching
- // different mime has different etag
-
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/accept-switch/"+docid, {
-headers: {"Accept": "text/html;text/plain;*/*"}
- });
- T("text/html" == xhr.getResponseHeader("Content-Type"));
- T("Accept" == xhr.getResponseHeader("Vary"));
- var etag = xhr.getResponseHeader("etag");
-
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/accept-switch/"+docid, {
-headers: {"Accept": "image/png;*/*"}
- });
- T(xhr.responseText.match(/PNG/))
- T("image/png" == xhr.getResponseHeader("Content-Type"));
- var etag2 = xhr.getResponseHeader("etag");
- T(etag2 != etag);
-
- // proper etags
- // show with do
svn commit: r749857 - /couchdb/trunk/share/www/script/test/show_documents.js
Author: jan
Date: Wed Mar 4 00:26:38 2009
New Revision: 749857
URL: http://svn.apache.org/viewvc?rev=749857&view=rev
Log:
whitespace
Modified:
couchdb/trunk/share/www/script/test/show_documents.js
Modified: couchdb/trunk/share/www/script/test/show_documents.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/show_documents.js?rev=749857&r1=749856&r2=749857&view=diff
==
--- couchdb/trunk/share/www/script/test/show_documents.js (original)
+++ couchdb/trunk/share/www/script/test/show_documents.js Wed Mar 4 00:26:38
2009
@@ -144,149 +144,149 @@
T(xhr.responseText == "Just Rusty");
- // show with missing func
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/missing/"+docid);
- T(xhr.status == 404);
-
- // missing design doc
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/missingdoc/just-name/"+docid);
- T(xhr.status == 404);
- var resp = JSON.parse(xhr.responseText);
- T(resp.error == "not_found");
-
- // query parameters
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/req-info/"+docid+"?foo=bar", {
- headers: {
- "Accept": "text/html;text/plain;*/*",
- "X-Foo" : "bar"
- }
- });
- var resp = JSON.parse(xhr.responseText);
- T(equals(resp.headers["X-Foo"], "bar"));
- T(equals(resp.query, {foo:"bar"}));
- T(equals(resp.verb, "GET"));
- T(equals(resp.path[4], docid));
- T(equals(resp.info.db_name, "test_suite_db"));
-
- // returning a content-type
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/xml-type/"+docid);
- T("application/xml" == xhr.getResponseHeader("Content-Type"));
- T("Accept" == xhr.getResponseHeader("Vary"));
-
- // accept header switching
- // different mime has different etag
-
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/accept-switch/"+docid, {
- headers: {"Accept": "text/html;text/plain;*/*"}
- });
- T("text/html" == xhr.getResponseHeader("Content-Type"));
- T("Accept" == xhr.getResponseHeader("Vary"));
- var etag = xhr.getResponseHeader("etag");
-
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/accept-switch/"+docid, {
- headers: {"Accept": "image/png;*/*"}
- });
- T(xhr.responseText.match(/PNG/))
- T("image/png" == xhr.getResponseHeader("Content-Type"));
- var etag2 = xhr.getResponseHeader("etag");
- T(etag2 != etag);
-
- // proper etags
- // show with doc
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/just-name/"+docid);
- // extract the ETag header values
- etag = xhr.getResponseHeader("etag");
- // get again with etag in request
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/just-name/"+docid, {
- headers: {"if-none-match": etag}
- });
- // should be 304
- T(xhr.status == 304);
-
- // update the doc
- doc.name = "Crusty";
- resp = db.save(doc);
- T(resp.ok);
- // req with same etag
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/just-name/"+docid, {
- headers: {"if-none-match": etag}
- });
- // status is 200
- T(xhr.status == 200);
-
- // get new etag and request again
- etag = xhr.getResponseHeader("etag");
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/just-name/"+docid, {
- headers: {"if-none-match": etag}
- });
- // should be 304
- T(xhr.status == 304);
-
- // update design doc (but not function)
- designDoc.isChanged = true;
- T(db.save(designDoc).ok);
-
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/just-name/"+docid, {
- headers: {"if-none-match": etag}
- });
- // should be 304
- T(xhr.status == 304);
-
- // update design doc function
- designDoc.shows["just-name"] = (function(doc, req) {
- return {
- body : "Just old " + doc.name
- };
- }).toString();
- T(db.save(designDoc).ok);
-
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/just-name/"+docid, {
- headers: {"if-none-match": etag}
- });
- // status is 200
- T(xhr.status == 200);
-
-
- // JS can't set etag
- xhr = CouchDB.request("GET",
"/test_suite_db/_show/template/no-set-etag/"+docid);
- // extract the ETag header valu
svn commit: r750430 - /couchdb/trunk/src/couchdb/couch_httpd.erl
Author: jan
Date: Thu Mar 5 11:52:49 2009
New Revision: 750430
URL: http://svn.apache.org/viewvc?rev=750430&view=rev
Log:
consistency in messages (HTTPd -> httpd)
Modified:
couchdb/trunk/src/couchdb/couch_httpd.erl
Modified: couchdb/trunk/src/couchdb/couch_httpd.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=750430&r1=750429&r2=750430&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd.erl Thu Mar 5 11:52:49 2009
@@ -347,7 +347,7 @@
send_response(#httpd{mochi_req=MochiReq}, Code, Headers, Body) ->
couch_stats_collector:increment({httpd_status_codes, Code}),
if Code >= 400 ->
-?LOG_DEBUG("HTTPd ~p error response:~n ~s", [Code, Body]);
+?LOG_DEBUG("httpd ~p error response:~n ~s", [Code, Body]);
true -> ok
end,
{ok, MochiReq:respond({Code, Headers ++ server_header(), Body})}.
svn commit: r750695 - in /couchdb/trunk: share/www/script/couch_tests.js share/www/script/test/attachment_names.js src/couchdb/couch_httpd_db.erl
Author: jan
Date: Fri Mar 6 00:12:15 2009
New Revision: 750695
URL: http://svn.apache.org/viewvc?rev=750695&view=rev
Log:
Verify attachment names. They must be utf-8 (closes COUCHDB-280) and must not
start with an underscore.
Added:
couchdb/trunk/share/www/script/test/attachment_names.js
Modified:
couchdb/trunk/share/www/script/couch_tests.js
couchdb/trunk/src/couchdb/couch_httpd_db.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=750695&r1=750694&r2=750695&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Fri Mar 6 00:12:15
2009
@@ -41,6 +41,7 @@
loadTest("large_docs.js");
loadTest("utf8.js");
loadTest("attachments.js");
+loadTest("attachment_names.js");
loadTest("attachment_paths.js");
loadTest("attachment_views.js");
loadTest("design_paths.js");
Added: couchdb/trunk/share/www/script/test/attachment_names.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/attachment_names.js?rev=750695&view=auto
==
--- couchdb/trunk/share/www/script/test/attachment_names.js (added)
+++ couchdb/trunk/share/www/script/test/attachment_names.js Fri Mar 6 00:12:15
2009
@@ -0,0 +1,87 @@
+// 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.attatchment_names = function(debug) {
+ var db = new CouchDB("test_suite_db");
+ db.deleteDb();
+ db.createDb();
+ if (debug) debugger;
+
+ var binAttDoc = {
+_id: "bin_doc",
+_attachments:{
+ "foo\x80txt": {
+content_type:"text/plain",
+data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+ }
+}
+ }
+
+ // inline attachments
+ try {
+db.save(binAttDoc);
+TEquals(1, 2, "Attachment name with non UTF-8 encoding saved. Should never
show!");
+ } catch (e) {
+TEquals("bad_request", e.error, "attachment_name: inline attachments");
+TEquals("Attachment name is not UTF-8 encoded", e.reason,
"attachment_name: inline attachments");
+ }
+
+
+ // standalone docs
+ var bin_data = "JHAPDO*AU£PN ){(3u[d 93DQ9¡â¬])}
ææøo'âÆæâ¤Ã§Ã¦ÏÏâ¢Â¥â«Â¶Â®#â ϶®¥Ïâ¬ÂªÂ®ËÏ8np";
+
+ var xhr = (CouchDB.request("PUT",
"/test_suite_db/bin_doc3/attachment\x80txt", {
+headers:{"Content-Type":"text/plain;charset=utf-8"},
+body:bin_data
+ }));
+
+ var resp = JSON.parse(xhr.responseText);
+ TEquals(400, xhr.status, "attachment_name: standalone API");
+ TEquals("bad_request", resp.error, "attachment_name: standalone API");
+ TEquals("Attachment name is not UTF-8 encoded", resp.reason,
"attachment_name: standalone API");
+
+
+ // bulk docs
+ var docs = { docs: [binAttDoc] };
+
+ var xhr = CouchDB.request("POST", "/test_suite_db/_bulk_docs", {
+body: JSON.stringify(docs)
+ });
+
+ var resp = JSON.parse(xhr.responseText);
+ TEquals(400, xhr.status, "attachment_name: bulk docs");
+ TEquals("bad_request", resp.error, "attachment_name: bulk docs");
+ TEquals("Attachment name is not UTF-8 encoded", resp.reason,
"attachment_name: bulk docs");
+
+
+ // leading underscores
+ var binAttDoc = {
+_id: "bin_doc2",
+_attachments:{
+ "_foo.txt": {
+content_type:"text/plain",
+data: "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+ }
+}
+ }
+
+ try {
+db.save(binAttDoc);
+TEquals(1, 2, "Attachment name with leading underscore saved. Should never
show!");
+ } catch (e) {
+TEquals("bad_request", e.error, "attachment_name: leading underscore");
+TEquals("Attachment name can't start with '_'", e.reason,
"attachment_name: leading underscore");
+ }
+
+ // todo: form uploads, waiting for cmlenz' test case for form uploads
+
+};
Modified: couchdb/trunk/src/couchdb/c
svn commit: r752020 - /couchdb/trunk/share/www/script/test/show_documents.js
Author: jan
Date: Tue Mar 10 08:19:58 2009
New Revision: 752020
URL: http://svn.apache.org/viewvc?rev=752020&view=rev
Log:
Remove leftover console.log(). Should we get a pre-commit hook for these?
Closes COUCHDB-286. Patch by Jason Smith, thanks.
Modified:
couchdb/trunk/share/www/script/test/show_documents.js
Modified: couchdb/trunk/share/www/script/test/show_documents.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/show_documents.js?rev=752020&r1=752019&r2=752020&view=diff
==
--- couchdb/trunk/share/www/script/test/show_documents.js (original)
+++ couchdb/trunk/share/www/script/test/show_documents.js Tue Mar 10 08:19:58
2009
@@ -152,7 +152,7 @@
// show with missing doc
xhr = CouchDB.request("GET",
"/test_suite_db/_design/template/_show/just-name/missingdoc");
- console.log(xhr)
+
T(xhr.status == 404, 'Doc should be missing');
T(xhr.responseText == "No such doc");
svn commit: r754720 - /couchdb/trunk/share/www/database.html
Author: jan Date: Sun Mar 15 18:58:39 2009 New Revision: 754720 URL: http://svn.apache.org/viewvc?rev=754720&view=rev Log: add note about Futon adding `?group=true` to view queries automatically Modified: couchdb/trunk/share/www/database.html Modified: couchdb/trunk/share/www/database.html URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/database.html?rev=754720&r1=754719&r2=754720&view=diff == --- couchdb/trunk/share/www/database.html [utf-8] (original) +++ couchdb/trunk/share/www/database.html [utf-8] Sun Mar 15 18:58:39 2009 @@ -192,7 +192,12 @@ - + +Views with a reduce function will return a single row of reduced values. +If you are looking for the same results that you can see here in Futon, +add a ?group=true parameter to your view query. Futon does +this automatically. +
svn commit: r754843 - /couchdb/trunk/share/www/script/test/bulk_docs.js
Author: jan
Date: Mon Mar 16 08:45:18 2009
New Revision: 754843
URL: http://svn.apache.org/viewvc?rev=754843&view=rev
Log:
tabs->spaces, other whitespace enhancements
Modified:
couchdb/trunk/share/www/script/test/bulk_docs.js
Modified: couchdb/trunk/share/www/script/test/bulk_docs.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/bulk_docs.js?rev=754843&r1=754842&r2=754843&view=diff
==
--- couchdb/trunk/share/www/script/test/bulk_docs.js (original)
+++ couchdb/trunk/share/www/script/test/bulk_docs.js Mon Mar 16 08:45:18 2009
@@ -20,7 +20,7 @@
// Create the docs
var results = db.bulkSave(docs);
-
+
T(results.length == 5);
for (var i = 0; i < 5; i++) {
T(results[i].id == docs[i]._id);
@@ -38,7 +38,7 @@
// set the delete flag to delete the docs in the next step
docs[i]._deleted = true;
}
-
+
// now test a bulk update with a conflict
// open and save
var doc = db.open("0");
@@ -47,13 +47,13 @@
// Now bulk delete the docs
results = db.bulkSave(docs);
- // doc "0" should be a conflict
+ // doc "0" should be a conflict
T(results.length == 5);
T(results[0].id == "0");
T(results[0].error == "conflict");
T(results[0].rev === undefined); // no rev member when a conflict
-
- // but the rest are not
+
+ // but the rest are not
for (i = 1; i < 5; i++) {
T(results[i].id == i.toString());
T(results[i].rev)
@@ -61,31 +61,31 @@
}
// now force a conflict to to save
-
+
// save doc 0, this will cause a conflict when we save docs[0]
var doc = db.open("0");
- docs[0] = db.open("0")
+ docs[0] = db.open("0")
db.save(doc);
-
+
docs[0].shooby = "dooby";
-
+
// Now save the bulk docs, When we use all_or_nothing, we don't get conflict
// checking, all docs are saved regardless of conflict status, or none are
// saved.
results = db.bulkSave(docs,{all_or_nothing:true});
T(results.error === undefined);
-
+
var doc = db.open("0", {conflicts:true});
var docConflict = db.open("0", {rev:doc._conflicts[0]});
-
+
T(doc.shooby == "dooby" || docConflict.shooby == "dooby");
-
+
// verify creating a document with no id returns a new id
var req = CouchDB.request("POST", "/test_suite_db/_bulk_docs", {
body: JSON.stringify({"docs": [{"foo":"bar"}]})
});
results = JSON.parse(req.responseText);
-
+
T(results[0].id != "");
T(results[0].rev != "");
};
svn commit: r755185 - /couchdb/trunk/etc/couchdb/local_dev.ini
Author: jan Date: Tue Mar 17 10:57:55 2009 New Revision: 755185 URL: http://svn.apache.org/viewvc?rev=755185&view=rev Log: remove unintentional commit of admin credentials Modified: couchdb/trunk/etc/couchdb/local_dev.ini Modified: couchdb/trunk/etc/couchdb/local_dev.ini URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/local_dev.ini?rev=755185&r1=755184&r2=755185&view=diff == --- couchdb/trunk/etc/couchdb/local_dev.ini (original) +++ couchdb/trunk/etc/couchdb/local_dev.ini Tue Mar 17 10:57:55 2009 @@ -16,6 +16,3 @@ [update_notification] ;unique notifier name=/full/path/to/exe -with "cmd line arg" - -; [admins] -; jchris = -hashed-2431cc2e25f79c94e260383875a0efb615f4a7a6,15dc1c40afed7b0c9b23a06b76e17a08 \ No newline at end of file
svn commit: r755205 - in /couchdb/trunk/share/www: database.html script/futon.browse.js style/layout.css
Author: jan
Date: Tue Mar 17 11:52:57 2009
New Revision: 755205
URL: http://svn.apache.org/viewvc?rev=755205&view=rev
Log:
show group=true notice only when view results are shown
Modified:
couchdb/trunk/share/www/database.html
couchdb/trunk/share/www/script/futon.browse.js
couchdb/trunk/share/www/style/layout.css
Modified: couchdb/trunk/share/www/database.html
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/database.html?rev=755205&r1=755204&r2=755205&view=diff
==
--- couchdb/trunk/share/www/database.html [utf-8] (original)
+++ couchdb/trunk/share/www/database.html [utf-8] Tue Mar 17 11:52:57 2009
@@ -192,8 +192,8 @@
-
-Views with a reduce function will return a single row of reduced
values.
+
+Note: Views with a reduce function will return a
single row of reduced values.
If you are looking for the same results that you can see here in Futon,
add a ?group=true parameter to your view query. Futon does
this automatically.
Modified: couchdb/trunk/share/www/script/futon.browse.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/futon.browse.js?rev=755205&r1=755204&r2=755205&view=diff
==
--- couchdb/trunk/share/www/script/futon.browse.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/futon.browse.js [utf-8] Tue Mar 17 11:52:57
2009
@@ -199,12 +199,14 @@
}
$("#language").change(updateDirtyState);
});
+ $("#grouptruenotice").show();
} else if (viewName == "_temp_view") {
page.viewLanguage = $.cookies.get(db.name + ".language",
page.viewLanguage);
page.updateViewEditor(
$.cookies.get(db.name + ".map", templates[page.viewLanguage]),
$.cookies.get(db.name + ".reduce", "")
);
+$("#grouptruenotice").show();
}
page.populateLanguagesMenu();
if (this.isTempView) {
Modified: couchdb/trunk/share/www/style/layout.css
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/style/layout.css?rev=755205&r1=755204&r2=755205&view=diff
==
--- couchdb/trunk/share/www/style/layout.css (original)
+++ couchdb/trunk/share/www/style/layout.css Tue Mar 17 11:52:57 2009
@@ -333,6 +333,7 @@
#viewcode.collapsed table, #viewcode.collapsed .bottom { display: none; }
#tempwarn { display: none; font-size: 90%; margin: 0 2em 1.5em; }
+#grouptruenotice { display: none; font-size: 90%; margin: 1ex 2em 1.5em; }
/* Database table */
svn commit: r755575 - in /couchdb/trunk: share/www/script/test/copy_move_doc.js src/couchdb/couch_httpd_db.erl
Author: jan
Date: Wed Mar 18 12:15:17 2009
New Revision: 755575
URL: http://svn.apache.org/viewvc?rev=755575&view=rev
Log:
remove MOVE requests as they can't sensibly be supported and COPY & DELETE does
the same thing
Modified:
couchdb/trunk/share/www/script/test/copy_move_doc.js
couchdb/trunk/src/couchdb/couch_httpd_db.erl
Modified: couchdb/trunk/share/www/script/test/copy_move_doc.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/copy_move_doc.js?rev=755575&r1=755574&r2=755575&view=diff
==
--- couchdb/trunk/share/www/script/test/copy_move_doc.js (original)
+++ couchdb/trunk/share/www/script/test/copy_move_doc.js Wed Mar 18 12:15:17
2009
@@ -10,7 +10,7 @@
// License for the specific language governing permissions and limitations
under
// the License.
-couchTests.copy_move_doc = function(debug) {
+couchTests.copy_doc = function(debug) {
var db = new CouchDB("test_suite_db");
db.deleteDb();
db.createDb();
@@ -25,36 +25,19 @@
T(xhr.status == 201);
T(db.open("doc_that_was_copied").v == 1);
- // move a doc
-
- // test error condition
- var xhr = CouchDB.request("MOVE", "/test_suite_db/doc_to_be_copied", {
-headers: {"Destination":"doc_that_was_moved"}
- });
- T(xhr.status == 400); // bad request, MOVE requires source rev.
-
- var rev = db.open("doc_to_be_copied")._rev;
- var xhr = CouchDB.request("MOVE", "/test_suite_db/doc_to_be_copied?rev=" +
rev, {
-headers: {"Destination":"doc_that_was_moved"}
- });
-
- T(xhr.status == 201);
- T(db.open("doc_that_was_moved").v == 1);
- T(db.open("doc_to_be_copied") == null);
-
// COPY with existing target
- T(db.save({_id:"doc_to_be_copied",v:1}).ok);
+ T(db.save({_id:"doc_to_be_copied2",v:1}).ok);
var doc = db.save({_id:"doc_to_be_overwritten",v:2});
T(doc.ok);
// error condition
- var xhr = CouchDB.request("COPY", "/test_suite_db/doc_to_be_copied", {
+ var xhr = CouchDB.request("COPY", "/test_suite_db/doc_to_be_copied2", {
headers: {"Destination":"doc_to_be_overwritten"}
});
T(xhr.status == 409); // conflict
var rev = db.open("doc_to_be_overwritten")._rev;
- var xhr = CouchDB.request("COPY", "/test_suite_db/doc_to_be_copied", {
+ var xhr = CouchDB.request("COPY", "/test_suite_db/doc_to_be_copied2", {
headers: {"Destination":"doc_to_be_overwritten?rev=" + rev}
});
T(xhr.status == 201);
Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=755575&r1=755574&r2=755575&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Wed Mar 18 12:15:17 2009
@@ -494,33 +494,8 @@
throw(Error)
end;
-db_doc_req(#httpd{method='MOVE'}=Req, Db, SourceDocId) ->
-SourceRev = {SourceRevPos, SourceRevId} =
-case extract_header_rev(Req, couch_httpd:qs_value(Req, "rev")) of
-missing_rev ->
-throw({bad_request, "MOVE requires a specified rev parameter"
-"for the origin resource."});
-Rev -> Rev
-end,
-
-{TargetDocId, TargetRevs} = parse_copy_destination_header(Req),
-% open revision Rev or Current
-Doc = couch_doc_open(Db, SourceDocId, SourceRev, []),
-
-% save new doc & delete old doc in one operation
-Docs = [
-#doc{id=SourceDocId, revs={SourceRevPos, [SourceRevId]}, deleted=true},
-Doc#doc{id=TargetDocId, revs=TargetRevs}
-],
-{ok, [SourceResult, TargetResult]} = couch_db:update_docs(Db, Docs, []),
-
-send_json(Req, 201, {[
-{SourceDocId, update_result_to_json(SourceResult)},
-{TargetDocId, update_result_to_json(TargetResult)}
-]});
-
db_doc_req(Req, _Db, _DocId) ->
-send_method_not_allowed(Req, "DELETE,GET,HEAD,POST,PUT,COPY,MOVE").
+send_method_not_allowed(Req, "DELETE,GET,HEAD,POST,PUT,COPY").
update_result_to_json({ok, NewRev}) ->
{[{rev, couch_doc:rev_to_str(NewRev)}]};
svn commit: r755576 - /couchdb/trunk/share/www/script/test/copy_doc.js
Author: jan Date: Wed Mar 18 12:15:50 2009 New Revision: 755576 URL: http://svn.apache.org/viewvc?rev=755576&view=rev Log: rename test file to reclect new test name Added: couchdb/trunk/share/www/script/test/copy_doc.js - copied unchanged from r755575, couchdb/trunk/share/www/script/test/copy_move_doc.js
svn commit: r755577 - /couchdb/trunk/share/www/script/couch_tests.js
Author: jan
Date: Wed Mar 18 12:28:38 2009
New Revision: 755577
URL: http://svn.apache.org/viewvc?rev=755577&view=rev
Log:
reflect filename change in the loadTest() function
Modified:
couchdb/trunk/share/www/script/couch_tests.js
Modified: couchdb/trunk/share/www/script/couch_tests.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=755577&r1=755576&r2=755577&view=diff
==
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Wed Mar 18 12:28:38
2009
@@ -30,7 +30,7 @@
loadTest("all_docs.js");
loadTest("conflicts.js");
loadTest("recreate_doc.js");
-loadTest("copy_move_doc.js");
+loadTest("copy_doc.js");
loadTest("uuids.js");
loadTest("bulk_docs.js");
loadTest("lots_of_docs.js");
svn commit: r755616 - /couchdb/trunk/share/Makefile.am
Author: jan Date: Wed Mar 18 15:18:59 2009 New Revision: 755616 URL: http://svn.apache.org/viewvc?rev=755616&view=rev Log: fix make install Modified: couchdb/trunk/share/Makefile.am Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=755616&r1=755615&r2=755616&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Wed Mar 18 15:18:59 2009 @@ -76,7 +76,7 @@ www/script/test/all_docs.js \ www/script/test/conflicts.js \ www/script/test/recreate_doc.js \ -www/script/test/copy_move_doc.js \ +www/script/test/copy_doc.js \ www/script/test/uuids.js \ www/script/test/bulk_docs.js \ www/script/test/lots_of_docs.js \
svn commit: r756404 - /couchdb/trunk/share/www/script/test/stats.js
Author: jan
Date: Fri Mar 20 10:26:13 2009
New Revision: 756404
URL: http://svn.apache.org/viewvc?rev=756404&view=rev
Log:
remove leftovers of MOVE form the stats tests
Modified:
couchdb/trunk/share/www/script/test/stats.js
Modified: couchdb/trunk/share/www/script/test/stats.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/stats.js?rev=756404&r1=756403&r2=756404&view=diff
==
--- couchdb/trunk/share/www/script/test/stats.js (original)
+++ couchdb/trunk/share/www/script/test/stats.js Fri Mar 20 10:26:13 2009
@@ -264,22 +264,6 @@
TEquals(copies + 1, new_copies, name);
},
- 'should increment database changes counter for document moves':
function(name) {
- var db = new CouchDB("test_suite_db");
- db.deleteDb();
- db.createDb();
-
- var doc = {"_id":"test"};
- db.save(doc);
-
- var moves = requestStatsTest("couchdb", "database_writes").current;
- CouchDB.request("MOVE", "/test_suite_db/test?rev=" + doc._rev, {
- headers: {"Destination":"move_of_test"}
- });
- var new_moves = requestStatsTest("couchdb", "database_writes").current;
-
- TEquals(moves + 1, new_moves, name);
- },
'should increase the bulk doc counter': function(name) {
var db = new CouchDB("test_suite_db");
db.deleteDb();
svn commit: r757711 - /couchdb/trunk/share/www/script/test/rev_stemming.js
Author: jan
Date: Tue Mar 24 10:45:48 2009
New Revision: 757711
URL: http://svn.apache.org/viewvc?rev=757711&view=rev
Log:
force full doc reload because ETags don't honour compaction
Modified:
couchdb/trunk/share/www/script/test/rev_stemming.js
Modified: couchdb/trunk/share/www/script/test/rev_stemming.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/rev_stemming.js?rev=757711&r1=757710&r2=757711&view=diff
==
--- couchdb/trunk/share/www/script/test/rev_stemming.js (original)
+++ couchdb/trunk/share/www/script/test/rev_stemming.js Tue Mar 24 10:45:48 2009
@@ -88,6 +88,12 @@
// compaction isn't instantaneous, loop until done
while (db.info().compact_running) {};
- T(db.open("bar", {revs:true})._revisions.ids.length == newLimit);
+ // force reload because ETags don't honour compaction
+ var req = db.request("GET", "/test_suite_db_a/bar?revs=true", {
+headers:{"if-none-match":"pommes"}
+ });
+ var finalDoc = JSON.parse(req.responseText);
+ TEquals(newLimit, finalDoc._revisions.ids.length,
+"should return a truncated revision list");
};
svn commit: r757714 - /couchdb/trunk/src/couchdb/couch_httpd.erl
Author: jan
Date: Tue Mar 24 10:48:09 2009
New Revision: 757714
URL: http://svn.apache.org/viewvc?rev=757714&view=rev
Log:
make some error messages more readable, committed for jchris
Modified:
couchdb/trunk/src/couchdb/couch_httpd.erl
Modified: couchdb/trunk/src/couchdb/couch_httpd.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=757714&r1=757713&r2=757714&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd.erl Tue Mar 24 10:48:09 2009
@@ -394,6 +394,8 @@
send_chunk(Resp, []).
+error_info({Error, Reason}) when is_list(Reason) ->
+error_info({Error, ?l2b(Reason)});
error_info(bad_request) ->
{400, <<"bad_request">>, <<>>};
error_info({bad_request, Reason}) ->
@@ -440,7 +442,7 @@
{[{<<"error">>, ErrorStr},
{<<"reason">>, ReasonStr}]}).
- send_redirect(Req, Path) ->
+send_redirect(Req, Path) ->
Headers = [{"Location", couch_httpd:absolute_uri(Req, Path)}],
send_response(Req, 301, Headers, <<>>).
svn commit: r757744 - /couchdb/trunk/share/www/script/test/stats.js
Author: jan
Date: Tue Mar 24 11:32:57 2009
New Revision: 757744
URL: http://svn.apache.org/viewvc?rev=757744&view=rev
Log:
fix unstable stats test; the open_os_files counter needs a separate test
Modified:
couchdb/trunk/share/www/script/test/stats.js
Modified: couchdb/trunk/share/www/script/test/stats.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/stats.js?rev=757744&r1=757743&r2=757744&view=diff
==
--- couchdb/trunk/share/www/script/test/stats.js (original)
+++ couchdb/trunk/share/www/script/test/stats.js Tue Mar 24 11:32:57 2009
@@ -56,21 +56,21 @@
value: max.toString()}],
function () {
- var files_open = requestStatsTest("couchdb",
"open_os_files").current;
+ var files_open = requestStatsTest("couchdb",
"open_databases").current;
for(var i=0; i 0 && max >= open_databases, name);
for(var i=0; i
svn commit: r758717 - /couchdb/trunk/share/www/script/test/basics.js
Author: jan
Date: Thu Mar 26 16:18:37 2009
New Revision: 758717
URL: http://svn.apache.org/viewvc?rev=758717&view=rev
Log:
whitespace
Modified:
couchdb/trunk/share/www/script/test/basics.js
Modified: couchdb/trunk/share/www/script/test/basics.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/basics.js?rev=758717&r1=758716&r2=758717&view=diff
==
--- couchdb/trunk/share/www/script/test/basics.js (original)
+++ couchdb/trunk/share/www/script/test/basics.js Thu Mar 26 16:18:37 2009
@@ -14,13 +14,13 @@
couchTests.basics = function(debug) {
var result = JSON.parse(CouchDB.request("GET", "/").responseText);
T(result.couchdb == "Welcome");
-
+
var db = new CouchDB("test_suite_db");
db.deleteDb();
// bug COUCHDB-100: DELETE on non-existent DB returns 500 instead of 404
db.deleteDb();
-
+
db.createDb();
// PUT on existing DB should return 412 instead of 500
@@ -122,14 +122,14 @@
// make sure we can still open the old rev of the deleted doc
T(db.open(existingDoc._id, {rev: existingDoc._rev}) != null);
-
+
// make sure restart works
T(db.ensureFullCommit().ok);
restartServer();
-
+
// make sure we can still open
T(db.open(existingDoc._id, {rev: existingDoc._rev}) != null);
-
+
// test that the POST response has a Location header
var xhr = CouchDB.request("POST", "/test_suite_db", {
body: JSON.stringify({"foo":"bar"})
@@ -140,9 +140,9 @@
T(loc, "should have a Location header");
var locs = loc.split('/');
T(locs[4] == resp.id);
-T(locs[3] == "test_suite_db");
-
+T(locs[3] == "test_suite_db");
+
// deleting a non-existent doc should be 404
xhr = CouchDB.request("DELETE", "/test_suite_db/doc-does-not-exist");
-T(xhr.status == 404);
+T(xhr.status == 404);
};
svn commit: r758723 - in /couchdb/trunk: share/www/script/test/basics.js src/couchdb/couch_httpd_db.erl
Author: jan
Date: Thu Mar 26 16:28:21 2009
New Revision: 758723
URL: http://svn.apache.org/viewvc?rev=758723&view=rev
Log:
return Location header for newly create databases
Modified:
couchdb/trunk/share/www/script/test/basics.js
couchdb/trunk/src/couchdb/couch_httpd_db.erl
Modified: couchdb/trunk/share/www/script/test/basics.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/basics.js?rev=758723&r1=758722&r2=758723&view=diff
==
--- couchdb/trunk/share/www/script/test/basics.js (original)
+++ couchdb/trunk/share/www/script/test/basics.js Thu Mar 26 16:28:21 2009
@@ -28,6 +28,12 @@
T(xhr.status == 412);
if (debug) debugger;
+// creating a new DB should return Location header
+xhr = CouchDB.request("DELETE", "/new-db");
+xhr = CouchDB.request("PUT", "/new-db");
+TEquals("/new-db", xhr.getResponseHeader("Location"),
+ "should return newly created database name in location header");
+
// Get the database info, check the db_name
T(db.info().db_name == "test_suite_db");
Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=758723&r1=758722&r2=758723&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Thu Mar 26 16:28:21 2009
@@ -56,7 +56,7 @@
case couch_server:create(DbName, [{user_ctx, UserCtx}]) of
{ok, Db} ->
couch_db:close(Db),
-send_json(Req, 201, {[{ok, true}]});
+send_json(Req, 201, [{"Location", "/" ++ DbName}], {[{ok, true}]});
Error ->
throw(Error)
end.
svn commit: r758768 - in /couchdb/trunk: share/www/script/test/basics.js src/couchdb/couch_httpd_db.erl
Author: jan
Date: Thu Mar 26 17:40:27 2009
New Revision: 758768
URL: http://svn.apache.org/viewvc?rev=758768&view=rev
Log:
return a Location header on newly created documents using PUT requests
Modified:
couchdb/trunk/share/www/script/test/basics.js
couchdb/trunk/src/couchdb/couch_httpd_db.erl
Modified: couchdb/trunk/share/www/script/test/basics.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/basics.js?rev=758768&r1=758767&r2=758768&view=diff
==
--- couchdb/trunk/share/www/script/test/basics.js (original)
+++ couchdb/trunk/share/www/script/test/basics.js Thu Mar 26 17:40:27 2009
@@ -148,6 +148,13 @@
T(locs[4] == resp.id);
T(locs[3] == "test_suite_db");
+// document put's should return a Location header
+var xhr = CouchDB.request("PUT", "/test_suite_db/newdoc", {
+ body: JSON.stringify({"a":1})
+});
+TEquals("/test_suite_db/newdoc", xhr.getResponseHeader("Location"),
+ "should return Location header to newly created document");
+
// deleting a non-existent doc should be 404
xhr = CouchDB.request("DELETE", "/test_suite_db/doc-does-not-exist");
T(xhr.status == 404);
Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=758768&r1=758767&r2=758768&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Thu Mar 26 17:40:27 2009
@@ -496,7 +496,8 @@
]});
db_doc_req(#httpd{method='PUT'}=Req, Db, DocId) ->
-update_doc(Req, Db, DocId, couch_httpd:json_body(Req));
+update_doc(Req, Db, DocId, couch_httpd:json_body(Req),
+ [{"Location", "/" ++ ?b2l(Db#db.name) ++ "/" ++ ?b2l(DocId)}]);
db_doc_req(#httpd{method='COPY'}=Req, Db, SourceDocId) ->
SourceRev =
@@ -529,6 +530,9 @@
update_doc(Req, Db, DocId, Json) ->
+update_doc(Req, Db, DocId, Json, []).
+
+update_doc(Req, Db, DocId, Json, Headers) ->
#doc{deleted=Deleted} = Doc = couch_doc:from_json_obj(Json),
validate_attachment_names(Doc),
ExplicitDocRev =
@@ -551,8 +555,9 @@
end,
{ok, NewRev} = couch_db:update_doc(Db, Doc#doc{id=DocId, revs=Revs},
Options),
NewRevStr = couch_doc:rev_to_str(NewRev),
+ResponseHeaders = [{"Etag", <<"\"", NewRevStr/binary, "\"">>}] ++ Headers,
send_json(Req, if Deleted -> 200; true -> 201 end,
-[{"Etag", <<"\"", NewRevStr/binary, "\"">>}], {[
+ResponseHeaders, {[
{ok, true},
{id, DocId},
{rev, NewRevStr}]}).
svn commit: r758942 - in /couchdb/trunk: share/www/script/test/basics.js src/couchdb/couch_httpd_db.erl
Author: jan
Date: Fri Mar 27 00:26:39 2009
New Revision: 758942
URL: http://svn.apache.org/viewvc?rev=758942&view=rev
Log:
Location header responses should be absolute URIs, thanks Christopher
Modified:
couchdb/trunk/share/www/script/test/basics.js
couchdb/trunk/src/couchdb/couch_httpd_db.erl
Modified: couchdb/trunk/share/www/script/test/basics.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/basics.js?rev=758942&r1=758941&r2=758942&view=diff
==
--- couchdb/trunk/share/www/script/test/basics.js (original)
+++ couchdb/trunk/share/www/script/test/basics.js Fri Mar 27 00:26:39 2009
@@ -31,8 +31,13 @@
// creating a new DB should return Location header
xhr = CouchDB.request("DELETE", "/new-db");
xhr = CouchDB.request("PUT", "/new-db");
-TEquals("/new-db", xhr.getResponseHeader("Location"),
- "should return newly created database name in location header");
+TEquals("/new-db",
+ xhr.getResponseHeader("Location").substr(-7),
+ "should return Location header to newly created document");
+
+TEquals("http://";,
+ xhr.getResponseHeader("Location").substr(0, 7),
+ "should return absolute Location header to newly created document");
// Get the database info, check the db_name
T(db.info().db_name == "test_suite_db");
@@ -152,9 +157,14 @@
var xhr = CouchDB.request("PUT", "/test_suite_db/newdoc", {
body: JSON.stringify({"a":1})
});
-TEquals("/test_suite_db/newdoc", xhr.getResponseHeader("Location"),
+TEquals("/test_suite_db/newdoc",
+ xhr.getResponseHeader("Location").substr(-21),
"should return Location header to newly created document");
+TEquals("http://";,
+ xhr.getResponseHeader("Location").substr(0, 7),
+ "should return absolute Location header to newly created document");
+
// deleting a non-existent doc should be 404
xhr = CouchDB.request("DELETE", "/test_suite_db/doc-does-not-exist");
T(xhr.status == 404);
Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=758942&r1=758941&r2=758942&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Fri Mar 27 00:26:39 2009
@@ -56,7 +56,8 @@
case couch_server:create(DbName, [{user_ctx, UserCtx}]) of
{ok, Db} ->
couch_db:close(Db),
-send_json(Req, 201, [{"Location", "/" ++ DbName}], {[{ok, true}]});
+DocUrl = absolute_uri(Req, "/" ++ DbName),
+send_json(Req, 201, [{"Location", DocUrl}], {[{ok, true}]});
Error ->
throw(Error)
end.
@@ -496,8 +497,9 @@
]});
db_doc_req(#httpd{method='PUT'}=Req, Db, DocId) ->
+Location = absolute_uri(Req, "/" ++ ?b2l(Db#db.name) ++ "/" ++
?b2l(DocId)),
update_doc(Req, Db, DocId, couch_httpd:json_body(Req),
- [{"Location", "/" ++ ?b2l(Db#db.name) ++ "/" ++ ?b2l(DocId)}]);
+ [{"Location", Location}]);
db_doc_req(#httpd{method='COPY'}=Req, Db, SourceDocId) ->
SourceRev =
svn commit: r759588 - in /couchdb/trunk: share/www/script/test/show_documents.js src/couchdb/couch_httpd_show.erl
Author: jan
Date: Sat Mar 28 21:02:41 2009
New Revision: 759588
URL: http://svn.apache.org/viewvc?rev=759588&view=rev
Log:
always load _conflicts in _show functions
Modified:
couchdb/trunk/share/www/script/test/show_documents.js
couchdb/trunk/src/couchdb/couch_httpd_show.erl
Modified: couchdb/trunk/share/www/script/test/show_documents.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/show_documents.js?rev=759588&r1=759587&r2=759588&view=diff
==
--- couchdb/trunk/share/www/script/test/show_documents.js (original)
+++ couchdb/trunk/share/www/script/test/show_documents.js Sat Mar 28 21:02:41
2009
@@ -44,6 +44,11 @@
};
}
}),
+ "json" : stringFun(function(doc, req) {
+return {
+ json : doc
+}
+ }),
"req-info" : stringFun(function(doc, req) {
return {
json : req
@@ -300,4 +305,17 @@
});
T(xhr.getResponseHeader("Content-Type") == "text/html");
T(xhr.responseText == "Ha ha, you said \"plankton\".");
+
+ // test inclusion of conflict state
+ var doc1 = {_id:"foo", a:1};
+ var doc2 = {_id:"foo", a:2};
+ db.save(doc1);
+
+ //create the conflict with a all_or_nothing bulk docs request
+ var docs = [doc2];
+ db.bulkSave(docs, {all_or_nothing:true});
+
+ xhr = CouchDB.request("GET",
"/test_suite_db/_design/template/_show/json/foo");
+ TEquals(1, JSON.parse(xhr.responseText)._conflicts.length);
+
};
Modified: couchdb/trunk/src/couchdb/couch_httpd_show.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_show.erl?rev=759588&r1=759587&r2=759588&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_show.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_show.erl Sat Mar 28 21:02:41 2009
@@ -30,7 +30,7 @@
#doc{body={Props}} = couch_httpd_db:couch_doc_open(Db, DesignId, nil, []),
Lang = proplists:get_value(<<"language">>, Props, <<"javascript">>),
ShowSrc = get_nested_json_value({Props}, [<<"shows">>, ShowName]),
-Doc = try couch_httpd_db:couch_doc_open(Db, DocId, nil, []) of
+Doc = try couch_httpd_db:couch_doc_open(Db, DocId, nil, [conflicts]) of
FoundDoc -> FoundDoc
catch
_ -> nil
svn commit: r760533 - in /couchdb/trunk/src/couchdb: couch_rep.erl couch_rep_sup.erl
Author: jan
Date: Tue Mar 31 17:31:20 2009
New Revision: 760533
URL: http://svn.apache.org/viewvc?rev=760533&view=rev
Log:
unify including of couch_db.hrl
Modified:
couchdb/trunk/src/couchdb/couch_rep.erl
couchdb/trunk/src/couchdb/couch_rep_sup.erl
Modified: couchdb/trunk/src/couchdb/couch_rep.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep.erl?rev=760533&r1=760532&r2=760533&view=diff
==
--- couchdb/trunk/src/couchdb/couch_rep.erl (original)
+++ couchdb/trunk/src/couchdb/couch_rep.erl Tue Mar 31 17:31:20 2009
@@ -17,7 +17,7 @@
-export([replicate/2]).
--include_lib("couch_db.hrl").
+-include("couch_db.hrl").
%% @spec replicate(Source::binary(), Target::binary()) ->
%% {ok, Stats} | {error, Reason}
Modified: couchdb/trunk/src/couchdb/couch_rep_sup.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep_sup.erl?rev=760533&r1=760532&r2=760533&view=diff
==
--- couchdb/trunk/src/couchdb/couch_rep_sup.erl (original)
+++ couchdb/trunk/src/couchdb/couch_rep_sup.erl Tue Mar 31 17:31:20 2009
@@ -14,7 +14,7 @@
-behaviour(supervisor).
-export([init/1, start_link/0]).
--include_lib("couch_db.hrl").
+-include("couch_db.hrl").
start_link() ->
supervisor:start_link({local,?MODULE}, ?MODULE, []).
svn commit: r762574 - /couchdb/trunk/src/couchdb/couch_httpd.erl
Author: jan
Date: Tue Apr 7 00:07:02 2009
New Revision: 762574
URL: http://svn.apache.org/viewvc?rev=762574&view=rev
Log:
Add null_authentication_handler. It is useful when running CouchDB behind an
authenticating proxy which proxies the basic auth http headers to CouchDB.
Having no admins defined makes authentication impossible. Use the
null_authentication_handler instead.
Modified:
couchdb/trunk/src/couchdb/couch_httpd.erl
Modified: couchdb/trunk/src/couchdb/couch_httpd.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=762574&r1=762573&r2=762574&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd.erl Tue Apr 7 00:07:02 2009
@@ -24,7 +24,7 @@
-export([send_response/4,send_method_not_allowed/2,send_error/4,
send_redirect/2]).
-export([send_json/2,send_json/3,send_json/4]).
-export([default_authentication_handler/1,special_test_authentication_handler/1]).
-
+-export([null_authentication_handler/1]).
start_link() ->
% read config and register for configuration changes
@@ -228,6 +228,8 @@
end
end.
+null_authentication_handler(_Req) ->
+#user_ctx{roles=[<<"_admin">>]}.
% Utilities
svn commit: r764835 - /couchdb/trunk/share/Makefile.am
Author: jan Date: Tue Apr 14 15:38:26 2009 New Revision: 764835 URL: http://svn.apache.org/viewvc?rev=764835&view=rev Log: whitespace Modified: couchdb/trunk/share/Makefile.am Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=764835&r1=764834&r2=764835&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Tue Apr 14 15:38:26 2009 @@ -100,7 +100,7 @@ www/script/test/view_multi_key_all_docs.js \ www/script/test/view_multi_key_design.js \ www/script/test/view_multi_key_temp.js \ - www/script/test/view_offsets.js \ +www/script/test/view_offsets.js \ www/script/test/view_pagination.js \ www/script/test/view_sandboxing.js \ www/script/test/view_xml.js \
svn commit: r766390 - in /couchdb/trunk/share: Makefile.am server/mainjs.sh
Author: jan Date: Sat Apr 18 20:50:25 2009 New Revision: 766390 URL: http://svn.apache.org/viewvc?rev=766390&view=rev Log: integrate main.js split-up into build system Modified: couchdb/trunk/share/Makefile.am couchdb/trunk/share/server/mainjs.sh Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766390&r1=766389&r2=766390&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Sat Apr 18 20:50:25 2009 @@ -10,11 +10,16 @@ ## License for the specific language governing permissions and limitations ## under the License. +server/main.js: + server/mainjs.sh + +CLEANFILES = server/main.js + nobase_dist_localdata_DATA = \ server/main.js \ www/dialog/_compact_database.html \ -www/dialog/_create_database.html \ www/dialog/_create_document.html \ +www/dialog/_create_database.html \ www/dialog/_delete_database.html \ www/dialog/_delete_document.html \ www/dialog/_save_view_as.html \ Modified: couchdb/trunk/share/server/mainjs.sh URL: http://svn.apache.org/viewvc/couchdb/trunk/share/server/mainjs.sh?rev=766390&r1=766389&r2=766390&view=diff == --- couchdb/trunk/share/server/mainjs.sh (original) +++ couchdb/trunk/share/server/mainjs.sh Sat Apr 18 20:50:25 2009 @@ -12,13 +12,13 @@ # License for the specific language governing permissions and limitations under # the License. -dirname=`dirname $0` - +cd server cat \ - $dirname/render.js \ - $dirname/state.js \ - $dirname/util.js \ - $dirname/validate.js \ - $dirname/views.js \ - $dirname/loop.js \ - > $dirname/main.js + render.js \ + state.js \ + util.js \ + validate.js \ + views.js \ + loop.js \ + > main.js +cd .. \ No newline at end of file
svn commit: r766392 - /couchdb/trunk/share/Makefile.am
Author: jan Date: Sat Apr 18 20:58:24 2009 New Revision: 766392 URL: http://svn.apache.org/viewvc?rev=766392&view=rev Log: run mainjs.sh if one of the source files changed Modified: couchdb/trunk/share/Makefile.am Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766392&r1=766391&r2=766392&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Sat Apr 18 20:58:24 2009 @@ -10,7 +10,15 @@ ## License for the specific language governing permissions and limitations ## under the License. -server/main.js: +MAKEJS_FILES = \ +server/loop.js \ +server/render.js \ +server/state.js \ +server/util.js \ +server/validate.js \ +server/views.js + +server/main.js: $(MAKEJS_FILES) server/mainjs.sh CLEANFILES = server/main.js
svn commit: r766399 - /couchdb/trunk/share/server/mainjs.sh
Author: jan Date: Sat Apr 18 22:18:52 2009 New Revision: 766399 URL: http://svn.apache.org/viewvc?rev=766399&view=rev Log: add generation-notice Modified: couchdb/trunk/share/server/mainjs.sh Modified: couchdb/trunk/share/server/mainjs.sh URL: http://svn.apache.org/viewvc/couchdb/trunk/share/server/mainjs.sh?rev=766399&r1=766398&r2=766399&view=diff == --- couchdb/trunk/share/server/mainjs.sh (original) +++ couchdb/trunk/share/server/mainjs.sh Sat Apr 18 22:18:52 2009 @@ -12,7 +12,12 @@ # License for the specific language governing permissions and limitations under # the License. +TARGET="main.js" + cd server +echo "// Generated from *.js by makejs.sh on `date`" > $TARGET +echo "// DO NOT EDIT BY HAND\n" >> $TARGET + cat \ render.js \ state.js \ @@ -20,5 +25,5 @@ validate.js \ views.js \ loop.js \ - > main.js + >> $TARGET cd .. \ No newline at end of file
svn commit: r766406 - in /couchdb/trunk/share: Makefile.am server/main.js server/mainjs.sh server/render.js
Author: jan Date: Sat Apr 18 23:32:56 2009 New Revision: 766406 URL: http://svn.apache.org/viewvc?rev=766406&view=rev Log: move main.js generation to Makefile Removed: couchdb/trunk/share/server/main.js couchdb/trunk/share/server/mainjs.sh Modified: couchdb/trunk/share/Makefile.am couchdb/trunk/share/server/render.js Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766406&r1=766405&r2=766406&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Sat Apr 18 23:32:56 2009 @@ -10,16 +10,19 @@ ## License for the specific language governing permissions and limitations ## under the License. +# loop.js MUST be last! MAKEJS_FILES = \ -server/loop.js \ server/render.js \ server/state.js \ server/util.js \ server/validate.js \ -server/views.js +server/views.js \ +server/loop.js server/main.js: $(MAKEJS_FILES) - server/mainjs.sh + @echo "// Generated from *.js by make on `date`" > server/main.js + @echo "// DO NOT EDIT BY HAND\n" >> server/main.js + @cat $(MAKEJS_FILES) >> server/main.js CLEANFILES = server/main.js Modified: couchdb/trunk/share/server/render.js URL: http://svn.apache.org/viewvc/couchdb/trunk/share/server/render.js?rev=766406&r1=766405&r2=766406&view=diff == --- couchdb/trunk/share/server/render.js (original) +++ couchdb/trunk/share/server/render.js Sat Apr 18 23:32:56 2009 @@ -10,7 +10,6 @@ // License for the specific language governing permissions and limitations under // the License. - // mimeparse.js // http://code.google.com/p/mimeparse/ // Code with comments: http://mimeparse.googlecode.com/svn/trunk/mimeparse.js
svn commit: r766407 - /couchdb/trunk/share/Makefile.am
Author: jan Date: Sat Apr 18 23:56:53 2009 New Revision: 766407 URL: http://svn.apache.org/viewvc?rev=766407&view=rev Log: fix make distcheck, thanks Noah Modified: couchdb/trunk/share/Makefile.am Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766407&r1=766406&r2=766407&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Sat Apr 18 23:56:53 2009 @@ -27,7 +27,7 @@ CLEANFILES = server/main.js nobase_dist_localdata_DATA = \ -server/main.js \ +$(MAKEJS_FILES) \ www/dialog/_compact_database.html \ www/dialog/_create_document.html \ www/dialog/_create_database.html \
svn commit: r766456 - /couchdb/trunk/src/couchdb/couch_server_sup.erl
Author: jan
Date: Sun Apr 19 12:12:42 2009
New Revision: 766456
URL: http://svn.apache.org/viewvc?rev=766456&view=rev
Log:
whitespace
Modified:
couchdb/trunk/src/couchdb/couch_server_sup.erl
Modified: couchdb/trunk/src/couchdb/couch_server_sup.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_server_sup.erl?rev=766456&r1=766455&r2=766456&view=diff
==
--- couchdb/trunk/src/couchdb/couch_server_sup.erl (original)
+++ couchdb/trunk/src/couchdb/couch_server_sup.erl Sun Apr 19 12:12:42 2009
@@ -52,9 +52,9 @@
end;
_ -> ok
end,
-
+
{ok, ConfigPid} = couch_config:start_link(IniFiles),
-
+
LogLevel = couch_config:get("log", "level", "info"),
% announce startup
io:format("Apache CouchDB ~s (LogLevel=~s) is starting.~n", [
@@ -68,16 +68,16 @@
|| {{Module, Variable}, Value} <- couch_config:all()];
_ -> ok
end,
-
+
LibDir =
case couch_config:get("couchdb", "util_driver_dir", null) of
null ->
filename:join(code:priv_dir(couch), "lib");
LibDir0 -> LibDir0
end,
-
+
ok = couch_util:start_driver(LibDir),
-
+
BaseChildSpecs =
{{one_for_all, 10, 3600},
[{couch_config,
@@ -99,7 +99,6 @@
supervisor,
[couch_server_sup]}
]},
-
% ensure these applications are running
application:start(ibrowse),
@@ -117,11 +116,11 @@
("daemons", _) ->
?MODULE:stop()
end, Pid),
-
+
unlink(ConfigPid),
-
+
io:format("Apache CouchDB has started. Time to relax.~n"),
-
+
{ok, Pid}.
start_primary_services() ->
@@ -170,11 +169,11 @@
permanent,
brutal_kill,
worker,
-[Module]}
+[Module]}
end
|| {Name, SpecStr}
<- couch_config:get("daemons"), SpecStr /= ""],
-
+
supervisor:start_link({local, couch_secondary_services}, couch_server_sup,
{{one_for_one, 10, 3600}, DaemonChildSpecs}).
svn commit: r766467 - /couchdb/trunk/src/couchdb/couch_server_sup.erl
Author: jan
Date: Sun Apr 19 13:48:40 2009
New Revision: 766467
URL: http://svn.apache.org/viewvc?rev=766467&view=rev
Log:
add a startup checkpoint to couch.log
Modified:
couchdb/trunk/src/couchdb/couch_server_sup.erl
Modified: couchdb/trunk/src/couchdb/couch_server_sup.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_server_sup.erl?rev=766467&r1=766466&r2=766467&view=diff
==
--- couchdb/trunk/src/couchdb/couch_server_sup.erl (original)
+++ couchdb/trunk/src/couchdb/couch_server_sup.erl Sun Apr 19 13:48:40 2009
@@ -120,6 +120,7 @@
unlink(ConfigPid),
io:format("Apache CouchDB has started. Time to relax.~n"),
+?LOG_INFO("Apache CouchDB has started.", []),
{ok, Pid}.
svn commit: r766476 - /couchdb/trunk/share/Makefile.am
Author: jan Date: Sun Apr 19 14:40:18 2009 New Revision: 766476 URL: http://svn.apache.org/viewvc?rev=766476&view=rev Log: add server/main.js to all: target Modified: couchdb/trunk/share/Makefile.am Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766476&r1=766475&r2=766476&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Sun Apr 19 14:40:18 2009 @@ -18,7 +18,9 @@ server/validate.js \ server/views.js \ server/loop.js - + +all: server/main.js + server/main.js: $(MAKEJS_FILES) @echo "// Generated from *.js by make on `date`" > server/main.js @echo "// DO NOT EDIT BY HAND\n" >> server/main.js
svn commit: r766493 - /couchdb/trunk/configure.ac
Author: jan Date: Sun Apr 19 17:57:37 2009 New Revision: 766493 URL: http://svn.apache.org/viewvc?rev=766493&view=rev Log: fix ./configure --help output, ERL[C]_EXECUTABLE are now ERL[C] Modified: couchdb/trunk/configure.ac Modified: couchdb/trunk/configure.ac URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=766493&r1=766492&r2=766493&view=diff == --- couchdb/trunk/configure.ac (original) +++ couchdb/trunk/configure.ac Sun Apr 19 17:57:37 2009 @@ -201,8 +201,8 @@ fi fi -AC_ARG_VAR([ERL_EXECUTABLE], [path to the `erl' executable]) -AC_ARG_VAR([ERLC_EXECUTABLE], [path to the `erlc' executable]) +AC_ARG_VAR([ERL], [path to the `erl' executable]) +AC_ARG_VAR([ERLC], [path to the `erlc' executable]) AC_ARG_VAR([HELP2MAN_EXECUTABLE], [path to the `help2man' program]) if test -n "$HELP2MAN_EXECUTABLE"; then
svn commit: r766506 - /couchdb/trunk/share/Makefile.am
Author: jan Date: Sun Apr 19 20:04:14 2009 New Revision: 766506 URL: http://svn.apache.org/viewvc?rev=766506&view=rev Log: add main.js to install files. Noah, can you double check? Modified: couchdb/trunk/share/Makefile.am Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766506&r1=766505&r2=766506&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Sun Apr 19 20:04:14 2009 @@ -30,6 +30,7 @@ nobase_dist_localdata_DATA = \ $(MAKEJS_FILES) \ +server/main.js \ www/dialog/_compact_database.html \ www/dialog/_create_document.html \ www/dialog/_create_database.html \
svn commit: r766751 - /couchdb/trunk/share/Makefile.am
Author: jan Date: Mon Apr 20 16:55:13 2009 New Revision: 766751 URL: http://svn.apache.org/viewvc?rev=766751&view=rev Log: be more verbose Modified: couchdb/trunk/share/Makefile.am Modified: couchdb/trunk/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766751&r1=766750&r2=766751&view=diff == --- couchdb/trunk/share/Makefile.am (original) +++ couchdb/trunk/share/Makefile.am Mon Apr 20 16:55:13 2009 @@ -22,9 +22,10 @@ all: server/main.js server/main.js: $(MAKEJS_FILES) + @echo "Generating main.js" @echo "// Generated from *.js by make on `date`" > server/main.js - @echo "// DO NOT EDIT BY HAND\n" >> server/main.js @cat $(MAKEJS_FILES) >> server/main.js + @echo "// DO NOT EDIT BY HAND\n" >> server/main.js CLEANFILES = server/main.js
svn commit: r767362 - /couchdb/trunk/acinclude.m4.in
Author: jan Date: Wed Apr 22 04:15:19 2009 New Revision: 767362 URL: http://svn.apache.org/viewvc?rev=767362&view=rev Log: trunk is 0.10.0a Modified: couchdb/trunk/acinclude.m4.in Modified: couchdb/trunk/acinclude.m4.in URL: http://svn.apache.org/viewvc/couchdb/trunk/acinclude.m4.in?rev=767362&r1=767361&r2=767362&view=diff == --- couchdb/trunk/acinclude.m4.in (original) +++ couchdb/trunk/acinclude.m4.in Wed Apr 22 04:15:19 2009 @@ -17,7 +17,7 @@ m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB]) m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB]) m4_define([LOCAL_VERSION_MAJOR], [0]) -m4_define([LOCAL_VERSION_MINOR], [9]) +m4_define([LOCAL_VERSION_MINOR], [10]) m4_define([LOCAL_VERSION_REVISION], [0]) m4_define([LOCAL_VERSION_STAGE], [a]) m4_define([LOCAL_VERSION_RELEASE], [%release%])
svn commit: r769181 - /couchdb/trunk/etc/couchdb/local.ini
Author: jan Date: Mon Apr 27 22:04:18 2009 New Revision: 769181 URL: http://svn.apache.org/viewvc?rev=769181&view=rev Log: add newline at the end of ini file to make quick editing work, also POSIX Modified: couchdb/trunk/etc/couchdb/local.ini Modified: couchdb/trunk/etc/couchdb/local.ini URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/local.ini?rev=769181&r1=769180&r2=769181&view=diff == --- couchdb/trunk/etc/couchdb/local.ini (original) +++ couchdb/trunk/etc/couchdb/local.ini Mon Apr 27 22:04:18 2009 @@ -12,7 +12,7 @@ ;bind_address = 127.0.0.1 [log] -;level = debug +level = debug [update_notification] ;unique notifier name=/full/path/to/exe -with "cmd line arg" @@ -24,4 +24,4 @@ ; 'username = password' lines. Don't forget to restart CouchDB after ; changing this. ;[admins] -;admin = mysecretpassword \ No newline at end of file +;admin = mysecretpassword
svn commit: r769211 - /couchdb/trunk/etc/couchdb/local.ini
Author: jan Date: Tue Apr 28 00:16:34 2009 New Revision: 769211 URL: http://svn.apache.org/viewvc?rev=769211&view=rev Log: undo local change Modified: couchdb/trunk/etc/couchdb/local.ini Modified: couchdb/trunk/etc/couchdb/local.ini URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/local.ini?rev=769211&r1=769210&r2=769211&view=diff == --- couchdb/trunk/etc/couchdb/local.ini (original) +++ couchdb/trunk/etc/couchdb/local.ini Tue Apr 28 00:16:34 2009 @@ -12,7 +12,7 @@ ;bind_address = 127.0.0.1 [log] -level = debug +;level = debug [update_notification] ;unique notifier name=/full/path/to/exe -with "cmd line arg"
svn commit: r774095 - in /couchdb/trunk/src/couchdb: couch_httpd_misc_handlers.erl couch_log.erl
Author: jan
Date: Tue May 12 21:18:40 2009
New Revision: 774095
URL: http://svn.apache.org/viewvc?rev=774095&view=rev
Log:
add offset parameter so clients like Futon can deliver a consistent user
experience
Modified:
couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl
couchdb/trunk/src/couchdb/couch_log.erl
Modified: couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl?rev=774095&r1=774094&r2=774095&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl Tue May 12 21:18:40
2009
@@ -198,12 +198,15 @@
% httpd log handlers
handle_log_req(#httpd{method='GET'}=Req) ->
-LastBytes = list_to_integer(couch_httpd:qs_value(Req, "bytes", "1000")),
+Bytes = list_to_integer(couch_httpd:qs_value(Req, "bytes", "1000")),
+Offset = list_to_integer(couch_httpd:qs_value(Req, "offset", "0")),
+Chunk = couch_log:read(Bytes, Offset),
{ok, Resp} = start_chunked_response(Req, 200, [
% send a plaintext response
-{"Content-Type", "text/plain; charset=utf-8"}
+{"Content-Type", "text/plain; charset=utf-8"},
+{"Content-Length", integer_to_list(length(Chunk))}
]),
-send_chunk(Resp, couch_log:read(LastBytes)),
+send_chunk(Resp, Chunk),
send_chunk(Resp, "");
handle_log_req(Req) ->
send_method_not_allowed(Req, "GET").
Modified: couchdb/trunk/src/couchdb/couch_log.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_log.erl?rev=774095&r1=774094&r2=774095&view=diff
==
--- couchdb/trunk/src/couchdb/couch_log.erl (original)
+++ couchdb/trunk/src/couchdb/couch_log.erl Tue May 12 21:18:40 2009
@@ -16,7 +16,7 @@
-export([start_link/0,stop/0]).
-export([debug_on/0,info_on/0,get_level/0,get_level_integer/0, set_level/1]).
-export([init/1, handle_event/2, terminate/2, code_change/3, handle_info/2,
handle_call/2]).
--export([read/1]).
+-export([read/2]).
-define(LEVEL_ERROR, 3).
-define(LEVEL_INFO, 2).
@@ -122,12 +122,12 @@
{ok, Msg2, _} = regexp:gsub(lists:flatten(Msg),"\\r\\n|\\r|\\n", "\r\n"),
ok = io:format(Fd, "[~s] [~s] [~p] ~s\r~n\r~n",
[httpd_util:rfc1123_date(), Level, Pid, Msg2]).
-read(LastBytes) ->
+read(Bytes, Offset) ->
LogFileName = couch_config:get("log", "file"),
LogFileSize = couch_util:file_read_size(LogFileName),
-{ok, Fd} = file:open(LogFileName, [binary]),
-Start = lists:max([LogFileSize - LastBytes, 0]),
+{ok, Fd} = file:open(LogFileName, [read]),
+Start = lists:max([LogFileSize - Bytes, 0]) + Offset,
% TODO: truncate chopped first line
% TODO: make streaming
svn commit: r774045 - in /couchdb/trunk: etc/couchdb/default.ini.tpl.in src/couchdb/couch_httpd_misc_handlers.erl src/couchdb/couch_log.erl src/couchdb/couch_util.erl
Author: jan
Date: Tue May 12 19:36:15 2009
New Revision: 774045
URL: http://svn.apache.org/viewvc?rev=774045&view=rev
Log:
Add non-streaming log-file handler. A GET request to /_log will show the last
1000 bytes of the logflie. More bytes can be requested with GET
/_log?bytes=1.
Modified:
couchdb/trunk/etc/couchdb/default.ini.tpl.in
couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl
couchdb/trunk/src/couchdb/couch_log.erl
couchdb/trunk/src/couchdb/couch_util.erl
Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL:
http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=774045&r1=774044&r2=774045&view=diff
==
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Tue May 12 19:36:15 2009
@@ -59,6 +59,7 @@
_uuids = {couch_httpd_misc_handlers, handle_uuids_req}
_restart = {couch_httpd_misc_handlers, handle_restart_req}
_stats = {couch_httpd_stats_handlers, handle_stats_req}
+_log = {couch_httpd_misc_handlers, handle_log_req}
[httpd_db_handlers]
_compact = {couch_httpd_db, handle_compact_req}
Modified: couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl?rev=774045&r1=774044&r2=774045&view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl Tue May 12 19:36:15
2009
@@ -14,7 +14,7 @@
-export([handle_welcome_req/2,handle_favicon_req/2,handle_utils_dir_req/2,
handle_all_dbs_req/1,handle_replicate_req/1,handle_restart_req/1,
-handle_uuids_req/1,handle_config_req/1,
+handle_uuids_req/1,handle_config_req/1,handle_log_req/1,
handle_task_status_req/1]).
-export([increment_update_seq_req/2]).
@@ -195,3 +195,15 @@
increment_update_seq_req(Req, _Db) ->
send_method_not_allowed(Req, "POST").
+% httpd log handlers
+
+handle_log_req(#httpd{method='GET'}=Req) ->
+LastBytes = list_to_integer(couch_httpd:qs_value(Req, "bytes", "1000")),
+{ok, Resp} = start_chunked_response(Req, 200, [
+% send a plaintext response
+{"Content-Type", "text/plain; charset=utf-8"}
+]),
+send_chunk(Resp, couch_log:read(LastBytes)),
+send_chunk(Resp, "");
+handle_log_req(Req) ->
+send_method_not_allowed(Req, "GET").
Modified: couchdb/trunk/src/couchdb/couch_log.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_log.erl?rev=774045&r1=774044&r2=774045&view=diff
==
--- couchdb/trunk/src/couchdb/couch_log.erl (original)
+++ couchdb/trunk/src/couchdb/couch_log.erl Tue May 12 19:36:15 2009
@@ -16,6 +16,7 @@
-export([start_link/0,stop/0]).
-export([debug_on/0,info_on/0,get_level/0,get_level_integer/0, set_level/1]).
-export([init/1, handle_event/2, terminate/2, code_change/3, handle_info/2,
handle_call/2]).
+-export([read/1]).
-define(LEVEL_ERROR, 3).
-define(LEVEL_INFO, 2).
@@ -120,3 +121,16 @@
ok = io:format("[~s] [~p] ~s~n", [Level, Pid, Msg]), % dump to console too
{ok, Msg2, _} = regexp:gsub(lists:flatten(Msg),"\\r\\n|\\r|\\n", "\r\n"),
ok = io:format(Fd, "[~s] [~s] [~p] ~s\r~n\r~n",
[httpd_util:rfc1123_date(), Level, Pid, Msg2]).
+
+read(LastBytes) ->
+LogFileName = couch_config:get("log", "file"),
+LogFileSize = couch_util:file_read_size(LogFileName),
+
+{ok, Fd} = file:open(LogFileName, [binary]),
+Start = lists:max([LogFileSize - LastBytes, 0]),
+
+% TODO: truncate chopped first line
+% TODO: make streaming
+
+{ok, Chunk} = file:pread(Fd, Start, LogFileSize),
+Chunk.
Modified: couchdb/trunk/src/couchdb/couch_util.erl
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_util.erl?rev=774045&r1=774044&r2=774045&view=diff
==
--- couchdb/trunk/src/couchdb/couch_util.erl (original)
+++ couchdb/trunk/src/couchdb/couch_util.erl Tue May 12 19:36:15 2009
@@ -17,8 +17,10 @@
-export([new_uuid/0, rand32/0, implode/2, collate/2, collate/3]).
-export([abs_pathname/1,abs_pathname/2, trim/1, ascii_lower/1]).
-export([encodeBase64/1, decodeBase64/1, to_hex/1,parse_term/1,dict_find/3]).
+-export([file_read_size/1]).
-include("couch_db.hrl").
+-include_lib("kernel/include/file.hrl").
% arbitrarily chosen amount of memory to use before flushing to disk
-define(FLUSH_MAX_MEM, 1000).
@@ -291,3 +293,11 @@
error ->
DefaultValue
end.
+
+
+file_read_size(FileName) ->
+case file:read_file_info(FileName) of
+{ok, FileInfo} ->
+FileInfo#file_info.size;
+Error -> Error
+end.
svn commit: r774296 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb share/www/script/test/show_documents.js
Author: jan
Date: Wed May 13 12:46:16 2009
New Revision: 774296
URL: http://svn.apache.org/viewvc?rev=774296&view=rev
Log:
blocked r774045 and r774095 from trunk
Modified:
couchdb/branches/0.9.x/ (props changed)
couchdb/branches/0.9.x/etc/default/couchdb (props changed)
couchdb/branches/0.9.x/share/www/script/test/show_documents.js
Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:46:16 2009
@@ -1,3 +1,3 @@
/couchdb/branches/design_resources:751716-751803
/couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774180-774181
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774045,774095,774180-774181
Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:46:16 2009
@@ -1,4 +1,4 @@
/couchdb/branches/design_resources/etc/default/couchdb:751716-751803
/couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774045,774095,774180-774181
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.9.x/share/www/script/test/show_documents.js
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/share/www/script/test/show_documents.js?rev=774296&r1=774295&r2=774296&view=diff
==
--- couchdb/branches/0.9.x/share/www/script/test/show_documents.js (original)
+++ couchdb/branches/0.9.x/share/www/script/test/show_documents.js Wed May 13
12:46:16 2009
@@ -33,7 +33,8 @@
}
}),
"just-name" : stringFun(function(doc, req) {
-if (doc) {
+if (docm
+
return {
body : "Just " + doc.name
};
svn commit: r774301 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 12:49:01 2009 New Revision: 774301 URL: http://svn.apache.org/viewvc?rev=774301&view=rev Log: blocked r769181 and r769211 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:49:01 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:49:01 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774302 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 12:50:10 2009 New Revision: 774302 URL: http://svn.apache.org/viewvc?rev=774302&view=rev Log: blocked r767362 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:50:10 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:50:10 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774304 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 12:54:52 2009 New Revision: 774304 URL: http://svn.apache.org/viewvc?rev=774304&view=rev Log: blocked r766390, r766392, r766399, r766406, r766476, r766506 and r766751 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:54:52 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:54:52 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774306 - in /couchdb/branches/0.9.x: ./ configure.ac etc/default/couchdb
Author: jan Date: Wed May 13 12:58:07 2009 New Revision: 774306 URL: http://svn.apache.org/viewvc?rev=774306&view=rev Log: mergeed r766493 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/configure.ac couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:58:07 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Modified: couchdb/branches/0.9.x/configure.ac URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/configure.ac?rev=774306&r1=774305&r2=774306&view=diff == --- couchdb/branches/0.9.x/configure.ac (original) +++ couchdb/branches/0.9.x/configure.ac Wed May 13 12:58:07 2009 @@ -201,8 +201,8 @@ fi fi -AC_ARG_VAR([ERL_EXECUTABLE], [path to the `erl' executable]) -AC_ARG_VAR([ERLC_EXECUTABLE], [path to the `erlc' executable]) +AC_ARG_VAR([ERL], [path to the `erl' executable]) +AC_ARG_VAR([ERLC], [path to the `erlc' executable]) AC_ARG_VAR([HELP2MAN_EXECUTABLE], [path to the `help2man' program]) if test -n "$HELP2MAN_EXECUTABLE"; then Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:58:07 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774307 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 12:58:49 2009 New Revision: 774307 URL: http://svn.apache.org/viewvc?rev=774307&view=rev Log: blocked r766467 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:58:49 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:58:49 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774308 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 12:59:32 2009 New Revision: 774308 URL: http://svn.apache.org/viewvc?rev=774308&view=rev Log: blocked r766456 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:59:32 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 12:59:32 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774310 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:01:22 2009 New Revision: 774310 URL: http://svn.apache.org/viewvc?rev=774310&view=rev Log: blocked r764835 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:01:22 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:01:22 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774311 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:02:32 2009 New Revision: 774311 URL: http://svn.apache.org/viewvc?rev=774311&view=rev Log: blocked r762574 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:02:32 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:02:32 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774312 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:03:07 2009 New Revision: 774312 URL: http://svn.apache.org/viewvc?rev=774312&view=rev Log: blocked r760533 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:03:07 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:03:07 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774313 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:03:34 2009 New Revision: 774313 URL: http://svn.apache.org/viewvc?rev=774313&view=rev Log: blocked r759588 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:03:34 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:03:34 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774314 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:05:12 2009 New Revision: 774314 URL: http://svn.apache.org/viewvc?rev=774314&view=rev Log: blocked r758942 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:05:12 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:05:12 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774315 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:05:31 2009 New Revision: 774315 URL: http://svn.apache.org/viewvc?rev=774315&view=rev Log: blocked r758768 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:05:31 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:05:31 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774317 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:06:25 2009 New Revision: 774317 URL: http://svn.apache.org/viewvc?rev=774317&view=rev Log: blocked r758723 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:06:25 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:06:25 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774320 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb src/couchdb/couch_httpd.erl
Author: jan
Date: Wed May 13 13:12:51 2009
New Revision: 774320
URL: http://svn.apache.org/viewvc?rev=774320&view=rev
Log:
merged r762019 from trunk
Modified:
couchdb/branches/0.9.x/ (props changed)
couchdb/branches/0.9.x/etc/default/couchdb (props changed)
couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl
Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:12:51 2009
@@ -1,3 +1,3 @@
/couchdb/branches/design_resources:751716-751803
/couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:12:51 2009
@@ -1,4 +1,4 @@
/couchdb/branches/design_resources/etc/default/couchdb:751716-751803
/couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl?rev=774320&r1=774319&r2=774320&view=diff
==
--- couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl Wed May 13 13:12:51 2009
@@ -109,7 +109,7 @@
handle_request(MochiReq, UrlHandlers, DbUrlHandlers, DesignUrlHandlers) ->
-statistics(runtime), % prepare request_time counter, see end of function
+Begin = now(),
AuthenticationFun = make_arity_1_fun(
couch_config:get("httpd", "authentication_handler")),
% for the path, use the raw path with the query string and fragment
@@ -180,7 +180,7 @@
RawUri,
Resp:get(code)
]),
-{_TotalRuntime, RequestTime} = statistics(runtime),
+RequestTime = round(timer:now_diff(now(), Begin)/1000),
couch_stats_collector:record({couchdb, request_time}, RequestTime),
couch_stats_collector:increment({httpd, requests}),
{ok, Resp}.
svn commit: r774321 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:13:11 2009 New Revision: 774321 URL: http://svn.apache.org/viewvc?rev=774321&view=rev Log: blocked r762153 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:13:11 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:13:11 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774322 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:13:54 2009 New Revision: 774322 URL: http://svn.apache.org/viewvc?rev=774322&view=rev Log: blocked r763816 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:13:54 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:13:54 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774323 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:14:12 2009 New Revision: 774323 URL: http://svn.apache.org/viewvc?rev=774323&view=rev Log: blocked r763818 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:14:12 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:14:12 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774324 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:14:37 2009 New Revision: 774324 URL: http://svn.apache.org/viewvc?rev=774324&view=rev Log: blocked r763833 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:14:37 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:14:37 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774325 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:14:56 2009 New Revision: 774325 URL: http://svn.apache.org/viewvc?rev=774325&view=rev Log: blocked r764257 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:14:56 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:14:56 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774326 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:15:28 2009 New Revision: 774326 URL: http://svn.apache.org/viewvc?rev=774326&view=rev Log: blocked r765419 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:15:28 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:15:28 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774328 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:15:58 2009 New Revision: 774328 URL: http://svn.apache.org/viewvc?rev=774328&view=rev Log: blocked r765819 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:15:58 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:15:58 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774329 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:16:31 2009 New Revision: 774329 URL: http://svn.apache.org/viewvc?rev=774329&view=rev Log: blocked r766383 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:16:31 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:16:31 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
svn commit: r774330 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
Author: jan Date: Wed May 13 13:16:58 2009 New Revision: 774330 URL: http://svn.apache.org/viewvc?rev=774330&view=rev Log: blocked r766407 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:16:58 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:16:58 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440
