[couchdb] branch 1580-shard-record-violation updated (cd9a78b -> e748d13)

[ji...@apache.org]

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

jiangphcn pushed a change to branch 1580-shard-record-violation
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit cd9a78b  Adjust order of ref for shard record
    omit 4df88ba  Fix dialyzer warning of shard record construction
     add bc03795  Improve validation of database creation parameters
     add fc92fbe  Merge pull request #1582 from apache/improve-dbcreate-validation
     new e748d13  Fix dialyzer warning of shard record construction

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   (cd9a78b)
            \
             N -- N -- N   refs/heads/1580-shard-record-violation (e748d13)

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/mem3/src/mem3.erl      |  2 +-
 src/mem3/src/mem3_util.erl | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

[couchdb] 01/01: Fix dialyzer warning of shard record construction

[ji...@apache.org]

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

jiangphcn pushed a commit to branch 1580-shard-record-violation
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit e748d138fb3244e306ca5af88fc0d15b483c48c3
Author: jiangph <ji...@cn.ibm.com>
AuthorDate: Mon Aug 27 21:24:47 2018 +0800

    Fix dialyzer warning of shard record construction
    
       - Fix dialyzer warning that record construction #shard violates
         the declared type in fabric_doc_open_revs.erl,
         cpse_test_purge_replication.erl and other files
    
    Fixes #1580
---
 src/mem3/include/mem3.hrl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mem3/include/mem3.hrl b/src/mem3/include/mem3.hrl
index 6579210..9be8a7f 100644
--- a/src/mem3/include/mem3.hrl
+++ b/src/mem3/include/mem3.hrl
@@ -12,12 +12,12 @@
 
 % type specification hacked to suppress dialyzer warning re: match spec
 -record(shard, {
-    name :: binary() | '_',
-    node :: node() | '_',
-    dbname :: binary(),
-    range :: [non_neg_integer() | '$1' | '$2'] | '_',
-    ref :: reference() | 'undefined' | '_',
-    opts :: list()
+    name :: binary() | '_' | 'undefined',
+    node :: node() | '_' | 'undefined',
+    dbname :: binary() | 'undefined',
+    range :: [non_neg_integer() | '$1' | '$2'] | '_' | 'undefined',
+    ref :: reference() | '_' | 'undefined',
+    opts :: list() | 'undefined'
 }).
 
 %% Do not reference outside of mem3.