Skip to content

ChangeFeed: Fixes crts field being nullable #5512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yash2710 merged 11 commits into from
Dec 3, 2025
Merged

ChangeFeed: Fixes crts field being nullable #5512

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6c68040
Make crts non-nullable
yash2710 Nov 24, 2025
795b944
Add null check
yash2710 Nov 24, 2025
255171b
Merge branch 'master' into users/trivediyash/CRTS
yash2710 Nov 25, 2025
88ef336
Update contracts
yash2710 Nov 25, 2025
ca03921
Merge branch 'master' into users/trivediyash/CRTS
yash2710 Nov 25, 2025
707ce36
Merge branch 'master' into users/trivediyash/CRTS
yash2710 Dec 1, 2025
a8f85e8
Add validation to ConflictResolutionTimestamp getter
yash2710 Dec 2, 2025
ae1d234
Update tests
yash2710 Dec 2, 2025
1643fab
Update tests
yash2710 Dec 2, 2025
d192f1e
Address comments
yash2710 Dec 3, 2025
4f31650
Update comment
yash2710 Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...oft.Azure.Cosmos.Encryption.Custom.Tests/Contracts/DotNetSDKEncryptionCustomAPI.net6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,4 +1182,4 @@
}
},
"NestedTypes": {}
}
}
21 changes: 18 additions & 3 deletions Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace Microsoft.Azure.Cosmos
{
using System;
using System.Collections.Generic;
using System.Net;
using Microsoft.Azure.Cosmos.Resource.FullFidelity;
using Microsoft.Azure.Documents;
using Newtonsoft.Json;
Expand All @@ -28,12 +29,26 @@ class ChangeFeedMetadata
/// </summary>
[System.Text.Json.Serialization.JsonIgnore]
[Newtonsoft.Json.JsonIgnore]
public DateTime? ConflictResolutionTimestamp => this.ConflictResolutionTimestampInSeconds.HasValue ? UnixEpoch.AddSeconds(this.ConflictResolutionTimestampInSeconds.Value) : null;
public DateTime ConflictResolutionTimestamp => UnixEpoch.AddSeconds(this.ConflictResolutionTimestampInSeconds);

private double conflictResolutionTimestampInSeconds;

[System.Text.Json.Serialization.JsonInclude]
[System.Text.Json.Serialization.JsonPropertyName(ChangeFeedMetadataFields.ConflictResolutionTimestamp)]
[JsonProperty(PropertyName = ChangeFeedMetadataFields.ConflictResolutionTimestamp)]
internal double? ConflictResolutionTimestampInSeconds { get; set; }
[JsonProperty(PropertyName = ChangeFeedMetadataFields.ConflictResolutionTimestamp, Required = Required.Always)]
internal double ConflictResolutionTimestampInSeconds
{
get => this.conflictResolutionTimestampInSeconds;
set
{
if (value == 0)
{
throw new System.Text.Json.JsonException(
$"{ChangeFeedMetadataFields.ConflictResolutionTimestamp} cannot be zero.");
}
this.conflictResolutionTimestampInSeconds = value;
}
}

/// <summary>
/// The current change's logical sequence number.
Expand Down
8 changes: 4 additions & 4 deletions ...t.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetPreviewSDKAPI.net6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,18 @@
],
"MethodInfo": "System.Collections.Generic.Dictionary`2[System.String,System.Object] PartitionKey;CanRead:True;CanWrite:True;System.Collections.Generic.Dictionary`2[System.String,System.Object] get_PartitionKey();IsAbstract:False;IsStatic:False;IsVirtual:False;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
},
"System.Nullable`1[System.DateTime] ConflictResolutionTimestamp[System.Text.Json.Serialization.JsonIgnoreAttribute()]-[Newtonsoft.Json.JsonIgnoreAttribute()]": {
"System.DateTime ConflictResolutionTimestamp[System.Text.Json.Serialization.JsonIgnoreAttribute()]-[Newtonsoft.Json.JsonIgnoreAttribute()]": {
"Type": "Property",
"Attributes": [
"JsonIgnoreAttribute",
"JsonIgnoreAttribute"
],
"MethodInfo": "System.Nullable`1[System.DateTime] ConflictResolutionTimestamp;CanRead:True;CanWrite:False;System.Nullable`1[System.DateTime] get_ConflictResolutionTimestamp();IsAbstract:False;IsStatic:False;IsVirtual:False;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
"MethodInfo": "System.DateTime ConflictResolutionTimestamp;CanRead:True;CanWrite:False;System.DateTime get_ConflictResolutionTimestamp();IsAbstract:False;IsStatic:False;IsVirtual:False;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
},
"System.Nullable`1[System.DateTime] get_ConflictResolutionTimestamp()": {
"System.DateTime get_ConflictResolutionTimestamp()": {
"Type": "Method",
"Attributes": [],
"MethodInfo": "System.Nullable`1[System.DateTime] get_ConflictResolutionTimestamp();IsAbstract:False;IsStatic:False;IsVirtual:False;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
"MethodInfo": "System.DateTime get_ConflictResolutionTimestamp();IsAbstract:False;IsStatic:False;IsVirtual:False;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
},
"System.String get_Id()[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]": {
"Type": "Method",
Expand Down