FsCodec rc6

jet · bartelink · Sep 2, 2022 · Sep 1, 2022 · Sep 1, 2022 · Sep 1, 2022
commit e347716227da09942960cb3b113eb730bf90b041
diff --git a/samples/Store/Domain/Domain.fsproj b/samples/Store/Domain/Domain.fsproj
@@ -17,8 +17,8 @@
   <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="6.0.0" />
 
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.5" />
-    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.5" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.6" />
+    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.6" />
 
     <ProjectReference Include="..\..\..\src\Equinox\Equinox.fsproj" />
   </ItemGroup>

diff --git a/samples/Tutorial/Tutorial.fsproj b/samples/Tutorial/Tutorial.fsproj
@@ -27,8 +27,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.5" />
-    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.5" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.6" />
+    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.6" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
   </ItemGroup>

diff --git a/samples/Tutorial/Upload.fs b/samples/Tutorial/Upload.fs
@@ -15,7 +15,7 @@ module CompanyId =
     let toString (value : CompanyId) : string = %value
 
 let [<Literal>] Category = "Upload"
-let streamName (companyId, purchaseOrderId) = struct (Category, FsCodec.StreamName.createAggregateId [PurchaseOrderId.toString purchaseOrderId; CompanyId.toString companyId])
+let streamName (companyId, purchaseOrderId) = struct (Category, FsCodec.StreamName.createStreamId [PurchaseOrderId.toString purchaseOrderId; CompanyId.toString companyId])
 
 type UploadId = string<uploadId>
 and [<Measure>] uploadId

diff --git a/src/Equinox.CosmosStore.Prometheus/CosmosStorePrometheus.fs b/src/Equinox.CosmosStore.Prometheus/CosmosStorePrometheus.fs
@@ -92,7 +92,7 @@ type LogSink(customTags: seq<string * string>) =
         payloadCounters (facet, op, outcome) (db, con, cat, float count, if bytes = -1 then None else Some (float bytes))
 
     let (|CatSRu|) ({ interval = i; ru = ru } : Measurement as m) =
-        let struct (cat, _id) = FsCodec.StreamName.splitCategoryAndId (FSharp.UMX.UMX.tag m.stream)
+        let struct (cat, _id) = FsCodec.StreamName.splitCategoryAndStreamId (FSharp.UMX.UMX.tag m.stream)
         struct (m.database, m.container, cat, i.Elapsed, ru)
     let observeRes (_rut, facet, _op as stat) (CatSRu (db, con, cat, s, ru)) =
         roundtripHistogram stat (db, con, cat, s, ru)

diff --git a/src/Equinox.CosmosStore/CosmosStore.fs b/src/Equinox.CosmosStore/CosmosStore.fs
@@ -272,9 +272,9 @@ module Log =
                  { mutable rux100 : int64; mutable count : int64; mutable ms : int64 }
                  static member Create() = { rux100 = 0L; count = 0L; ms = 0L }
                  member x.Ingest(ru, ms) =
-                     System.Threading.Interlocked.Increment(&x.count) |> ignore
-                     System.Threading.Interlocked.Add(&x.rux100, int64 (ru*100.)) |> ignore
-                     System.Threading.Interlocked.Add(&x.ms, ms) |> ignore
+                     Interlocked.Increment(&x.count) |> ignore
+                     Interlocked.Add(&x.rux100, int64 (ru*100.)) |> ignore
+                     Interlocked.Add(&x.ms, ms) |> ignore
             let inline private (|RcMs|) ({ interval = i; ru = ru } : Measurement) =
                 ru, let e = i.Elapsed in int64 e.TotalMilliseconds
             type LogSink() =
@@ -1162,7 +1162,6 @@ namespace Equinox.CosmosStore
 
 open Equinox.Core
 open Equinox.CosmosStore.Core
-open FsCodec
 open Microsoft.Azure.Cosmos
 open System
 open System.Threading.Tasks
@@ -1301,7 +1300,9 @@ type CosmosStoreClient
         [<O; D null>] ?archiveDatabaseId,
         // Container Name to use for locating missing events. Default: use <c>containerId</c>
         [<O; D null>] ?archiveContainerId) =
-        let genStreamName (categoryName, streamId) = if categoryName = null then streamId else StreamName.createRaw (categoryName, streamId)
+        let genStreamName (categoryName, streamId) =
+            if categoryName = null then streamId
+            else FsCodec.StreamName.Internal.ofCategoryAndStreamId (categoryName, streamId)
         let catAndStreamToDatabaseContainerStream (categoryName, streamId) = databaseId, containerId, genStreamName (categoryName, streamId)
         let primaryContainer (d, c) = (client : CosmosClient).GetDatabase(d).GetContainer(c)
         let fallbackContainer =

diff --git a/src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj b/src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj
@@ -19,7 +19,7 @@
 
     <PackageReference Include="FSharp.Core" Version="6.0.0" />
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.5" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.6" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.27.0" />
     <PackageReference Include="System.Text.Json" Version="6.0.1" />

