diff options
-rw-r--r-- | src/couch_jobs/src/couch_jobs.hrl | 5 | ||||
-rw-r--r-- | src/fabric/include/fabric2.hrl | 13 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/couch_jobs/src/couch_jobs.hrl b/src/couch_jobs/src/couch_jobs.hrl index 2a02d760f..055bf091c 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 a5c12aef3..189995de2 100644 --- a/src/fabric/include/fabric2.hrl +++ b/src/fabric/include/fabric2.hrl @@ -13,18 +13,7 @@ -define(uint2bin(I), binary:encode_unsigned(I, little)). -define(bin2uint(I), binary:decode_unsigned(I, little)). - -% This will eventually be the `\xFFmetadataVersion` key that is -% currently only available in FoundationDB master. -% -% https://forums.foundationdb.org/t/a-new-tool-for-managing-layer-metadata/1191 -% -% Until then we'll fake the same behavior using a randomish -% 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 |