V1.3.8 upgrade (#52)

Aaronontheweb · web-flow · commit 195b93873dcf · 2018-07-06T07:15:18.000-05:00
* working on adding v1.3.8 support * finished upgrade to Akka.NET v1.3.8 * disabled sequential access=on per #53 * Update RELEASE_NOTES.md * update release date
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+#### 1.3.8 July 6 2018 ####
+Upgraded to support Akka.NET 1.3.8 and to take advantage of some performance improvements that have been added to Akka.Persistence for loading large snapshots, which you can read more about here: https://github.com/akkadotnet/akka.net/issues/3422
+
+Note that this feature is currently disabled by default in Akka.Persistence.PostgreSql due to https://github.com/AkkaNetContrib/Akka.Persistence.PostgreSql/issues/53
+
 #### 1.3.1 September 11 2017 ####
 Support for Akka.NET 1.3, .NET Standard 1.6, and the first stable RTM release of Akka.Persistence.
 
diff --git a/src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj b/src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.Persistence.Sql.Common" Version="1.3.2" />
-    <PackageReference Include="Akka.Persistence.Sql.TestKit" Version="1.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170425-07" />
+    <PackageReference Include="Akka.Persistence.Sql.Common" Version="1.3.8" />
+    <PackageReference Include="Akka.Persistence.Sql.TestKit" Version="1.3.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="1.1.2" />
     <PackageReference Include="Npgsql" Version="3.2.5" />
diff --git a/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlConfigSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlConfigSpec.cs
@@ -31,6 +31,7 @@ public void Should_PostgreSql_journal_has_default_config()
             Assert.Equal("metadata", config.GetString("metadata-table-name"));
             Assert.False(config.GetBoolean("auto-initialize"));
             Assert.Equal("Akka.Persistence.Sql.Common.Journal.DefaultTimestampProvider, Akka.Persistence.Sql.Common", config.GetString("timestamp-provider"));
+            Assert.False(config.GetBoolean("sequential-access"));
         }
 
         [Fact]
@@ -49,6 +50,7 @@ public void Should_PostgreSql_snapshot_has_default_config()
             Assert.Equal("public", config.GetString("schema-name"));
             Assert.Equal("snapshot_store", config.GetString("table-name"));
             Assert.False(config.GetBoolean("auto-initialize"));
+            Assert.False(config.GetBoolean("sequential-access"));
         }
     }
 }
diff --git a/src/Akka.Persistence.PostgreSql/Akka.Persistence.PostgreSql.csproj b/src/Akka.Persistence.PostgreSql/Akka.Persistence.PostgreSql.csproj
@@ -20,10 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka" Version="1.3.2" />
-    <PackageReference Include="Akka.Persistence" Version="1.3.2" />
-    <PackageReference Include="Akka.Persistence.Sql.Common" Version="1.3.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Akka.Persistence.Sql.Common" Version="1.3.8" />
     <PackageReference Include="Npgsql" Version="3.2.5" />
   </ItemGroup>
 
diff --git a/src/Akka.Persistence.PostgreSql/Journal/PostgreSqlJournal.cs b/src/Akka.Persistence.PostgreSql/Journal/PostgreSqlJournal.cs
@@ -47,7 +47,8 @@ public PostgreSqlJournal(Config journalConfig) : base(journalConfig)
                 serializerIdColumnName: "serializer_id",
                 timeout: config.GetTimeSpan("connection-timeout"),
                 storedAs: storedAs,
-                defaultSerializer: config.GetString("serializer")),
+                defaultSerializer: config.GetString("serializer"),
+                useSequentialAccess: config.GetBoolean("sequential-access")),
                     Context.System.Serialization,
                     GetTimestampProvider(config.GetString("timestamp-provider")));
 
diff --git a/src/Akka.Persistence.PostgreSql/Journal/PostgreSqlQueryExecutor.cs b/src/Akka.Persistence.PostgreSql/Journal/PostgreSqlQueryExecutor.cs
@@ -191,9 +191,11 @@ public PostgreSqlQueryConfiguration(
             TimeSpan timeout,
             StoredAsType storedAs,
             string defaultSerializer,
-            JsonSerializerSettings jsonSerializerSettings = null)
+            JsonSerializerSettings jsonSerializerSettings = null, 
+            bool useSequentialAccess = true)
             : base(schemaName, journalEventsTableName, metaTableName, persistenceIdColumnName, sequenceNrColumnName,
-                  payloadColumnName, manifestColumnName, timestampColumnName, isDeletedColumnName, tagsColumnName, orderingColumn, serializerIdColumnName, timeout, defaultSerializer)
+                  payloadColumnName, manifestColumnName, timestampColumnName, isDeletedColumnName, tagsColumnName, orderingColumn, 
+                serializerIdColumnName, timeout, defaultSerializer, useSequentialAccess)
         {
             StoredAs = storedAs;
             JsonSerializerSettings = jsonSerializerSettings ?? new JsonSerializerSettings
diff --git a/src/Akka.Persistence.PostgreSql/Snapshot/PostgreSqlQueryExecutor.cs b/src/Akka.Persistence.PostgreSql/Snapshot/PostgreSqlQueryExecutor.cs
@@ -173,8 +173,10 @@ public PostgreSqlQueryConfiguration(
             TimeSpan timeout,
             StoredAsType storedAs,
             string defaultSerializer,
-            JsonSerializerSettings jsonSerializerSettings = null)
-            : base(schemaName, snapshotTableName, persistenceIdColumnName, sequenceNrColumnName, payloadColumnName, manifestColumnName, timestampColumnName, serializerIdColumnName, timeout, defaultSerializer)
+            JsonSerializerSettings jsonSerializerSettings = null,
+            bool useSequentialAccess = true)
+            : base(schemaName, snapshotTableName, persistenceIdColumnName, sequenceNrColumnName, payloadColumnName, 
+                manifestColumnName, timestampColumnName, serializerIdColumnName, timeout, defaultSerializer, useSequentialAccess)
         {
             StoredAs = storedAs;
             JsonSerializerSettings = jsonSerializerSettings ?? new JsonSerializerSettings
diff --git a/src/Akka.Persistence.PostgreSql/Snapshot/PostgreSqlSnapshotStore.cs b/src/Akka.Persistence.PostgreSql/Snapshot/PostgreSqlSnapshotStore.cs
@@ -41,7 +41,8 @@ public PostgreSqlSnapshotStore(Config snapshotConfig) : base(snapshotConfig)
                 serializerIdColumnName: "serializer_id",
                 timeout: config.GetTimeSpan("connection-timeout"),
                 storedAs: storedAs,
-                defaultSerializer: config.GetString("serializer")),
+                defaultSerializer: config.GetString("serializer"),
+                useSequentialAccess: config.GetBoolean("sequential-access")),
                     Context.System.Serialization);
 
             SnapshotSettings = new PostgreSqlSnapshotStoreSettings(config);
