[couchdb] branch use-metadata-key-from-610 updated (a121cee -> 86d261b)

[va...@apache.org]

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

vatamane pushed a change to branch use-metadata-key-from-610
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard a121cee  Use "\xFF/metadataVersion" key for checking metadata
     new 86d261b  Use "\xFF/metadataVersion" key for checking metadata

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   (a121cee)
            \
             N -- N -- N   refs/heads/use-metadata-key-from-610 (86d261b)

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:

[couchdb] 01/01: Use "\xFF/metadataVersion" key for checking metadata

[va...@apache.org]

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

vatamane pushed a commit to branch use-metadata-key-from-610
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 86d261bde2cd655434f9e2f321e93a9bce5357ee
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Wed Oct 30 09:53:12 2019 -0400

    Use "\xFF/metadataVersion" key for checking metadata
    
    Need to use FDB version 6.1+ and erlfdb version that has this commit:
    https://github.com/cloudant-labs/couchdb-erlfdb/commit/7718a3d7e1994e1384c56d39fae5cad3d8c6c4b3
    
    Since fabric2.hrl is a public include now, use that in couch_jobs to avoid
    redefining a bunch of things.
---
 src/couch_jobs/src/couch_jobs.hrl | 5 ++---
 src/fabric/include/fabric2.hrl    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/couch_jobs/src/couch_jobs.hrl b/src/couch_jobs/src/couch_jobs.hrl
index 2a02d76..055bf09 100644
--- a/src/couch_jobs/src/couch_jobs.hrl
+++ b/src/couch_jobs/src/couch_jobs.hrl
@@ -10,6 +10,8 @@
 % License for the specific language governing permissions and limitations under
 % the License.
 
+-include_lib("fabric/include/fabric2.hrl").
+
 
 % Job map/json field definitions
 %
@@ -20,10 +22,7 @@
 
 % These might be in a fabric public hrl eventually
 %
--define(uint2bin(I), binary:encode_unsigned(I, little)).
--define(bin2uint(I), binary:decode_unsigned(I, little)).
 -define(UNSET_VS, {versionstamp, 16#FFFFFFFFFFFFFFFF, 16#FFFF}).
--define(METADATA_VERSION_KEY, <<"$metadata_version_key$">>).
 
 % Data model definitions
 %
diff --git a/src/fabric/include/fabric2.hrl b/src/fabric/include/fabric2.hrl
index a5c12ae..cd3f89d 100644
--- a/src/fabric/include/fabric2.hrl
+++ b/src/fabric/include/fabric2.hrl
@@ -23,7 +23,7 @@
 % key for tracking metadata changse. Once we get to the
 % new feature this will be more performant by updating
 % this define.
--define(METADATA_VERSION_KEY, <<"$metadata_version_key$">>).
+-define(METADATA_VERSION_KEY, <<16#FF, "/metadataVersion">>).
 
 
 % Prefix Definitions