diff options
| author | Christopher Lenz <cmlenz@apache.org> | 2008-08-31 09:43:41 +0000 |
|---|---|---|
| committer | Christopher Lenz <cmlenz@apache.org> | 2008-08-31 09:43:41 +0000 |
| commit | 15a175144d83d6177e9bbb923a7f7157e5ea8917 (patch) | |
| tree | 92b7becc9610c46f87ddf7ab4c313642b007c4aa /src/couchdb/couch_db_updater.erl | |
| parent | ac4075a7987dc43aadeb18a94e07f090d1b77546 (diff) | |
Merged json_term_changes branch back into trunk.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@690668 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db_updater.erl')
| -rw-r--r-- | src/couchdb/couch_db_updater.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/couchdb/couch_db_updater.erl b/src/couchdb/couch_db_updater.erl index f0673af9..befbfed2 100644 --- a/src/couchdb/couch_db_updater.erl +++ b/src/couchdb/couch_db_updater.erl @@ -96,7 +96,7 @@ handle_cast({compact_done, CompactFilepath}, #db{filepath=Filepath}=Db) -> file:delete(Filepath ++ ".old"), ok = gen_server:call(Db#db.main_pid, {db_updated, NewDb2}), - ?LOG_INFO("Compaction for db ~p completed.", [Db#db.name]), + ?LOG_INFO("Compaction for db \"~s\" completed.", [Db#db.name]), {noreply, NewDb2#db{compactor_pid=nil}}; false -> ?LOG_INFO("Compaction file still behind main file " @@ -287,7 +287,7 @@ update_docs_int(Db, DocsList, Options) -> {DocsList2, NonRepDocs} = lists:foldl( fun([#doc{id=Id}=Doc | Rest]=Docs, {DocsListAcc, NonRepDocsAcc}) -> case Id of - ?LOCAL_DOC_PREFIX ++ _ when Rest==[] -> + <<?LOCAL_DOC_PREFIX, _/binary>> when Rest==[] -> % when saving NR (non rep) documents, you can only save a single rev {DocsListAcc, [Doc | NonRepDocsAcc]}; Id-> @@ -363,7 +363,7 @@ update_local_docs(#db{local_docs_btree=Btree}=Db, Docs) -> NewRev = case Revs of [] -> 0; - [RevStr|_] -> list_to_integer(RevStr) + [RevStr|_] -> list_to_integer(binary_to_list(RevStr)) end, OldRev = case OldDocLookup of |