couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vatam...@apache.org
Subject couch commit: updated refs/heads/master to 63ef337
Date Fri, 03 Mar 2017 15:43:18 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 0080f15e9 -> 63ef33747


Fix `badarith` error in couch_db:get_db_info call

When folding we account for a previous `null`, `undefined`, or a number. However
btree:size/1 returns 0, `nil` or a number.

Switched `undefined` to `nil`. Couldn't find where btree:size would ever return
`undefined`, it seems we meant to use `nil` instead.

COUCHDB-3316


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/63ef3374
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/63ef3374
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/63ef3374

Branch: refs/heads/master
Commit: 63ef337475a266379c7208f52f827980e69d1d1b
Parents: 0080f15
Author: Nick Vatamaniuc <vatamane@apache.org>
Authored: Thu Mar 2 21:24:52 2017 -0500
Committer: Nick Vatamaniuc <vatamane@apache.org>
Committed: Thu Mar 2 21:24:52 2017 -0500

----------------------------------------------------------------------
 src/couch_db.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/63ef3374/src/couch_db.erl
----------------------------------------------------------------------
diff --git a/src/couch_db.erl b/src/couch_db.erl
index 8005e6d..d01a3e0 100644
--- a/src/couch_db.erl
+++ b/src/couch_db.erl
@@ -391,7 +391,7 @@ active_size(#db{}=Db, #size_info{}=SI) ->
         case couch_btree:size(T) of
             _ when Acc == null ->
                 null;
-            undefined ->
+            nil ->
                 null;
             Size ->
                 Acc + Size


Mime
View raw message