Merge branch 'remove-streamresult' into project-unfolds

jet · Jul 15, 2024 · 5ab9522 · 5ab9522
2 parents c7d5041 + c4c09df
commit 5ab9522
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -59,7 +59,7 @@ The `Unreleased` section name is replaced by the expected version of next releas
 ### Removed
 
 - `Streams.StreamSpan`: Changed from a record to individual arguments of `FsCodec.StreamName` and `Sinks.Event[]` [#169](https://github.com/jet/propulsion/pull/169) [#208](https://github.com/jet/propulsion/pull/208)
-- `Streams.SpanResult`: Replaced with returning an `int64` to reflect the updated position [#263](https://github.com/jet/propulsion/pull/263) [#208](https://github.com/jet/propulsion/pull/208)
+- `Streams.SpanResult`: Replaced with `int64` to reflect the updated position [#264](https://github.com/jet/propulsion/pull/264) [#208](https://github.com/jet/propulsion/pull/208)
 - `Streams`: `statsInterval` is obtained from the `Stats` wherever one is supplied [#208](https://github.com/jet/propulsion/pull/208)
 - `Propulsion.Cosmos`: Should not be in general use - users should port to `Propulsion.CosmosStore3`, then `Propulsion.CosmosStore` [#193](https://github.com/jet/propulsion/pull/193)
 - `Destructurama.FSharp` dependency [#152](https://github.com/jet/propulsion/pull/152)

diff --git a/src/Propulsion.CosmosStore/CosmosStoreSink.fs b/src/Propulsion.CosmosStore/CosmosStoreSink.fs
@@ -15,8 +15,7 @@ module private Impl =
     type EventBody = byte[] // V4 defines one directly, here we shim it
     module StreamSpan =
 
-        let private toNativeEventBody (xs: Propulsion.Sinks.EventBody): byte[] = xs.ToArray()
-        let defaultToNative_ = FsCodec.Core.TimelineEvent.Map toNativeEventBody
+        let toNativeEventBody (xs: Propulsion.Sinks.EventBody): byte[] = xs.ToArray()
     // Trimmed edition of what V4 exposes
     module internal Equinox =
         module CosmosStore =
@@ -36,7 +35,7 @@ module private Impl =
         open System.Text.Json
         let toNativeEventBody (x: EventBody): JsonElement =
             if x.IsEmpty then JsonElement()
-            else JsonSerializer.Deserialize<JsonElement>(x.Span)
+            else JsonSerializer.Deserialize(x.Span)
 #endif
 
 module Internal =

diff --git a/src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj b/src/Propulsion.CosmosStore/Propulsion.CosmosStore.fsproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <PackageValidationBaselineVersion>3.0.0-rc.13</PackageValidationBaselineVersion>
+<!--    <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,8 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />
-    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.13, 4.0.0)" />
+    <ProjectReference Include="..\Propulsion\Propulsion.fsproj" />
+<!--    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />-->
+<!--    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.14, 4.0.0)" />-->
   </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj b/src/Propulsion.CosmosStore3/Propulsion.CosmosStore3.fsproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <PackageValidationBaselineVersion>3.0.0-rc.13</PackageValidationBaselineVersion>
+<!--    <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
     <DefineConstants>COSMOSV3</DefineConstants>
   </PropertyGroup>
 
@@ -45,8 +45,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />
-    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.13, 4.0.0)" />
+    <ProjectReference Include="..\Propulsion\Propulsion.fsproj" />
+    <!--    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />-->
+    <!--    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.14, 4.0.0)" />-->
   </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.DynamoStore/Propulsion.DynamoStore.fsproj b/src/Propulsion.DynamoStore/Propulsion.DynamoStore.fsproj
@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-<!--        <PackageValidationBaselineVersion>3.0.0-rc.12</PackageValidationBaselineVersion>-->
+<!--        <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
         <DefineConstants>DYNAMOSTORE</DefineConstants>
     </PropertyGroup>
 
@@ -31,8 +31,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />
-        <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion.Feed" Version="[3.0.0-rc.13, 4.0.0)" />
+        <ProjectReference Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />
+        <!--    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />-->
+        <!--    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion.Feed" Version="[3.0.0-rc.14, 4.0.0)" />-->
     </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.EventStore/Propulsion.EventStore.fsproj b/src/Propulsion.EventStore/Propulsion.EventStore.fsproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-<!--    <PackageValidationBaselineVersion>3.0.0-rc.12</PackageValidationBaselineVersion>-->
+<!--    <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
     <DefineConstants>EVENTSTORE_LEGACY</DefineConstants>
   </PropertyGroup>
 
@@ -24,8 +24,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />
-    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.13, 4.0.0)" />
+    <ProjectReference Include="..\Propulsion\Propulsion.fsproj" />
+<!--    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />-->
+<!--    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.14, 4.0.0)" />-->
   </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.EventStoreDb/Propulsion.EventStoreDb.fsproj b/src/Propulsion.EventStoreDb/Propulsion.EventStoreDb.fsproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-<!--    <PackageValidationBaselineVersion>3.0.0-rc.12</PackageValidationBaselineVersion>-->