diff --git a/src/Equinox.DynamoStore.Prometheus/DynamoStorePrometheus.fs b/src/Equinox.DynamoStore.Prometheus/DynamoStorePrometheus.fs
@@ -92,7 +92,7 @@ type LogSink(customTags: seq<string * string>) =
         payloadCounters (facet, op, outcome) (table, cat, float count, if bytes = -1 then None else Some (float bytes))
 
     let (|CatSRu|) ({ interval = i; ru = ru } : Measurement as m) =
-        let struct (cat, _id) = FsCodec.StreamName.splitCategoryAndId (FSharp.UMX.UMX.tag m.stream)
+        let struct (cat, _id) = FsCodec.StreamName.splitCategoryAndStreamId (FSharp.UMX.UMX.tag m.stream)
         struct (m.table, cat, i.Elapsed, ru)
     let observeRes (_rut, facet, _op as stat) (CatSRu (table, cat, s, ru)) =
         roundtripHistogram stat (table, cat, s, ru)

diff --git a/src/Equinox.DynamoStore/DynamoStore.fs b/src/Equinox.DynamoStore/DynamoStore.fs
@@ -1256,7 +1256,9 @@ type DynamoStoreClient
             [<O; D null>] ?archiveTableName,
             // Client to use for archive store. Default: (if <c>archiveTableName</c> specified) use same <c>archiveTableName</c> but via <c>client</c>.
             [<O; D null>] ?archiveClient : Amazon.DynamoDBv2.IAmazonDynamoDB) =
-        let genStreamName (categoryName, streamId) = if categoryName = null then streamId else FsCodec.StreamName.createRaw (categoryName, streamId)
+        let genStreamName (categoryName, streamId) =
+            if categoryName = null then streamId else
+            FsCodec.StreamName.Internal.ofCategoryAndStreamId (categoryName, streamId)
         let catAndStreamToTableStream (categoryName, streamId) = tableName, genStreamName (categoryName, streamId)
         let primaryContainer t = Container.Create(client, t)
         let fallbackContainer =

diff --git a/src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj b/src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj
@@ -14,7 +14,7 @@
 
     <PackageReference Include="FSharp.Core" Version="6.0.0" />
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.5" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.6" />
     <PackageReference Include="FSharp.AWS.DynamoDB" Version="0.11.1-beta" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
   </ItemGroup>

diff --git a/src/Equinox.EventStore/Equinox.EventStore.fsproj b/src/Equinox.EventStore/Equinox.EventStore.fsproj
@@ -20,7 +20,7 @@
     <PackageReference Include="FSharp.Core" Version="6.0.0" />
 
     <PackageReference Include="EventStore.Client" Version="22.0.0-preview" />
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.5" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.6" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
   </ItemGroup>
 

diff --git a/src/Equinox.EventStore/EventStore.fs b/src/Equinox.EventStore/EventStore.fs
@@ -566,7 +566,7 @@ type EventStoreCategory<'event, 'state, 'context>(resolveInner, empty) =
                 Caching.applyCacheUpdatesWithFixedTimeSpan cache null period folder Token.supersedes
             | Some (CachingStrategy.SlidingWindowPrefixed (cache, window, prefix)) ->
                 Caching.applyCacheUpdatesWithSlidingExpiration cache prefix window folder Token.supersedes
-        let resolveInner streamIds = struct (category, FsCodec.StreamName.createRaw streamIds, ValueNone)
+        let resolveInner streamIds = struct (category, FsCodec.StreamName.Internal.ofCategoryAndStreamId streamIds, ValueNone)
         let empty = struct (context.TokenEmpty, initial)
         EventStoreCategory(resolveInner, empty)
 

diff --git a/src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj b/src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj
@@ -20,7 +20,7 @@
     <PackageReference Include="FSharp.Core" Version="6.0.0" />
 
     <PackageReference Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.5" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.6" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
   </ItemGroup>
 

diff --git a/src/Equinox.EventStoreDb/EventStoreDb.fs b/src/Equinox.EventStoreDb/EventStoreDb.fs
@@ -503,7 +503,7 @@ type EventStoreCategory<'event, 'state, 'context>(resolveInner, empty) =
                 Caching.applyCacheUpdatesWithFixedTimeSpan cache null period folder Token.supersedes
             | Some (CachingStrategy.SlidingWindowPrefixed (cache, window, prefix)) ->
                 Caching.applyCacheUpdatesWithSlidingExpiration cache prefix window folder Token.supersedes
-        let resolveInner streamIds = struct (category, FsCodec.StreamName.createRaw streamIds, ValueNone)
+        let resolveInner streamIds = struct (category, FsCodec.StreamName.Internal.ofCategoryAndStreamId streamIds, ValueNone)
         let empty = struct (context.TokenEmpty, initial)
         EventStoreCategory(resolveInner, empty)
 

