Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge 0.4.x

  • Loading branch information...
commit 986c86bf4355ea2b772e141d008efd1894b7df30 2 parents f5913f7 + db23528
Robert Newson authored
View
6 README.md
@@ -15,7 +15,6 @@ used for read/write operations.
BigCouch is made available under an Apache 2.0 license. See the LICENSE file
for details.
-
## Getting Started
If your main intent is to use BigCouch, you can follow [this
@@ -27,7 +26,6 @@ More information can be found on the official [BigCouch
website](http://bigcouch.cloudant.com/). You can also ask questions on or
subscribe to [the mailing list](http://groups.google.com/group/bigcouch-user).
-
## Troubleshooting
Please see http://bigcouch.cloudant.com/troubleshoot
@@ -37,10 +35,6 @@ Please see http://bigcouch.cloudant.com/troubleshoot
Cloudant folks are usually hanging out in IRC. Freenode, channel #cloudant.
There's also a [Google Group](http://groups.google.com/group/bigcouch-user).
-----
-
[1]: http://couchdb.apache.org
[2]: http://cloudant.com
-[3]: http://haproxy.1wt.eu/
[4]: http://www.allthingsdistributed.com/2007/10/amazons_dynamo.html
-[5]: https://github.com/cloudant/bigcouch/wiki/API-Extensions
View
4 apps/couch/CHANGES
@@ -4,8 +4,7 @@ Apache CouchDB CHANGES
Version 1.1.1
-------------
-This version has not been released yet.
-
+* Support SpiderMonkey 1.8.5
* Add configurable maximum to the number of bytes returned by _log.
* Allow CommonJS modules to be an empty string.
* Bump minimum Erlang version to R13B02.
@@ -29,6 +28,7 @@ This version has not been released yet.
* Fix replication crash when source database has a document with empty ID.
* Fix deadlock when assigning couchjs processes to serve requests.
* Fixes to the document multipart PUT API.
+* Fixes regarding file descriptor leaks for databases with views.
Version 1.1.0
-------------
View
4 apps/couch/NEWS
@@ -10,8 +10,7 @@ Each release section notes when backwards incompatible changes have been made.
Version 1.1.1
-------------
-This version has not been released yet.
-
+* Support SpiderMonkey 1.8.5
* Add configurable maximum to the number of bytes returned by _log.
* Allow CommonJS modules to be an empty string.
* Bump minimum Erlang version to R13B02.
@@ -35,6 +34,7 @@ This version has not been released yet.
* Fix replication crash when source database has a document with empty ID.
* Fix deadlock when assigning couchjs processes to serve requests.
* Fixes to the document multipart PUT API.
+* Fixes regarding file descriptor leaks for databases with views.
Version 1.1.0
-------------
View
19 apps/couch/src/couch_rep_writer.erl
@@ -126,13 +126,18 @@ write_multi_part_doc(#http_db{headers=Headers} = Db, #doc{atts=Atts} = Doc) ->
{"Content-Length", Len} | Headers
]
},
- Result = case couch_rep_httpc:request(Request) of
- {[{<<"error">>, Error}, {<<"reason">>, Reason}]} ->
- {Pos, [RevId | _]} = Doc#doc.revs,
- ErrId = couch_util:to_existing_atom(Error),
- [{Doc#doc.id, couch_doc:rev_to_str({Pos, RevId})}, {ErrId, Reason}];
- _ ->
- []
+ Conn = couch_rep_httpc:spawn_link_worker_process(Request),
+ Result = try
+ case couch_rep_httpc:request(Request#http_db{conn=Conn}) of
+ {[{<<"error">>, Error}, {<<"reason">>, Reason}]} ->
+ {Pos, [RevId | _]} = Doc#doc.revs,
+ ErrId = couch_util:to_existing_atom(Error),
+ [{Doc#doc.id, couch_doc:rev_to_str({Pos, RevId})}, {ErrId, Reason}];
+ _ ->
+ []
+ end
+ after
+ ibrowse:stop_worker_process(Conn)
end,
StreamerPid ! stop,
Result.
View
2  couchjs/c_src/help.h
@@ -51,7 +51,7 @@ static const char USAGE_TEMPLATE[] =
" -H enable %s cURL bindings (only avaiable\n"
" if package was built with cURL available)\n"
" -S SIZE specify that the interpreter should set the\n"
- " the stack quota for JS contexts to SIZE bytes\n"
+ " stack quota for JS contexts to SIZE bytes\n"
"\n"
"Report bugs at <%s>.\n";
View
12 couchjs/c_src/http.c
@@ -181,7 +181,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc)
goto done;
}
- if(mth == JSVAL_VOID) {
+ if(JSVAL_IS_VOID(mth)) {
JS_ReportError(cx, "You must specify a method.");
goto done;
}
@@ -203,7 +203,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc)
http->method = methid;
- if(url == JSVAL_VOID) {
+ if(JSVAL_IS_VOID(url)) {
JS_ReportError(cx, "You must specify a URL.");
goto done;
}
@@ -219,7 +219,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc)
goto done;
}
- if(snc != JSVAL_FALSE) {
+ if(JSVAL_IS_BOOLEAN(snc) && JSVAL_TO_BOOLEAN(snc)) {
JS_ReportError(cx, "Synchronous flag must be false.");
goto done;
}
@@ -255,7 +255,7 @@ http_set_hdr(JSContext* cx, JSObject* req, jsval name, jsval val)
goto done;
}
- if(name == JSVAL_VOID)
+ if(JSVAL_IS_VOID(name))
{
JS_ReportError(cx, "You must speciy a header name.");
goto done;
@@ -268,7 +268,7 @@ http_set_hdr(JSContext* cx, JSObject* req, jsval name, jsval val)
goto done;
}
- if(val == JSVAL_VOID)
+ if(JSVAL_IS_VOID(val))
{
JS_ReportError(cx, "You must specify a header value.");
goto done;
@@ -313,7 +313,7 @@ http_send(JSContext* cx, JSObject* req, jsval body)
goto done;
}
- if(body != JSVAL_VOID && body != JS_GetEmptyStringValue(cx)) {
+ if(!JSVAL_IS_VOID(body)) {
bodystr = enc_string(cx, body, &bodylen);
if(!bodystr) {
JS_ReportError(cx, "Failed to encode body.");
View
2  couchjs/c_src/sm185.c
@@ -312,7 +312,7 @@ main(int argc, const char* argv[])
JSObject* global = NULL;
JSCrossCompartmentCall *call = NULL;
JSObject* klass = NULL;
- JSObject* script;
+ JSSCRIPT_TYPE script;
JSString* scriptsrc;
const jschar* schars;
size_t slen;
View
20 make_tarball
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+COUCHDB_VERSION=`git describe --match 1.*`
+BIGCOUCH_VERSION=`git describe`
+
+rm -rf .tmp
+git archive HEAD --prefix=.tmp/bigcouch/ | tar xf -
+pushd .tmp/bigcouch
+git init
+git add --all
+git commit -m "Tarball commit"
+git tag -m "CouchDB version" "$COUCHDB_VERSION"
+echo "This is the release tarball for $BIGCOUCH_VERSION" > BUILD
+git add BUILD
+git commit -am "Tarball commit"
+git tag -m "BigCouch version" "$BIGCOUCH_VERSION"
+popd
+
+tar czf $BIGCOUCH_VERSION.tar.gz -C .tmp bigcouch
+rm -rf .tmp
View
14 rebar.config
@@ -14,19 +14,19 @@
{deps, [
{oauth, ".*", {git, "https://github.com/cloudant/erlang-oauth.git",
- {branch, "couch"}}},
+ {tag, "BigCouch-0.4.0"}}},
{ibrowse, ".*", {git, "https://github.com/cloudant/ibrowse.git",
- {branch, "couch_1.1"}}},
+ {tag, "CouchDB-1.1.0"}}},
{mochiweb, ".*", {git, "https://github.com/cloudant/mochiweb.git",
- {branch, "couch_1.1"}}},
+ {tag, "CouchDB-1.1.0"}}},
{rexi, ".*", {git, "https://github.com/cloudant/rexi.git",
- master}},
+ {tag, "1.5.5"}}},
{fabric, ".*", {git, "https://github.com/cloudant/fabric.git",
- master}},
+ {tag, "2.0.4"}}},
{mem3, ".*", {git, "https://github.com/cloudant/mem3.git",
- master}},
+ {tag, "2.0.0"}}},
{chttpd, ".*", {git, "https://github.com/cloudant/chttpd.git",
- master}}
+ {tag, "1.4.3"}}}
]}.
% needed for a clean transition to the deps model
{clean_files, [
View
2  rel/reltool.config
@@ -14,7 +14,7 @@
{sys, [
{lib_dirs, ["../apps", "../deps"]},
- {rel, "bigcouch", "0.4a", [
+ {rel, "bigcouch", "0.4.0", [
kernel,
stdlib,
sasl,
Please sign in to comment.
Something went wrong with that request. Please try again.