Skip to content
Snippets Groups Projects

Modify KV.Set to no longer contain version parameter

Merged Josh Brooks requested to merge XX-4086/EkvVersionAPI into release
10 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • 55 55 }
    56 56
    57 57 // Save versioned object
    58 // fixme: this had differing versions in object and set,
    59 // reviewer please confirm this is correct before merge
    58 60 return kv.Set(key, utility.CurrentMessageBufferVersion, &obj)
  • 72 72 Data: data,
    73 73 }
    74 74
    75 // fixme: this had differing versions in object and set,
    76 // reviewer please confirm this is correct before merge
    75 77 return r.kv.Set(storeKey, currentKeyVersion, &obj)
  • 34 34 Timestamp: netTime.Now(),
    35 35 Data: part,
    36 36 }
    37
    37 // fixme: this had differing versions in object and set,
    38 // reviewer please confirm this is correct before merge
    38 39 return kv.Set(key, currentMultiPartMessageVersion, &obj)
  • 45 45 Data: fp,
    46 46 }
    47 47
    48 // fixme: this had differing versions in object and set,
    49 // reviewer please confirm this is correct before merge
    48 50 return kv.Set(relationshipFingerprintKey, currentRelationshipVersion,
  • 153 151 Data: tsBytes,
    154 152 }
    155 153
    154 // fixme: this had differing versions in object and set,
    155 // reviewer please confirm this is correct before merge
  • Josh Brooks added 1 commit

    added 1 commit

    Compare with previous version

  • 287 286 // changing the version number.
    288 287 func upgradeSentRequestKeyV0(kv *versioned.KV, partner *id.ID) error {
    289 288 oldKey := makeSentRequestKeyV0(partner)
    290 289 obj, err := kv.Get(oldKey, 0)
  • 49 47
    50 48 // Create versioned object
    51 49 obj := versioned.Object{
    52 Version: currentMeteredCmixMessageVersion,
    50 Version: utility.CurrentMessageBufferVersion,
    53 51 Timestamp: netTime.Now(),
    54 52 Data: marshaled,
    55 53 }
    56 54
    57 55 // Save versioned object
    58 return kv.Set(key, utility.CurrentMessageBufferVersion, &obj)
    56 // fixme: this had differing versions in object and set,
    57 // reviewer please confirm this is correct before merge
  • 67 67 }
    68 68
    69 69 obj := versioned.Object{
    70 Version: currentStoreVersion,
    70 Version: currentKeyVersion,
    71 71 Timestamp: now,
    72 72 Data: data,
    73 73 }
    74 74
    75 return r.kv.Set(storeKey, currentKeyVersion, &obj)
    75 // fixme: this had differing versions in object and set,
    76 // reviewer please confirm this is correct before merge
  • 40 40 func storeRelationshipFingerprint(fp []byte, kv *versioned.KV) error {
    41 41 now := netTime.Now()
    42 42 obj := versioned.Object{
    43 Version: currentRelationshipFingerprintVersion,
    43 Version: currentRelationshipVersion,
    44 44 Timestamp: now,
    45 45 Data: fp,
    46 46 }
    47 47
    48 return kv.Set(relationshipFingerprintKey, currentRelationshipVersion,
    49 &obj)
    48 // fixme: this had differing versions in object and set,
    49 // reviewer please confirm this is correct before merge
    • My remaining question is if any of the Get calls are affected negatively, since we had a few locations where we were using different version objects, can you go validate that the version used matches up. It's not going to cause a bug right now but it will in the future.

    • Author Maintainer

      Just painstakingly reviewed very Get, everything matches

    • Please register or sign in to reply
  • Josh Brooks added 1 commit

    added 1 commit

    • aa2c6878 - Remove FIXME notes for tracking kv.Set version mismatching

    Compare with previous version

  • Josh Brooks marked this merge request as ready

    marked this merge request as ready

  • Josh Brooks mentioned in commit b54fe9e3

    mentioned in commit b54fe9e3

  • merged

  • Please register or sign in to reply
    Loading