diff --git a/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj b/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj
@@ -18,7 +18,7 @@
 
     <PackageReference Include="FSharp.Core" Version="6.0.0" />
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.5" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Equinox.MemoryStore/MemoryStore.fs b/src/Equinox.MemoryStore/MemoryStore.fs
@@ -80,6 +80,6 @@ type MemoryStoreCategory<'event, 'state, 'Format, 'context>(resolveInner, empty)
     inherit Equinox.Category<'event, 'state, 'context>(resolveInner, empty)
     new (store : VolatileStore<'Format>, codec : FsCodec.IEventCodec<'event, 'Format, 'context>, fold, initial) =
         let impl = Category<'event, 'state, 'context, 'Format>(store, codec, fold, initial)
-        let resolveInner streamIds = struct (impl :> ICategory<_, _, _>, FsCodec.StreamName.createRaw streamIds, ValueNone)
+        let resolveInner streamIds = struct (impl :> ICategory<_, _, _>, FsCodec.StreamName.Internal.ofCategoryAndStreamId streamIds, ValueNone)
         let empty = struct (Token.ofEmpty, initial)
         MemoryStoreCategory(resolveInner, empty)
diff --git a/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj b/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj
@@ -19,7 +19,7 @@
 
     <PackageReference Include="FSharp.Core" Version="6.0.0" />
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.5" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.6" />
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
     <PackageReference Include="SqlStreamStore" Version="1.2.0-beta.8" />
   </ItemGroup>

diff --git a/src/Equinox.SqlStreamStore/SqlStreamStore.fs b/src/Equinox.SqlStreamStore/SqlStreamStore.fs
@@ -527,7 +527,7 @@ type SqlStreamStoreCategory<'event, 'state, 'context>(resolveInner, empty) =
                 Caching.applyCacheUpdatesWithFixedTimeSpan cache null period folder Token.supersedes
             | Some (CachingStrategy.SlidingWindowPrefixed (cache, window, prefix)) ->
                 Caching.applyCacheUpdatesWithSlidingExpiration cache prefix window folder Token.supersedes
-        let resolveInner streamIds = struct (category, FsCodec.StreamName.createRaw streamIds, ValueNone)
+        let resolveInner streamIds = struct (category, FsCodec.StreamName.Internal.ofCategoryAndStreamId streamIds, ValueNone)
         let empty = struct (context.TokenEmpty, initial)
         SqlStreamStoreCategory(resolveInner, empty)
 

diff --git a/tests/Equinox.CosmosStore.Integration/DocumentStoreIntegration.fs b/tests/Equinox.CosmosStore.Integration/DocumentStoreIntegration.fs
@@ -242,7 +242,7 @@ type Tests(testOutputHelper) =
         // Needs to share the same context (with inner CosmosClient) for the session token to be threaded through
         // If we run on an independent context, we won't see (and hence prune) the full set of events
         let ctx = Core.EventsContext(context, log)
-        let streamName = ContactPreferences.streamName id |> FsCodec.StreamName.createRaw
+        let streamName = ContactPreferences.streamName id |> FsCodec.StreamName.Internal.ofCategoryAndStreamId
 
         // Prune all the events
         let! deleted, deferred, trimmedPos = Core.Events.pruneUntil ctx streamName 14L
@@ -410,7 +410,7 @@ type Tests(testOutputHelper) =
         (* Verify pruning does not affect snapshots, though Tip is re-read in this scenario due to lack of caching *)
 
         let ctx = Core.EventsContext(context, log)
-        let streamName = Cart.streamName cartId |> FsCodec.StreamName.createRaw
+        let streamName = Cart.streamName cartId |> FsCodec.StreamName.Internal.ofCategoryAndStreamId
         // Prune all the events
         let! deleted, deferred, trimmedPos = Core.Events.pruneUntil ctx streamName 11L
         test <@ deleted = 12 && deferred = 0 && trimmedPos = 12L @>
@@ -471,7 +471,7 @@ type Tests(testOutputHelper) =
         (* Verify pruning does not affect snapshots, and does not touch the Tip *)
 
         let ctx = Core.EventsContext(context, log)
-        let streamName = Cart.streamName cartId |> FsCodec.StreamName.createRaw
+        let streamName = Cart.streamName cartId |> FsCodec.StreamName.Internal.ofCategoryAndStreamId
         // Prune all the events
         let! deleted, deferred, trimmedPos = Core.Events.pruneUntil ctx streamName 12L
         test <@ deleted = 13 && deferred = 0 && trimmedPos = 13L @>

diff --git a/tools/Equinox.Tool/Program.fs b/tools/Equinox.Tool/Program.fs
@@ -495,7 +495,7 @@ module Dump =
                  with e -> log.Warning(e, "UTF-8 Parse failure - use --Blobs option to inhibit"); reraise()
         let readStream (streamName : FsCodec.StreamName) = async {
             let resolve = store.Category(idCodec, fold, initial, isOriginAndSnapshot) |> Equinox.Decider.resolve storeLog
-            let decider = resolve (FsCodec.StreamName.splitCategoryAndId streamName)
+            let decider = resolve (FsCodec.StreamName.splitCategoryAndStreamId streamName)
             let! streamBytes, events = decider.QueryEx(fun c -> c.StreamEventBytes, c.State)
             let mutable prevTs = None
             for x in events |> Seq.filter (fun e -> (e.IsUnfold && doU) || (not e.IsUnfold && doE)) do