* rename delegate RevisionUpsertDelegate to AddRevisionDelegate

* rename prop `RevisionUpsertDelegatesKeyBySplitEntityType` to `AddRevisionDelegatesKeyBySplitEntityType` @ SaverWithRevision.cs * replace all invokes to `DbSet<>.UpsertRange().NoUpdate().Run()` with `DbSet<>.AddRange()` @ Tieba/Crawl - NuGet package `FlexLabs.EntityFrameworkCore.Upsert` @ c#/crawler
n0099 · May 11, 2024 · 6925c08 · 6925c08
1 parent 8ee3dd1
commit 6925c08
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 34 deletions.
diff --git a/c#/crawler/packages.lock.json b/c#/crawler/packages.lock.json
@@ -17,15 +17,6 @@
         "resolved": "2.1.35",
         "contentHash": "YKRwjVfrG7GYOovlGyQoMvr1/IJdn+7QzNXJxyMh0YfFF5yvDmTYaJOVYWsckreNjGsGSEtrMTpnzxTUq/tZQw=="
       },
-      "FlexLabs.EntityFrameworkCore.Upsert": {
-        "type": "Direct",
-        "requested": "[8.0.0, )",
-        "resolved": "8.0.0",
-        "contentHash": "Z7KFJhVEuhLQMK763gXTaqfYFd3MknU0Du9IngXEtFXaEP4rKMxRlaWYntv58z3DEj1/UqBjLxojKMrUEDwNcw==",
-        "dependencies": {
-          "Microsoft.EntityFrameworkCore.Relational": "8.0.0"
-        }
-      },
       "Humanizer.Core.zh-Hans": {
         "type": "Direct",
         "requested": "[2.14.1, )",

diff --git a/c#/crawler/src/Tieba/Crawl/Facade/ThreadCrawlFacade.cs b/c#/crawler/src/Tieba/Crawl/Facade/ThreadCrawlFacade.cs
@@ -39,7 +39,7 @@ protected override void BeforeCommitSaveHook(CrawlerDbContext db, UserSaver user
                 u.CreatedAt = Helper.GetNowTimestamp();
                 return u;
             });
-        _ = db.Users.UpsertRange(newLatestRepliersExceptLocked).NoUpdate().Run();
+        db.Users.AddRange(newLatestRepliersExceptLocked);
     }
 
     protected override void PostParseHook(

diff --git a/c#/crawler/src/Tieba/Crawl/Saver/BaseSaver.cs b/c#/crawler/src/Tieba/Crawl/Saver/BaseSaver.cs
@@ -98,13 +98,12 @@ bool IsTimestampingFieldName(string name) => name is nameof(BasePost.LastSeenAt)
         }).OfType<TRevision>().ToList();
         if (newRevisions.Count == 0) return; // quick exit to prevent execute sql with WHERE FALSE clause
 
-        _ = db.Set<TRevision>().UpsertRange(
-                newRevisions.Where(rev => !rev.IsAllFieldsIsNullExceptSplit()))
-            .NoUpdate().Run();
+        db.Set<TRevision>().AddRange(
+            newRevisions.Where(rev => !rev.IsAllFieldsIsNullExceptSplit()));
         newRevisions.OfType<RevisionWithSplitting<TBaseRevision>>()
             .SelectMany(rev => rev.SplitEntities)
             .GroupBy(pair => pair.Key, pair => pair.Value)
-            .ForEach(g => RevisionUpsertDelegatesKeyBySplitEntityType[g.Key](db, g));
+            .ForEach(g => AddRevisionDelegatesKeyBySplitEntityType[g.Key](db, g));
     }
 
     private static bool IsLatestReplierUser(string pName, PropertyEntry p, EntityEntry entry)

diff --git a/c#/crawler/src/Tieba/Crawl/Saver/Post/ReplySaver.cs b/c#/crawler/src/Tieba/Crawl/Saver/Post/ReplySaver.cs
@@ -25,23 +25,23 @@ public override IFieldChangeIgnorance.FieldChangeIgnoranceDelegates
             _ => false
         });
 
-    protected override Dictionary<Type, RevisionUpsertDelegate>
-        RevisionUpsertDelegatesKeyBySplitEntityType { get; } = new()
+    protected override Dictionary<Type, AddRevisionDelegate>
+        AddRevisionDelegatesKeyBySplitEntityType { get; } = new()
     {
         {
             typeof(ReplyRevision.SplitFloor), (db, revisions) =>
                 db.Set<ReplyRevision.SplitFloor>()
-                    .UpsertRange(revisions.OfType<ReplyRevision.SplitFloor>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<ReplyRevision.SplitFloor>())
         },
         {
             typeof(ReplyRevision.SplitSubReplyCount), (db, revisions) =>
                 db.Set<ReplyRevision.SplitSubReplyCount>()
-                    .UpsertRange(revisions.OfType<ReplyRevision.SplitSubReplyCount>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<ReplyRevision.SplitSubReplyCount>())
         },
         {
             typeof(ReplyRevision.SplitAgreeCount), (db, revisions) =>
                 db.Set<ReplyRevision.SplitAgreeCount>()
-                    .UpsertRange(revisions.OfType<ReplyRevision.SplitAgreeCount>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<ReplyRevision.SplitAgreeCount>())
         }
     };
 

diff --git a/c#/crawler/src/Tieba/Crawl/Saver/Post/SubReplySaver.cs b/c#/crawler/src/Tieba/Crawl/Saver/Post/SubReplySaver.cs
@@ -26,18 +26,18 @@ public override IFieldChangeIgnorance.FieldChangeIgnoranceDelegates
             _ => false
         }, (_, _, _, _) => false);
 
