fix: generic issue and moved destroy before handle

nekomeowww · May 24, 2023 · 03b03e4 · 03b03e4
1 parent 420ddc9
commit 03b03e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/dataloader_redis.go b/dataloader_redis.go
@@ -48,7 +48,7 @@ func (r *RedisDataloader[P]) BuryFor(ctx context.Context, payload P, forTimeRang
 //
 //	ZADD sortedSetKey utilUnixMilliTimestamp <capsule base64 string>
 func (r *RedisDataloader[P]) BuryUtil(ctx context.Context, payload P, utilUnixMilliTimestamp int64) error {
-	newCapsule := TimeCapsule[any]{Payload: payload}
+	newCapsule := TimeCapsule[P]{Payload: payload}
 	return r.bury(ctx, newCapsule.Base64String(), utilUnixMilliTimestamp)
 }
 

diff --git a/dataloader_rueidis.go b/dataloader_rueidis.go
@@ -46,7 +46,7 @@ func (r *RueidisDataloader[P]) BuryFor(ctx context.Context, payload P, forTimeRa
 //
 //	ZADD sortedSetKey utilUnixMilliTimestamp <capsule base64 string>
 func (r *RueidisDataloader[P]) BuryUtil(ctx context.Context, payload P, utilUnixMilliTimestamp int64) error {
-	newCapsule := TimeCapsule[any]{Payload: payload}
+	newCapsule := TimeCapsule[P]{Payload: payload}
 	return r.bury(ctx, newCapsule.Base64String(), utilUnixMilliTimestamp)
 }
 

diff --git a/timecapsule.go b/timecapsule.go
@@ -153,12 +153,10 @@ func (t *TimeCapsuleDigger[P]) Start() {
 
 			t.logger.Debugf("[TimeCapsule] dug a new capsule from dataloader %v", t.dataloader.Type())
 
-			assertedCapsule, ok := any(dugCapsule).(*TimeCapsule[P])
-			if ok && t.handlerFunc != nil && assertedCapsule != nil {
-				t.handlerFunc(t, assertedCapsule)
-			}
-
 			t.destroy(dugCapsule)
+			if t.handlerFunc != nil {
+				t.handlerFunc(t, dugCapsule)
+			}
 		case <-ctx.Done():
 			return
 		default: