diff options
| -rw-r--r-- | share/www/script/test/stats.js | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_stats_aggregator.erl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/share/www/script/test/stats.js b/share/www/script/test/stats.js index 90d8f462..204fe302 100644 --- a/share/www/script/test/stats.js +++ b/share/www/script/test/stats.js @@ -393,7 +393,7 @@ couchTests.stats = function(debug) { 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); diff --git a/src/couchdb/couch_stats_aggregator.erl b/src/couchdb/couch_stats_aggregator.erl index 4cdcb4a2..83340c01 100644 --- a/src/couchdb/couch_stats_aggregator.erl +++ b/src/couchdb/couch_stats_aggregator.erl @@ -260,7 +260,6 @@ aggregate_to_json_term(#aggregates{min=Min,max=Max,mean=Mean,stddev=Stddev,count {min, Min}, {max, Max}, {stddev, Stddev}, - {resolution, 1}, {description, Description} ]}. @@ -271,7 +270,7 @@ get_stats(Key, State) -> % 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 |