diff --git a/channels/log_entry.go b/channels/log_entry.go index 2bf772d79c..4d66c55091 100644 --- a/channels/log_entry.go +++ b/channels/log_entry.go @@ -109,7 +109,7 @@ func (channelMap ChannelMap) KeySet() []string { type RevAndVersion struct { RevTreeID string `json:"rev,omitempty"` CurrentSource string `json:"src,omitempty"` - CurrentVersion string `json:"vrs,omitempty"` // String representation of version + CurrentVersion string `json:"ver,omitempty"` // String representation of version } // RevAndVersionJSON aliases RevAndVersion to support conditional unmarshalling from either string (revTreeID) or diff --git a/db/crud.go b/db/crud.go index 3e01286c86..a5b6b1db9f 100644 --- a/db/crud.go +++ b/db/crud.go @@ -2952,8 +2952,8 @@ func (db *DatabaseCollectionWithUser) CheckProposedVersion(ctx context.Context, const ( xattrMacroCas = "cas" // SyncData.Cas xattrMacroValueCrc32c = "value_crc32c" // SyncData.Crc32c - xattrMacroCurrentRevVersion = "rev.vrs" // SyncDataJSON.RevAndVersion.CurrentVersion - versionVectorVrsMacro = "_vv.vrs" // PersistedHybridLogicalVector.Version + xattrMacroCurrentRevVersion = "rev.ver" // SyncDataJSON.RevAndVersion.CurrentVersion + versionVectorVrsMacro = "_vv.ver" // PersistedHybridLogicalVector.Version versionVectorCVCASMacro = "_vv.cvCas" // PersistedHybridLogicalVector.CurrentVersionCAS ) diff --git a/db/document_test.go b/db/document_test.go index bd558ea206..0b65d140f1 100644 --- a/db/document_test.go +++ b/db/document_test.go @@ -237,7 +237,7 @@ const doc_meta_with_vv = `{ "_vv":{ "cvCas":"0x40e2010000000000", "src":"cb06dc003846116d9b66d2ab23887a96", - "vrs":"0x40e2010000000000", + "ver":"0x40e2010000000000", "mv":{ "s_LhRPsa7CpjEvP5zeXTXEBA":"c0ff05d7ac059a16", "s_NqiIe0LekFPLeX4JvTO6Iw":"1c008cd6ac059a16" diff --git a/db/hybrid_logical_vector.go b/db/hybrid_logical_vector.go index c77ba61886..9c242b7e59 100644 --- a/db/hybrid_logical_vector.go +++ b/db/hybrid_logical_vector.go @@ -115,7 +115,7 @@ type HybridLogicalVector struct { CurrentVersionCAS string `json:"cvCas,omitempty"` // current version cas (or cvCAS) stores the current CAS in little endian hex format at the time of replication ImportCAS string `json:"importCAS,omitempty"` // Set when an import modifies the document CAS but preserves the HLV (import of a version replicated by XDCR) SourceID string `json:"src"` // source bucket uuid in (base64 encoded format) of where this entry originated from - Version string `json:"vrs"` // current cas in little endian hex format of the current version on the version vector + Version string `json:"ver"` // current cas in little endian hex format of the current version on the version vector MergeVersions map[string]string `json:"mv,omitempty"` // map of merge versions for fast efficient lookup PreviousVersions map[string]string `json:"pv,omitempty"` // map of previous versions for fast efficient lookup }