You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/07 00:33:10 UTC
[1/5] couchdb commit: updated refs/heads/1843-feature-bigcouch to
9bc60be
Updated Branches:
refs/heads/1843-feature-bigcouch 3688eab9d -> 9bc60be52
Enable coffescript on dev/run nodes
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/84ed5924
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/84ed5924
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/84ed5924
Branch: refs/heads/1843-feature-bigcouch
Commit: 84ed592442c00f0df0ec2173a437374fba035559
Parents: 3688eab
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:28:54 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 17:28:54 2014 -0600
----------------------------------------------------------------------
dev/run | 11 ++++++++++-
rel/overlay/etc/default.ini | 3 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/84ed5924/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 1e40eb1..e898acf 100755
--- a/dev/run
+++ b/dev/run
@@ -62,9 +62,14 @@ def hack_default_ini(opts, node, args, contents):
# Replace couchjs command
couchjs = os.path.join(COUCHDB, "src", "couch", "priv", "couchjs")
mainjs = os.path.join(COUCHDB, "share", "server", "main.js")
+ coffeejs = os.path.join(COUCHDB, "share", "server", "main-coffee.js")
+
repl = "javascript = %s %s" % (couchjs, mainjs)
contents = re.sub("(?m)^javascript.*$", repl, contents)
+ repl = "coffeescript = %s %s" % (couchjs, coffeejs)
+ contents = re.sub("(?m)^coffeescript.*$", repl, contents)
+
return contents
@@ -203,7 +208,11 @@ def reboot_nodes():
def run_command(cmd):
p = sp.Popen(cmd, shell=True, stdout=sp.PIPE, stderr=sys.stderr)
- for line in p.stdout:
+ while True:
+ line = p.stdout.readline()
+ if not line:
+ break
+ sys.stderr.write("AND DOING" + os.linesep)
try:
eval(line)
except:
http://git-wip-us.apache.org/repos/asf/couchdb/blob/84ed5924/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index be1745d..f40619f 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -41,7 +41,8 @@ timeout = 600 ; number of seconds before automatic logout
auth_cache_size = 50 ; size is number of cache entries
[query_servers]
-javascript = {{prefix}}/bin/couchjs {{prefix}}/share/couchjs/main.js
+javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
+coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js
[query_server_config]
reduce_limit = true
[4/5] couchdb commit: updated refs/heads/1843-feature-bigcouch to
9bc60be
Posted by da...@apache.org.
squash to coffee
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/39c5c977
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/39c5c977
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/39c5c977
Branch: refs/heads/1843-feature-bigcouch
Commit: 39c5c977f29abd69abe0e90113bdaa92bc96e283
Parents: f7ec006
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:31:37 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 17:31:37 2014 -0600
----------------------------------------------------------------------
dev/run | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/39c5c977/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index e898acf..fc76476 100755
--- a/dev/run
+++ b/dev/run
@@ -212,7 +212,6 @@ def run_command(cmd):
line = p.stdout.readline()
if not line:
break
- sys.stderr.write("AND DOING" + os.linesep)
try:
eval(line)
except:
[3/5] couchdb commit: updated refs/heads/1843-feature-bigcouch to
9bc60be
Posted by da...@apache.org.
Reload the configuration for each tests
I accidentally lost this in a rebase or merge somewhere.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f7ec006a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f7ec006a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f7ec006a
Branch: refs/heads/1843-feature-bigcouch
Commit: f7ec006ab36752080680e0f7f4445dbc7e46fc4e
Parents: 322cfdb
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:30:13 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 17:30:23 2014 -0600
----------------------------------------------------------------------
test/javascript/cli_runner.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f7ec006a/test/javascript/cli_runner.js
----------------------------------------------------------------------
diff --git a/test/javascript/cli_runner.js b/test/javascript/cli_runner.js
index 6688bae..b63d1e7 100644
--- a/test/javascript/cli_runner.js
+++ b/test/javascript/cli_runner.js
@@ -18,6 +18,7 @@
* test object, return an error.
*/
function runTest() {
+ CouchDB.reloadConfig();
var count = 0;
var start = new Date().getTime();
[2/5] couchdb commit: updated refs/heads/1843-feature-bigcouch to
9bc60be
Posted by da...@apache.org.
Reenable the stats aggregator
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/322cfdb6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/322cfdb6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/322cfdb6
Branch: refs/heads/1843-feature-bigcouch
Commit: 322cfdb633f0d74dcb1980bfcdbf92d85fee89f9
Parents: 84ed592
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:29:19 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 17:29:19 2014 -0600
----------------------------------------------------------------------
rel/overlay/etc/default.ini | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/322cfdb6/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index f40619f..56e5dcb 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -53,6 +53,7 @@ external_manager={couch_external_manager, start_link, []}
query_servers={couch_proc_manager, start_link, []}
httpd={couch_httpd, start_link, []}
stats_collector={couch_stats_collector, start, []}
+stats_aggregator={couch_stats_aggregator, start, []}
uuids={couch_uuids, start, []}
auth_cache={couch_auth_cache, start_link, []}
vhosts={couch_httpd_vhost, start_link, []}
[5/5] couchdb commit: updated refs/heads/1843-feature-bigcouch to
9bc60be
Posted by da...@apache.org.
Avoid iterating pipe handles for latency
Aparrently the line iterator on these pipe objects introduces a bit of
latency. The delayed_commits test breaks if the server doesn't restart
within a second so this is the fix.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9bc60be5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9bc60be5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9bc60be5
Branch: refs/heads/1843-feature-bigcouch
Commit: 9bc60be52c987aa04b78cae48160c2cfbc49fd1e
Parents: 39c5c97
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:31:59 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 17:31:59 2014 -0600
----------------------------------------------------------------------
test/javascript/run | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9bc60be5/test/javascript/run
----------------------------------------------------------------------
diff --git a/test/javascript/run b/test/javascript/run
index fa7f391..e120d72 100755
--- a/test/javascript/run
+++ b/test/javascript/run
@@ -55,9 +55,13 @@ def run_couchjs(test):
stdout = sp.PIPE,
stderr = sys.stderr
)
- for line in p.stdout:
+ while True:
+ line = p.stdout.readline()
+ if not line:
+ break
if line.strip() == "restart":
- print "reboot_nodes()"
+ sys.stdout.write("reboot_nodes()" + os.linesep)
+ sys.stdout.flush()
else:
sys.stderr.write(line)
p.wait()