[couchdb] branch optimize-ddoc-cache updated (d354951 -> da5eca6)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a change to branch optimize-ddoc-cache
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit d354951  FIXUP: Use the shard record definition
     new da5eca6  FIXUP: Use the shard record definition

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (d354951)
            \
             N -- N -- N   refs/heads/optimize-ddoc-cache (da5eca6)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/ddoc_cache/src/ddoc_cache.app.src | 1 +
 1 file changed, 1 insertion(+)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb] 01/01: FIXUP: Use the shard record definition

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch optimize-ddoc-cache
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit da5eca650b0a37dcc29a577188c2f6a0b7c0fee8
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Jul 24 15:41:26 2017 -0500

    FIXUP: Use the shard record definition
---
 src/ddoc_cache/src/ddoc_cache.app.src            | 1 +
 src/ddoc_cache/test/ddoc_cache_eviction_test.erl | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ddoc_cache/src/ddoc_cache.app.src b/src/ddoc_cache/src/ddoc_cache.app.src
index 38fceda..c931ca0 100644
--- a/src/ddoc_cache/src/ddoc_cache.app.src
+++ b/src/ddoc_cache/src/ddoc_cache.app.src
@@ -26,6 +26,7 @@
         couch_event,
         couch_log,
         couch_stats,
+        mem3,
         fabric
     ]},
     {mod, {ddoc_cache_app, []}}
diff --git a/src/ddoc_cache/test/ddoc_cache_eviction_test.erl b/src/ddoc_cache/test/ddoc_cache_eviction_test.erl
index 30b4fb7..5a02a5c 100644
--- a/src/ddoc_cache/test/ddoc_cache_eviction_test.erl
+++ b/src/ddoc_cache/test/ddoc_cache_eviction_test.erl
@@ -20,6 +20,7 @@
 
 -include_lib("couch/include/couch_db.hrl").
 -include_lib("eunit/include/eunit.hrl").
+-include_lib("mem3/include/mem3.hrl").
 -include("ddoc_cache_test.hrl").
 
 
@@ -55,7 +56,7 @@ evict_all({DbName, _}) ->
     ddoc_cache_tutil:clear(),
     meck:reset(ddoc_cache_ev),
     Rev = ddoc_cache_tutil:get_rev(DbName, ?FOOBAR),
-    ShardName = element(2, hd(mem3:shards(DbName))),
+    #shard{name = ShardName} = hd(mem3:shards(DbName)),
     {ok, _} = ddoc_cache:open_doc(DbName, ?FOOBAR),
     {ok, _} = ddoc_cache:open_doc(DbName, ?FOOBAR, Rev),
     {ok, _} = ddoc_cache:open_validation_funs(DbName),

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.