+<!--    <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,8 +22,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />
-    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion.Feed" Version="[3.0.0-rc.13, 4.0.0)" />
+    <ProjectReference Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />
+<!--    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />-->
+<!--    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion.Feed" Version="[3.0.0-rc.14, 4.0.0)" />-->
   </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.Feed/Propulsion.Feed.fsproj b/src/Propulsion.Feed/Propulsion.Feed.fsproj
@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <PackageValidationBaselineVersion>3.0.0-rc.13</PackageValidationBaselineVersion>
+<!--        <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
     </PropertyGroup>
 
     <ItemGroup>
@@ -22,8 +22,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />
-        <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.13, 4.0.0)" />
+        <ProjectReference Include="..\Propulsion\Propulsion.fsproj" />
+        <!--    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />-->
+        <!--    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.14, 4.0.0)" />-->
     </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.Kafka/Propulsion.Kafka.fsproj b/src/Propulsion.Kafka/Propulsion.Kafka.fsproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-<!--    <PackageValidationBaselineVersion>3.0.0-rc.12</PackageValidationBaselineVersion>-->
+<!--    <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,8 +22,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Propulsion\Propulsion.fsproj" />
     <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />
-    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.13, 4.0.0)" />
+    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.14, 4.0.0)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.MemoryStore/Propulsion.MemoryStore.fsproj b/src/Propulsion.MemoryStore/Propulsion.MemoryStore.fsproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <PackageValidationBaselineVersion>3.0.0-rc.13</PackageValidationBaselineVersion>
+<!--    <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
     <DefineConstants>MEMORYSTORE</DefineConstants>
   </PropertyGroup>
 
@@ -26,8 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />
-    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.13, 4.0.0)" />
+    <ProjectReference Include="..\Propulsion\Propulsion.fsproj" />
+    <!--    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion\Propulsion.fsproj" />-->
+    <!--    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion" Version="[3.0.0-rc.14, 4.0.0)" />-->
   </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.MessageDb/Propulsion.MessageDb.fsproj b/src/Propulsion.MessageDb/Propulsion.MessageDb.fsproj
@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-<!--        <PackageValidationBaselineVersion>3.0.0-rc.12</PackageValidationBaselineVersion>-->
+<!--        <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
     </PropertyGroup>
 
     <ItemGroup>
@@ -21,8 +21,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />
-        <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion.Feed" Version="[3.0.0-rc.13, 4.0.0)" />
+        <ProjectReference Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />
+        <!--    <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />-->
+        <!--    <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion.Feed" Version="[3.0.0-rc.14, 4.0.0)" />-->
     </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion.SqlStreamStore/Propulsion.SqlStreamStore.fsproj b/src/Propulsion.SqlStreamStore/Propulsion.SqlStreamStore.fsproj
@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-<!--        <PackageValidationBaselineVersion>3.0.0-rc.12</PackageValidationBaselineVersion>-->
+<!--        <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
     </PropertyGroup>
 
     <ItemGroup>
@@ -22,8 +22,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />
-        <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion.Feed" Version="[3.0.0-rc.13, 4.0.0)" />
+        <ProjectReference Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />
+<!--        <ProjectReference Condition=" '$(Configuration)' == 'Debug' " Include="..\Propulsion.Feed\Propulsion.Feed.fsproj" />-->
+<!--        <PackageReference Condition=" '$(Configuration)' == 'Release' " Include="Propulsion.Feed" Version="[3.0.0-rc.14, 4.0.0)" />-->
     </ItemGroup>
 
 </Project>
diff --git a/src/Propulsion/Propulsion.fsproj b/src/Propulsion/Propulsion.fsproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <PackageValidationBaselineVersion>3.0.0-rc.13</PackageValidationBaselineVersion>
+<!--    <PackageValidationBaselineVersion>3.0.0-rc.14</PackageValidationBaselineVersion>-->
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/Propulsion.Tests/Propulsion.Tests.fsproj b/tests/Propulsion.Tests/Propulsion.Tests.fsproj
@@ -9,11 +9,11 @@
     <Compile Include="ProgressTests.fs" />
     <Compile Include="StreamStateTests.fs" />
     <Compile Include="FsKafkaCodec.fs" />
+    <Compile Include="SpanQueueTests.fs" />
     <Compile Include="ParallelThrottledValidation.fs" />
     <Compile Include="TestOutputLogger.fs" />
     <Compile Include="SourceTests.fs" />
     <Compile Include="SinkHealthTests.fs" />
-    <Compile Include="SpanQueueTests.fs" />
     <Compile Include="AppendsIndexTests.fs" />
     <Compile Include="AppendsEpochTests.fs" />
   </ItemGroup>

diff --git a/tests/Propulsion.Tests/StreamStateTests.fs b/tests/Propulsion.Tests/StreamStateTests.fs
@@ -5,7 +5,7 @@ open Propulsion.Streams
 open Swensen.Unquote
 open Xunit
 
-module FsCodecEx =
+module FsCodec301 = // Not yet merged, https://github.com/jet/FsCodec/pull/123
     open FsCodec
     open System
     /// <summary>An Event or Unfold that's been read from a Store and hence has a defined <c>Index</c> on the Event Timeline.</summary>
@@ -40,7 +40,7 @@ module FsCodecEx =
             member _.CorrelationId = correlationId
             member _.CausationId = causationId
             member _.Timestamp = timestamp
-open FsCodecEx
+open FsCodec301
 
 let canonicalTime = System.DateTimeOffset.UtcNow