diff --git a/src/Akka.Persistence.PostgreSql/postgresql.conf b/src/Akka.Persistence.PostgreSql/postgresql.conf
@@ -33,6 +33,10 @@
 
 			# Postgres data type for payload column. Allowed options: bytea, json, jsonb
 			stored-as = bytea
+
+			# Setting used to toggle sequential read access when loading large objects
+			# from journals and snapshot stores.
+			sequential-access = off
 		}
 	}
 
@@ -61,6 +65,10 @@
 
 			# should corresponding journal table be initialized automatically
 			auto-initialize = off
+
+			# Setting used to toggle sequential read access when loading large objects
+			# from journals and snapshot stores.
+			sequential-access = off
 		}
 	}
 }
diff --git a/src/common.props b/src/common.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Copyright>Copyright © 2013-2017 Akka.NET Team</Copyright>
     <Authors>Akka.NET Team</Authors>
-    <VersionPrefix>1.3.1</VersionPrefix>
+    <VersionPrefix>1.3.8</VersionPrefix>
     <PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/AkkaNetContrib/Akka.Persistence.PostgreSql</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/AkkaNetContrib/Akka.Persistence.PostgreSql/blob/master/LICENSE</PackageLicenseUrl>
@@ -12,7 +12,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
-    <XunitVersion>2.3.0-beta5-*</XunitVersion>
+    <XunitVersion>2.3.1</XunitVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System.Data" />
@@ -28,7 +28,6 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <PackageReleaseNotes>
-    </PackageReleaseNotes>
+    <PackageReleaseNotes>Upgraded to support Akka.NET 1.3.8 and to take advantage of some performance improvements that have been added to Akka.Persistence for loading large snapshots, which you can read more about here: https://github.com/akkadotnet/akka.net/issues/3422</PackageReleaseNotes>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public void Should_PostgreSql_journal_has_default_config()`
`31`	`31`	`Assert.Equal("metadata", config.GetString("metadata-table-name"));`
`32`	`32`	`Assert.False(config.GetBoolean("auto-initialize"));`
`33`	`33`	`Assert.Equal("Akka.Persistence.Sql.Common.Journal.DefaultTimestampProvider, Akka.Persistence.Sql.Common", config.GetString("timestamp-provider"));`
	`34`	`+ Assert.False(config.GetBoolean("sequential-access"));`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`[Fact]`
`@@ -49,6 +50,7 @@ public void Should_PostgreSql_snapshot_has_default_config()`
`49`	`50`	`Assert.Equal("public", config.GetString("schema-name"));`
`50`	`51`	`Assert.Equal("snapshot_store", config.GetString("table-name"));`
`51`	`52`	`Assert.False(config.GetBoolean("auto-initialize"));`
	`53`	`+ Assert.False(config.GetBoolean("sequential-access"));`
`52`	`54`	`}`
`53`	`55`	`}`
`54`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,10 @@`
`33`	`33`
`34`	`34`	`# Postgres data type for payload column. Allowed options: bytea, json, jsonb`
`35`	`35`	`stored-as = bytea`
	`36`	`+`
	`37`	`+ # Setting used to toggle sequential read access when loading large objects`
	`38`	`+ # from journals and snapshot stores.`
	`39`	`+ sequential-access = off`
`36`	`40`	`}`
`37`	`41`	`}`
`38`	`42`
`@@ -61,6 +65,10 @@`
`61`	`65`
`62`	`66`	`# should corresponding journal table be initialized automatically`
`63`	`67`	`auto-initialize = off`
	`68`	`+`
	`69`	`+ # Setting used to toggle sequential read access when loading large objects`
	`70`	`+ # from journals and snapshot stores.`
	`71`	`+ sequential-access = off`
`64`	`72`	`}`
`65`	`73`	`}`
`66`	`74`	`}`