-    protected override Dictionary<Type, RevisionUpsertDelegate>
-        RevisionUpsertDelegatesKeyBySplitEntityType { get; } = new()
+    protected override Dictionary<Type, AddRevisionDelegate>
+        AddRevisionDelegatesKeyBySplitEntityType { get; } = new()
     {
         {
             typeof(SubReplyRevision.SplitAgreeCount), (db, revisions) =>
                 db.Set<SubReplyRevision.SplitAgreeCount>()
-                    .UpsertRange(revisions.OfType<SubReplyRevision.SplitAgreeCount>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<SubReplyRevision.SplitAgreeCount>())
         },
         {
             typeof(SubReplyRevision.SplitDisagreeCount), (db, revisions) =>
                 db.Set<SubReplyRevision.SplitDisagreeCount>()
-                    .UpsertRange(revisions.OfType<SubReplyRevision.SplitDisagreeCount>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<SubReplyRevision.SplitDisagreeCount>())
         }
     };
 

diff --git a/c#/crawler/src/Tieba/Crawl/Saver/Post/ThreadSaver.cs b/c#/crawler/src/Tieba/Crawl/Saver/Post/ThreadSaver.cs
@@ -22,13 +22,13 @@ public override IFieldChangeIgnorance.FieldChangeIgnoranceDelegates
             _ => false
         }, (_, _, _, _) => false);
 
-    protected override Dictionary<Type, RevisionUpsertDelegate>
-        RevisionUpsertDelegatesKeyBySplitEntityType { get; } = new()
+    protected override Dictionary<Type, AddRevisionDelegate>
+        AddRevisionDelegatesKeyBySplitEntityType { get; } = new()
     {
         {
             typeof(ThreadRevision.SplitViewCount), (db, revisions) =>
                 db.Set<ThreadRevision.SplitViewCount>()
-                    .UpsertRange(revisions.OfType<ThreadRevision.SplitViewCount>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<ThreadRevision.SplitViewCount>())
         }
     };
 

diff --git a/c#/crawler/src/Tieba/Crawl/Saver/SaverWithRevision.cs b/c#/crawler/src/Tieba/Crawl/Saver/SaverWithRevision.cs
@@ -3,9 +3,9 @@ namespace tbm.Crawler.Tieba.Crawl.Saver;
 public abstract class SaverWithRevision<TBaseRevision> : IRevisionProperties
     where TBaseRevision : BaseRevisionWithSplitting
 {
-    protected delegate void RevisionUpsertDelegate(CrawlerDbContext db, IEnumerable<TBaseRevision> revision);
+    protected delegate void AddRevisionDelegate(CrawlerDbContext db, IEnumerable<TBaseRevision> revision);
 
-    protected virtual IReadOnlyDictionary<Type, RevisionUpsertDelegate> RevisionUpsertDelegatesKeyBySplitEntityType =>
+    protected virtual IReadOnlyDictionary<Type, AddRevisionDelegate> AddRevisionDelegatesKeyBySplitEntityType =>
         throw new NotSupportedException();
 
     protected virtual NullFieldsBitMask GetRevisionNullFieldBitMask(string fieldName) =>

diff --git a/c#/crawler/src/Tieba/Crawl/Saver/UserSaver.cs b/c#/crawler/src/Tieba/Crawl/Saver/UserSaver.cs
@@ -2,23 +2,23 @@ namespace tbm.Crawler.Tieba.Crawl.Saver;
 
 public partial class UserSaver
 {
-    protected override Dictionary<Type, RevisionUpsertDelegate>
-        RevisionUpsertDelegatesKeyBySplitEntityType { get; } = new()
+    protected override Dictionary<Type, AddRevisionDelegate>
+        AddRevisionDelegatesKeyBySplitEntityType { get; } = new()
     {
         {
             typeof(UserRevision.SplitDisplayName), (db, revisions) =>
                 db.Set<UserRevision.SplitDisplayName>()
-                    .UpsertRange(revisions.OfType<UserRevision.SplitDisplayName>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<UserRevision.SplitDisplayName>())
         },
         {
             typeof(UserRevision.SplitPortraitUpdatedAt), (db, revisions) =>
                 db.Set<UserRevision.SplitPortraitUpdatedAt>()
-                    .UpsertRange(revisions.OfType<UserRevision.SplitPortraitUpdatedAt>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<UserRevision.SplitPortraitUpdatedAt>())
         },
         {
             typeof(UserRevision.SplitIpGeolocation), (db, revisions) =>
                 db.Set<UserRevision.SplitIpGeolocation>()
-                    .UpsertRange(revisions.OfType<UserRevision.SplitIpGeolocation>()).NoUpdate().Run()
+                    .AddRange(revisions.OfType<UserRevision.SplitIpGeolocation>())
         }
     };
 

diff --git a/c#/crawler/tbm.Crawler.csproj b/c#/crawler/tbm.Crawler.csproj
@@ -9,7 +9,6 @@
     <ItemGroup>
         <PackageReference Include="AngleSharp" Version="1.1.2" />
         <PackageReference Include="Dapper" Version="2.1.35" />
-        <PackageReference Include="FlexLabs.EntityFrameworkCore.Upsert" Version="8.0.0" />
         <PackageReference Include="Humanizer.Core.zh-Hans" Version="2.14.1" />
         <PackageReference Include="linq2db.EntityFrameworkCore" Version="8.1.0" />
         <PackageReference Include="linq2db.PostgreSQL" Version="5.4.1" />