Skip to content

Fix handling of key attributes with CustomName attributes #78

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

Open
purkhusid wants to merge 2 commits into
base: master
Choose a base branch
from
+47 −3
Open

Fix handling of key attributes with CustomName attributes #78

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ad63a6
Fix handling of key attributes with CustomName attributes
purkhusid Aug 28, 2024
0636ddf
Review changes
purkhusid Aug 29, 2024
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
6 changes: 4 additions & 2 deletions src/FSharp.AWS.DynamoDB/Picklers/RecordPickler.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ type RecordPickler<'T>(ctor: obj[] -> obj, properties: PropertyMetadata[]) =
let field = prop.PropertyInfo.GetValue value
match prop.Pickler.PickleUntyped field with
| None -> ()
| Some av -> values.Add(prop.Name, av)

| Some av ->
let exists, value = values.TryGetValue prop.Name
Copy link
Member

@bartelink bartelink Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

match to avoid the allocation?

if not exists then
values.Add(prop.Name, av)
values

member __.ToRecord(ro: RestObject) : 'T =
Expand Down
35 changes: 35 additions & 0 deletions tests/FSharp.AWS.DynamoDB.Tests/MultipleKeyAttributeTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ module MultiKeyTypes =
[<GlobalSecondaryHashKey(indexName = "Inverted")>]
SortKey: string }

type InverseKeyRecordUsingCustomName =
{ [<HashKey>]
PrimaryKey: string
[<RangeKey>]
SortKey: string
[<GlobalSecondaryHashKey(indexName = "GSIReversed"); CustomName("SortKey")>]
GSIReverseHashKey: string
[<GlobalSecondaryRangeKey(indexName = "GSIReversed"); CustomName("PrimaryKey")>]
GSIReverseRangeKey: string }

type SharedRangeKeyRecord =
{ [<HashKey>]
HashKey: string
Expand Down Expand Up @@ -51,6 +61,31 @@ type ``Inverse GSI Table Operation Tests``(fixture: TableFixture) =

interface IClassFixture<TableFixture>

type ``Inverse GSI Table with Custom Names Operation Tests``(fixture: TableFixture) =

let rand = let r = Random.Shared in fun () -> int64 <| r.Next()
Copy link
Member

@bartelink bartelink Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let rand = let r = Random.Shared in fun () -> int64 <| r.Next()
let rand = let r = Random.Shared in fun () -> r.Next() |> int64

let mkItem () =
let hashKey = ((int (rand ())) % 50).ToString()
let sortKey = ((int (rand ())) % 50).ToString()
{ PrimaryKey = hashKey
SortKey = sortKey
GSIReverseHashKey = sortKey
GSIReverseRangeKey = hashKey }

let table = fixture.CreateEmpty<InverseKeyRecordUsingCustomName>()

[<Fact>]
let ``Query by Table Key and GSI`` () =
let values = set [ for _ in 1L .. 1000L -> mkItem () ]
for batch in values |> Set.toSeq |> Seq.chunkBySize 25 do
table.BatchPutItems batch =! [||]
let queriedTable = table.Query <@ fun (i: InverseKeyRecordUsingCustomName) -> i.PrimaryKey = "1" && i.SortKey.StartsWith "2" @>
test <@ set queriedTable = set (values |> Set.filter (fun i -> i.PrimaryKey = "1" && i.SortKey.StartsWith "2")) @>
let queriedGSI = table.Query <@ fun (i: InverseKeyRecordUsingCustomName) -> i.SortKey = "1" && i.PrimaryKey.StartsWith "2" @>
test <@ set queriedGSI = set (values |> Set.filter (fun i -> i.SortKey = "1" && i.PrimaryKey.StartsWith "2")) @>

interface IClassFixture<TableFixture>

type ``Shared Range Key Table Operation Tests``(fixture: TableFixture) =

let rand = let r = Random.Shared in fun () -> int64 <| r.Next()
Expand Down