Use EF Core 7.0 bulk update/delete operations.

Resolve #14892

framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/DistributedEvents/MySQLInboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class MySQLInboxConfigExtensions
-{
-    public static void UseMySQL<TDbContext>(this InboxConfig outboxConfig)
-        where TDbContext : IHasEventInbox
-    {
-        outboxConfig.ImplementationType = typeof(ISqlRawDbContextEventInbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/DistributedEvents/MySQLOutboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class MySQLOutboxConfigExtensions
-{
-    public static void UseMySQL<TDbContext>(this OutboxConfig outboxConfig)
-        where TDbContext : IHasEventOutbox
-    {
-        outboxConfig.ImplementationType = typeof(ISqlRawDbContextEventOutbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/DistributedEvents/IOracleDbContextEventInbox.cs

@@ -1,7 +0,0 @@
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public interface IOracleDbContextEventInbox<TDbContext> : IDbContextEventInbox<TDbContext>
-    where TDbContext : IHasEventInbox
-{
-
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/DistributedEvents/IOracleDbContextEventOutbox.cs

@@ -1,6 +0,0 @@
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public interface IOracleDbContextEventOutbox<TDbContext> : IDbContextEventOutbox<TDbContext>
-    where TDbContext : IHasEventOutbox
-{
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/DistributedEvents/OracleDbContextEventInbox.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Volo.Abp.EventBus.Distributed;
-using Volo.Abp.Timing;
-using Volo.Abp.Uow;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public class OracleDbContextEventInbox<TDbContext> : DbContextEventInbox<TDbContext>, IOracleDbContextEventInbox<TDbContext>
-    where TDbContext : IHasEventInbox
-{
-    public OracleDbContextEventInbox(
-        IDbContextProvider<TDbContext> dbContextProvider,
-        IClock clock,
-        IOptions<AbpEventBusBoxesOptions> eventBusBoxesOptions)
-        : base(dbContextProvider, clock, eventBusBoxesOptions)
-    {
-    }
-
-    [UnitOfWork]
-    public override async Task MarkAsProcessedAsync(Guid id)
-    {
-        var dbContext = await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.IncomingEvents.EntityType.GetSchemaQualifiedTableName();
-
-        var sql = $"UPDATE \"{tableName}\" SET \"Processed\" = '1', \"ProcessedTime\" = TO_DATE('{Clock.Now}', 'yyyy-mm-dd hh24:mi:ss') WHERE \"Id\" = HEXTORAW('{GuidToOracleType(id)}')";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-
-    [UnitOfWork]
-    public override async Task DeleteOldEventsAsync()
-    {
-        var dbContext = await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.IncomingEvents.EntityType.GetSchemaQualifiedTableName();
-        var timeToKeepEvents = Clock.Now - EventBusBoxesOptions.WaitTimeToDeleteProcessedInboxEvents;
-
-        var sql = $"DELETE FROM \"{tableName}\" WHERE \"Processed\" = '1' AND \"CreationTime\" < TO_DATE('{timeToKeepEvents}', 'yyyy-mm-dd hh24:mi:ss')";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-
-    protected virtual string GuidToOracleType(Guid id)
-    {
-        return BitConverter.ToString(id.ToByteArray()).Replace("-", "").ToUpper();
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/DistributedEvents/OracleDbContextEventOutbox.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Uow;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public class OracleDbContextEventOutbox<TDbContext> : DbContextEventOutbox<TDbContext>, IOracleDbContextEventOutbox<TDbContext>
-    where TDbContext : IHasEventOutbox
-{
-    public OracleDbContextEventOutbox(IDbContextProvider<TDbContext> dbContextProvider)
-        : base(dbContextProvider)
-    {
-    }
-
-    [UnitOfWork]
-    public override async Task DeleteAsync(Guid id)
-    {
-        var dbContext = (IHasEventOutbox)await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.OutgoingEvents.EntityType.GetSchemaQualifiedTableName();
-
-        var sql = $"DELETE FROM \"{tableName}\" WHERE \"Id\" = HEXTORAW('{GuidToOracleType(id)}')";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-
-    protected virtual string GuidToOracleType(Guid id)
-    {
-        return BitConverter.ToString(id.ToByteArray()).Replace("-", "").ToUpper();
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/DistributedEvents/OracleInboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class OracleInboxConfigExtensions
-{
-    public static void UseOracle<TDbContext>(this InboxConfig outboxConfig)
-        where TDbContext : IHasEventInbox
-    {
-        outboxConfig.ImplementationType = typeof(IOracleDbContextEventInbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/DistributedEvents/OracleOutboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class OracleOutboxConfigExtensions
-{
-    public static void UseOracle<TDbContext>(this OutboxConfig outboxConfig)
-        where TDbContext : IHasEventOutbox
-    {
-        outboxConfig.ImplementationType = typeof(IOracleDbContextEventOutbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.EntityFrameworkCore.DistributedEvents;
 using Volo.Abp.Guids;
 using Volo.Abp.Modularity;
 
@@ -19,8 +18,5 @@ public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule
                 options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
             }
         });
-
-        context.Services.AddTransient(typeof(IOracleDbContextEventOutbox<>), typeof(OracleDbContextEventOutbox<>));
-        context.Services.AddTransient(typeof(IOracleDbContextEventInbox<>), typeof(OracleDbContextEventInbox<>));
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/DistributedEvents/IOracleDbContextEventInbox.cs

@@ -1,7 +0,0 @@
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public interface IOracleDbContextEventInbox<TDbContext> : IDbContextEventInbox<TDbContext>
-    where TDbContext : IHasEventInbox
-{
-
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/DistributedEvents/IOracleDbContextEventOutbox.cs

@@ -1,6 +0,0 @@
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public interface IOracleDbContextEventOutbox<TDbContext> : IDbContextEventOutbox<TDbContext>
-    where TDbContext : IHasEventOutbox
-{
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/DistributedEvents/OracleDbContextEventInbox.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Volo.Abp.EventBus.Distributed;
-using Volo.Abp.Timing;
-using Volo.Abp.Uow;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public class OracleDbContextEventInbox<TDbContext> : DbContextEventInbox<TDbContext>, IOracleDbContextEventInbox<TDbContext>
-    where TDbContext : IHasEventInbox
-{
-    public OracleDbContextEventInbox(
-        IDbContextProvider<TDbContext> dbContextProvider,
-        IClock clock,
-        IOptions<AbpEventBusBoxesOptions> eventBusBoxesOptions)
-        : base(dbContextProvider, clock, eventBusBoxesOptions)
-    {
-    }
-
-    [UnitOfWork]
-    public override async Task MarkAsProcessedAsync(Guid id)
-    {
-        var dbContext = await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.IncomingEvents.EntityType.GetSchemaQualifiedTableName();
-
-        var sql = $"UPDATE \"{tableName}\" SET \"Processed\" = '1', \"ProcessedTime\" = TO_DATE('{Clock.Now}', 'yyyy-mm-dd hh24:mi:ss') WHERE \"Id\" = HEXTORAW('{GuidToOracleType(id)}')";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-
-    [UnitOfWork]
-    public override async Task DeleteOldEventsAsync()
-    {
-        var dbContext = await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.IncomingEvents.EntityType.GetSchemaQualifiedTableName();
-        var timeToKeepEvents = Clock.Now - EventBusBoxesOptions.WaitTimeToDeleteProcessedInboxEvents;
-
-        var sql = $"DELETE FROM \"{tableName}\" WHERE \"Processed\" = '1' AND \"CreationTime\" < TO_DATE('{timeToKeepEvents}', 'yyyy-mm-dd hh24:mi:ss')";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-
-    protected virtual string GuidToOracleType(Guid id)
-    {
-        return BitConverter.ToString(id.ToByteArray()).Replace("-", "").ToUpper();
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/DistributedEvents/OracleDbContextEventOutbox.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Uow;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public class OracleDbContextEventOutbox<TDbContext> : DbContextEventOutbox<TDbContext>, IOracleDbContextEventOutbox<TDbContext>
-    where TDbContext : IHasEventOutbox
-{
-    public OracleDbContextEventOutbox(IDbContextProvider<TDbContext> dbContextProvider)
-        : base(dbContextProvider)
-    {
-    }
-
-    [UnitOfWork]
-    public override async Task DeleteAsync(Guid id)
-    {
-        var dbContext = (IHasEventOutbox)await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.OutgoingEvents.EntityType.GetSchemaQualifiedTableName();
-
-        var sql = $"DELETE FROM \"{tableName}\" WHERE \"Id\" = HEXTORAW('{GuidToOracleType(id)}')";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-
-    protected virtual string GuidToOracleType(Guid id)
-    {
-        return BitConverter.ToString(id.ToByteArray()).Replace("-", "").ToUpper();
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/DistributedEvents/OracleInboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class OracleInboxConfigExtensions
-{
-    public static void UseOracle<TDbContext>(this InboxConfig outboxConfig)
-        where TDbContext : IHasEventInbox
-    {
-        outboxConfig.ImplementationType = typeof(IOracleDbContextEventInbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/DistributedEvents/OracleOutboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class OracleOutboxConfigExtensions
-{
-    public static void UseOracle<TDbContext>(this OutboxConfig outboxConfig)
-        where TDbContext : IHasEventOutbox
-    {
-        outboxConfig.ImplementationType = typeof(IOracleDbContextEventOutbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/Oracle/AbpEntityFrameworkCoreOracleModule.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.EntityFrameworkCore.DistributedEvents;
 using Volo.Abp.Guids;
 using Volo.Abp.Modularity;
 
@@ -17,8 +16,5 @@ public class AbpEntityFrameworkCoreOracleModule : AbpModule
                 options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
             }
         });
-
-        context.Services.AddTransient(typeof(IOracleDbContextEventOutbox<>), typeof(OracleDbContextEventOutbox<>));
-        context.Services.AddTransient(typeof(IOracleDbContextEventInbox<>), typeof(OracleDbContextEventInbox<>));
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/DistributedEvents/IPostgreSqlDbContextEventInbox.cs

@@ -1,7 +0,0 @@
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public interface IPostgreSqlDbContextEventInbox<TDbContext> : IDbContextEventInbox<TDbContext>
-    where TDbContext : IHasEventInbox
-{
-
-}

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/DistributedEvents/IPostgreSqlDbContextEventOutbox.cs

@@ -1,6 +0,0 @@
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public interface IPostgreSqlDbContextEventOutbox<TDbContext> : IDbContextEventOutbox<TDbContext>
-    where TDbContext : IHasEventOutbox
-{
-}

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/DistributedEvents/PostgreSqlDbContextEventInbox.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Volo.Abp.EventBus.Distributed;
-using Volo.Abp.Timing;
-using Volo.Abp.Uow;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public class PostgreSqlDbContextEventInbox<TDbContext> : DbContextEventInbox<TDbContext>, IPostgreSqlDbContextEventInbox<TDbContext>
-    where TDbContext : IHasEventInbox
-{
-    public PostgreSqlDbContextEventInbox(
-        IDbContextProvider<TDbContext> dbContextProvider,
-        IClock clock,
-        IOptions<AbpEventBusBoxesOptions> eventBusBoxesOptions)
-        : base(dbContextProvider, clock, eventBusBoxesOptions)
-    {
-    }
-
-    [UnitOfWork]
-    public override async Task MarkAsProcessedAsync(Guid id)
-    {
-        var dbContext = await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.IncomingEvents.EntityType.GetSchemaQualifiedTableName();
-
-        var sql = $"UPDATE \"{tableName}\" SET \"Processed\" = '1', \"ProcessedTime\" = '{Clock.Now}' WHERE \"Id\" = '{id}'";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-
-    [UnitOfWork]
-    public override async Task DeleteOldEventsAsync()
-    {
-        var dbContext = await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.IncomingEvents.EntityType.GetSchemaQualifiedTableName();
-        var timeToKeepEvents = Clock.Now - EventBusBoxesOptions.WaitTimeToDeleteProcessedInboxEvents;
-
-        var sql = $"DELETE FROM \"{tableName}\" WHERE \"Processed\" = '1' AND \"CreationTime\" < '{timeToKeepEvents}'";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/DistributedEvents/PostgreSqlDbContextEventOutbox.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Uow;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public class PostgreSqlDbContextEventOutbox<TDbContext> : DbContextEventOutbox<TDbContext>, IPostgreSqlDbContextEventOutbox<TDbContext>
-    where TDbContext : IHasEventOutbox
-{
-    public PostgreSqlDbContextEventOutbox(IDbContextProvider<TDbContext> dbContextProvider) : base(dbContextProvider)
-    {
-    }
-
-    [UnitOfWork]
-    public async override Task DeleteAsync(Guid id)
-    {
-        var dbContext = (IHasEventOutbox)await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.OutgoingEvents.EntityType.GetSchemaQualifiedTableName();
-
-        var sql = $"DELETE FROM \"{tableName}\" WHERE \"Id\" = '{id}'";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/DistributedEvents/PostgreSqlInboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class PostgreSqlInboxConfigExtensions
-{
-    public static void UseNpgsql<TDbContext>(this InboxConfig outboxConfig)
-        where TDbContext : IHasEventInbox
-    {
-        outboxConfig.ImplementationType = typeof(IPostgreSqlDbContextEventInbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/DistributedEvents/PostgreSqlOutboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class PostgreSqlOutboxConfigExtensions
-{
-    public static void UseNpgsql<TDbContext>(this OutboxConfig outboxConfig)
-        where TDbContext : IHasEventOutbox
-    {
-        outboxConfig.ImplementationType = typeof(IPostgreSqlDbContextEventOutbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/PostgreSql/AbpEntityFrameworkCorePostgreSqlModule.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Guids;
-using Volo.Abp.EntityFrameworkCore.DistributedEvents;
-using Volo.Abp.Guids;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.EntityFrameworkCore.PostgreSql;
@@ -19,8 +17,5 @@ public class AbpEntityFrameworkCorePostgreSqlModule : AbpModule
                 options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsString;
             }
         });
-
-        context.Services.AddTransient(typeof(IPostgreSqlDbContextEventOutbox<>), typeof(PostgreSqlDbContextEventOutbox<>));
-        context.Services.AddTransient(typeof(IPostgreSqlDbContextEventInbox<>), typeof(PostgreSqlDbContextEventInbox<>));
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/DistributedEvents/SqlServerInboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class SqlServerInboxConfigExtensions
-{
-    public static void UseSqlServer<TDbContext>(this InboxConfig outboxConfig)
-        where TDbContext : IHasEventInbox
-    {
-        outboxConfig.ImplementationType = typeof(ISqlRawDbContextEventInbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/DistributedEvents/SqlServerOutboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class SqlServerOutboxConfigExtensions
-{
-    public static void UseSqlServer<TDbContext>(this OutboxConfig outboxConfig)
-        where TDbContext : IHasEventOutbox
-    {
-        outboxConfig.ImplementationType = typeof(ISqlRawDbContextEventOutbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/DistributedEvents/SqliteInboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class SqliteInboxConfigExtensions
-{
-    public static void UseSqlite<TDbContext>(this InboxConfig outboxConfig)
-        where TDbContext : IHasEventInbox
-    {
-        outboxConfig.ImplementationType = typeof(ISqlRawDbContextEventInbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/DistributedEvents/SqliteOutboxConfigExtensions.cs

@@ -1,12 +0,0 @@
-using Volo.Abp.EventBus.Distributed;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public static class SqliteOutboxConfigExtensions
-{
-    public static void UseSqlite<TDbContext>(this OutboxConfig outboxConfig)
-        where TDbContext : IHasEventOutbox
-    {
-        outboxConfig.ImplementationType = typeof(ISqlRawDbContextEventOutbox<TDbContext>);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreModule.cs

@@ -28,8 +28,5 @@ public class AbpEntityFrameworkCoreModule : AbpModule
         context.Services.TryAddTransient(typeof(IDbContextProvider<>), typeof(UnitOfWorkDbContextProvider<>));
         context.Services.AddTransient(typeof(IDbContextEventOutbox<>), typeof(DbContextEventOutbox<>));
         context.Services.AddTransient(typeof(IDbContextEventInbox<>), typeof(DbContextEventInbox<>));
-
-        context.Services.AddTransient(typeof(ISqlRawDbContextEventOutbox<>), typeof(SqlRawDbContextEventOutbox<>));
-        context.Services.AddTransient(typeof(ISqlRawDbContextEventInbox<>), typeof(SqlRawDbContextEventInbox<>));
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DistributedEvents/DbContextEventInbox.cs

@@ -32,10 +32,7 @@ public class DbContextEventInbox<TDbContext> : IDbContextEventInbox<TDbContext>
     public virtual async Task EnqueueAsync(IncomingEventInfo incomingEvent)
     {
         var dbContext = await DbContextProvider.GetDbContextAsync();
-
+        dbContext.IncomingEvents.Add(new IncomingEventRecord(incomingEvent));
-        dbContext.IncomingEvents.Add(
-            new IncomingEventRecord(incomingEvent)
-        );
     }
 
     [UnitOfWork]
@@ -60,11 +57,8 @@ public class DbContextEventInbox<TDbContext> : IDbContextEventInbox<TDbContext>
     public virtual async Task MarkAsProcessedAsync(Guid id)
     {
         var dbContext = await DbContextProvider.GetDbContextAsync();
-        var incomingEvent = await dbContext.IncomingEvents.FindAsync(id);
+        await dbContext.IncomingEvents.Where(x => x.Id == id).ExecuteUpdateAsync(x =>
-        if (incomingEvent != null)
+            x.SetProperty(p => p.Processed, _ => true).SetProperty(p => p.ProcessedTime, _ => Clock.Now));
-        {
-            incomingEvent.MarkAsProcessed(Clock.Now);
-        }
     }
 
     [UnitOfWork]
@@ -79,9 +73,8 @@ public class DbContextEventInbox<TDbContext> : IDbContextEventInbox<TDbContext>
     {
         var dbContext = await DbContextProvider.GetDbContextAsync();
         var timeToKeepEvents = Clock.Now - EventBusBoxesOptions.WaitTimeToDeleteProcessedInboxEvents;
-        var oldEvents = await dbContext.IncomingEvents
+        await dbContext.IncomingEvents
             .Where(x => x.Processed && x.CreationTime < timeToKeepEvents)
-            .ToListAsync();
+            .ExecuteDeleteAsync();
-        dbContext.IncomingEvents.RemoveRange(oldEvents);
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DistributedEvents/DbContextEventOutbox.cs

@@ -24,9 +24,7 @@ public class DbContextEventOutbox<TDbContext> : IDbContextEventOutbox<TDbContext
     public virtual async Task EnqueueAsync(OutgoingEventInfo outgoingEvent)
     {
         var dbContext = (IHasEventOutbox)await DbContextProvider.GetDbContextAsync();
-        dbContext.OutgoingEvents.Add(
+        dbContext.OutgoingEvents.Add(new OutgoingEventRecord(outgoingEvent));
-            new OutgoingEventRecord(outgoingEvent)
-        );
     }
 
     [UnitOfWork]
@@ -50,21 +48,13 @@ public class DbContextEventOutbox<TDbContext> : IDbContextEventOutbox<TDbContext
     public virtual async Task DeleteAsync(Guid id)
     {
         var dbContext = (IHasEventOutbox)await DbContextProvider.GetDbContextAsync();
-        var outgoingEvent = await dbContext.OutgoingEvents.FindAsync(id);
+        await dbContext.OutgoingEvents.Where(x => x.Id == id).ExecuteDeleteAsync();
-        if (outgoingEvent != null)
-        {
-            dbContext.Remove(outgoingEvent);
-        }
     }
 
     [UnitOfWork]
     public virtual async Task DeleteManyAsync(IEnumerable<Guid> ids)
     {
         var dbContext = (IHasEventOutbox)await DbContextProvider.GetDbContextAsync();
-        var outgoingEvents = await dbContext.OutgoingEvents.Where(x => ids.Contains(x.Id)).ToListAsync();
+        await dbContext.OutgoingEvents.Where(x => ids.Contains(x.Id)).ExecuteDeleteAsync();
-        if (outgoingEvents.Any())
-        {
-            dbContext.RemoveRange(outgoingEvents);
-        }
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DistributedEvents/ISqlRawDbContextEventInbox.cs

@@ -1,6 +0,0 @@
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public interface ISqlRawDbContextEventInbox<TDbContext> : IDbContextEventInbox<TDbContext>
-    where TDbContext : IHasEventInbox
-{
-}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DistributedEvents/ISqlRawDbContextEventOutbox.cs

@@ -1,6 +0,0 @@
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public interface ISqlRawDbContextEventOutbox<TDbContext> : IDbContextEventOutbox<TDbContext>
-    where TDbContext : IHasEventOutbox
-{
-}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DistributedEvents/SqlRawDbContextEventInbox.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Volo.Abp.EventBus.Distributed;
-using Volo.Abp.Timing;
-using Volo.Abp.Uow;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public class SqlRawDbContextEventInbox<TDbContext> : DbContextEventInbox<TDbContext>, ISqlRawDbContextEventInbox<TDbContext>
-    where TDbContext : IHasEventInbox
-{
-    public SqlRawDbContextEventInbox(
-        IDbContextProvider<TDbContext> dbContextProvider,
-        IClock clock,
-        IOptions<AbpEventBusBoxesOptions> eventBusBoxesOptions)
-        : base(dbContextProvider, clock, eventBusBoxesOptions)
-    {
-    }
-
-    [UnitOfWork]
-    public override async Task MarkAsProcessedAsync(Guid id)
-    {
-        var dbContext = await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.IncomingEvents.EntityType.GetSchemaQualifiedTableName();
-
-        var sql = $"UPDATE {tableName} SET Processed = '1', ProcessedTime = '{Clock.Now}' WHERE Id = '{id.ToString().ToUpper()}'";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-
-    [UnitOfWork]
-    public override async Task DeleteOldEventsAsync()
-    {
-        var dbContext = await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.IncomingEvents.EntityType.GetSchemaQualifiedTableName();
-        var timeToKeepEvents = Clock.Now - EventBusBoxesOptions.WaitTimeToDeleteProcessedInboxEvents;
-
-        var sql = $"DELETE FROM {tableName} WHERE Processed = '1' AND CreationTime < '{timeToKeepEvents}'";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-}

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DistributedEvents/SqlRawDbContextEventOutbox.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Volo.Abp.Uow;
-
-namespace Volo.Abp.EntityFrameworkCore.DistributedEvents;
-
-public class SqlRawDbContextEventOutbox<TDbContext> : DbContextEventOutbox<TDbContext>, ISqlRawDbContextEventOutbox<TDbContext>
-    where TDbContext : IHasEventOutbox
-{
-    public SqlRawDbContextEventOutbox(IDbContextProvider<TDbContext> dbContextProvider)
-        : base(dbContextProvider)
-    {
-    }
-
-    [UnitOfWork]
-    public override async Task DeleteAsync(Guid id)
-    {
-        var dbContext = (IHasEventOutbox)await DbContextProvider.GetDbContextAsync();
-        var tableName = dbContext.OutgoingEvents.EntityType.GetSchemaQualifiedTableName();
-
-        var sql = $"DELETE FROM {tableName} WHERE Id = '{id.ToString().ToUpper()}'";
-        await dbContext.Database.ExecuteSqlRawAsync(sql);
-    }
-}

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/IDeviceFlowCodesRepository.cs

@@ -23,4 +23,9 @@ public interface IDeviceFlowCodesRepository : IBasicRepository<DeviceFlowCodes,
         int maxResultCount,
         CancellationToken cancellationToken = default
     );
+
+    Task DeleteExpirationAsync(
+        DateTime maxExpirationDate,
+        CancellationToken cancellationToken = default
+    );
 }

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/IPersistentGrantRepository.cs

@@ -30,6 +30,11 @@ public interface IPersistentGrantRepository : IBasicRepository<PersistedGrant, G
         CancellationToken cancellationToken = default
     );
 
+    Task DeleteExpirationAsync(
+        DateTime maxExpirationDate,
+        CancellationToken cancellationToken = default
+    );
+
     Task DeleteAsync(
         string subjectId = null,
         string sessionId = null,

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Tokens/TokenCleanupOptions.cs

@@ -1,4 +1,5 @@
-using Volo.Abp.BackgroundWorkers;
+using System;
+using Volo.Abp.BackgroundWorkers;
 
 namespace Volo.Abp.IdentityServer.Tokens;
 
@@ -12,6 +13,7 @@ public class TokenCleanupOptions
     /// <summary>
     /// Default value: 100.
     /// </summary>
+    [Obsolete("This option will be removed in future versions.")]
     public int CleanupBatchSize { get; set; } = 100;
 
     /// <summary>
@@ -22,6 +24,7 @@ public class TokenCleanupOptions
     ///
     /// Default value: 10.
     /// </summary>
+    /// [Obsolete("This option will be removed in future versions.")]
     public int CleanupLoopCount { get; set; } = 10;
 
     /// <summary>

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Tokens/TokenCleanupService.cs

@@ -24,42 +24,20 @@ public class TokenCleanupService : ITransientDependency
         Options = options.Value;
     }
 
+    [UnitOfWork]
     public virtual async Task CleanAsync()
     {
         await RemoveGrantsAsync();
         await RemoveDeviceCodesAsync();
     }
 
-    [UnitOfWork]
     protected virtual async Task RemoveGrantsAsync()
     {
-        for (var i = 0; i < Options.CleanupLoopCount; i++)
+        await PersistentGrantRepository.DeleteExpirationAsync(DateTime.UtcNow);
-        {
-            var persistentGrants = await PersistentGrantRepository.GetListByExpirationAsync(DateTime.UtcNow, Options.CleanupBatchSize);
-
-            await PersistentGrantRepository.DeleteManyAsync(persistentGrants);
-
-            //No need to continue to query if it gets more than max items.
-            if (persistentGrants.Count < Options.CleanupBatchSize)
-            {
-                break;
-            }
-        }
     }
 
     protected virtual async Task RemoveDeviceCodesAsync()
     {
-        for (var i = 0; i < Options.CleanupLoopCount; i++)
+        await DeviceFlowCodesRepository.DeleteExpirationAsync(DateTime.UtcNow);
-        {
-            var deviceFlowCodeses = await DeviceFlowCodesRepository.GetListByExpirationAsync(DateTime.UtcNow, Options.CleanupBatchSize);
-
-            await DeviceFlowCodesRepository.DeleteManyAsync(deviceFlowCodeses);
-
-            //No need to continue to query if it gets more than max items.
-            if (deviceFlowCodeses.Count < Options.CleanupBatchSize)
-            {
-                break;
-            }
-        }
     }
 }

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Devices/DeviceFlowCodesRepository.cs

@@ -46,4 +46,9 @@ public class DeviceFlowCodesRepository : EfCoreRepository<IIdentityServerDbConte
             .Take(maxResultCount)
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
+
+    public virtual async Task DeleteExpirationAsync(DateTime maxExpirationDate, CancellationToken cancellationToken = default)
+    {
+        await DeleteDirectAsync(x => x.Expiration != null && x.Expiration < maxExpirationDate, cancellationToken);
+    }
 }

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Grants/PersistentGrantRepository.cs

@@ -55,6 +55,11 @@ public class PersistentGrantRepository : EfCoreRepository<IIdentityServerDbConte
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
+    public virtual async Task DeleteExpirationAsync(DateTime maxExpirationDate, CancellationToken cancellationToken = default)
+    {
+        await DeleteDirectAsync(x => x.Expiration != null && x.Expiration < maxExpirationDate, cancellationToken);
+    }
+
     public async Task DeleteAsync(
         string subjectId = null,
         string sessionId = null,

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoDeviceFlowCodesRepository.cs

@@ -48,4 +48,9 @@ public class MongoDeviceFlowCodesRepository :
             .Take(maxResultCount)
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
+
+    public virtual async Task DeleteExpirationAsync(DateTime maxExpirationDate, CancellationToken cancellationToken = default)
+    {
+        await DeleteDirectAsync(x => x.Expiration != null && x.Expiration < maxExpirationDate, cancellationToken: cancellationToken);
+    }
 }

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistentGrantRepository.cs

@@ -50,6 +50,11 @@ public class MongoPersistentGrantRepository : MongoDbRepository<IAbpIdentityServ
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
+    public virtual async Task DeleteExpirationAsync(DateTime maxExpirationDate, CancellationToken cancellationToken = default)
+    {
+        await DeleteDirectAsync(x => x.Expiration != null && x.Expiration < maxExpirationDate, cancellationToken: cancellationToken);
+    }
+
     public async Task DeleteAsync(
         string subjectId = null,
         string sessionId = null,

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/AbpOpenIddictAuthorizationStore.cs

@@ -47,7 +47,7 @@ public class AbpOpenIddictAuthorizationStore : AbpOpenIddictStoreBase<IOpenIddic
         Check.NotNull(authorization, nameof(authorization));
 
         await Repository.InsertAsync(authorization.ToEntity(), autoSave: true, cancellationToken: cancellationToken);
-        
+
         authorization = (await Repository.FindAsync(authorization.Id, cancellationToken: cancellationToken)).ToModel();
     }
 
@@ -276,23 +276,11 @@ public class AbpOpenIddictAuthorizationStore : AbpOpenIddictStoreBase<IOpenIddic
 
     public virtual async ValueTask PruneAsync(DateTimeOffset threshold, CancellationToken cancellationToken)
     {
-        for (var index = 0; index < 1_000; index++)
+        using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true, isolationLevel: IsolationLevel.RepeatableRead))
         {
-            cancellationToken.ThrowIfCancellationRequested();
+            var date = threshold.UtcDateTime;
-
+            await Repository.PruneAsync(date, cancellationToken: cancellationToken);
-            using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true, isolationLevel: IsolationLevel.RepeatableRead))
+            await uow.CompleteAsync(cancellationToken);
-            {
-                var date = threshold.UtcDateTime;
-
-                var authorizations = await Repository.GetPruneListAsync(date, 1_000, cancellationToken);
-                if (!authorizations.Any())
-                {
-                    break;
-                }
-
-                await Repository.DeleteManyAsync(authorizations, autoSave: true, cancellationToken: cancellationToken);
-                await uow.CompleteAsync(cancellationToken);
-            }
         }
     }
 
@@ -399,7 +387,7 @@ public class AbpOpenIddictAuthorizationStore : AbpOpenIddictStoreBase<IOpenIddic
         var entity = await Repository.GetAsync(authorization.Id, cancellationToken: cancellationToken);
 
         await Repository.UpdateAsync(authorization.ToEntity(entity), autoSave: true, cancellationToken: cancellationToken);
-        
+
         authorization = (await Repository.FindAsync(entity.Id, cancellationToken: cancellationToken)).ToModel();
     }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/IOpenIddictAuthorizationRepository.cs

@@ -23,4 +23,6 @@ public interface IOpenIddictAuthorizationRepository : IBasicRepository<OpenIddic
     Task<List<OpenIddictAuthorization>> ListAsync(int? count, int? offset, CancellationToken cancellationToken = default);
 
     Task<List<OpenIddictAuthorization>> GetPruneListAsync(DateTime date, int count, CancellationToken cancellationToken = default);
+
+    Task PruneAsync(DateTime date, CancellationToken cancellationToken = default);
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/AbpOpenIddictTokenStore.cs

@@ -47,7 +47,7 @@ public class AbpOpenIddictTokenStore : AbpOpenIddictStoreBase<IOpenIddictTokenRe
         Check.NotNull(token, nameof(token));
 
         await Repository.InsertAsync(token.ToEntity(), autoSave: true, cancellationToken: cancellationToken);
-        
+
         token = (await Repository.FindAsync(token.Id, cancellationToken: cancellationToken)).ToModel();
     }
 
@@ -291,23 +291,11 @@ public class AbpOpenIddictTokenStore : AbpOpenIddictStoreBase<IOpenIddictTokenRe
 
     public virtual async ValueTask PruneAsync(DateTimeOffset threshold, CancellationToken cancellationToken)
     {
-        for (var index = 0; index < 1_000; index++)
+        using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true, isolationLevel: IsolationLevel.RepeatableRead))
         {
-            cancellationToken.ThrowIfCancellationRequested();
+            var date = threshold.UtcDateTime;
-
+            await Repository.PruneAsync(date, cancellationToken: cancellationToken);
-            using (var uow = UnitOfWorkManager.Begin(requiresNew: true, isTransactional: true, isolationLevel: IsolationLevel.RepeatableRead))
+            await uow.CompleteAsync(cancellationToken);
-            {
-                var date = threshold.UtcDateTime;
-
-                var tokens = await Repository.GetPruneListAsync(date, 1_000, cancellationToken);
-                if (!tokens.Any())
-                {
-                    break;
-                }
-
-                await Repository.DeleteManyAsync(tokens, autoSave: true, cancellationToken: cancellationToken);
-                await uow.CompleteAsync(cancellationToken);
-            }
         }
     }
 
@@ -444,7 +432,7 @@ public class AbpOpenIddictTokenStore : AbpOpenIddictStoreBase<IOpenIddictTokenRe
         var entity = await Repository.GetAsync(token.Id, cancellationToken: cancellationToken);
 
         await Repository.UpdateAsync(token.ToEntity(entity), autoSave: true, cancellationToken: cancellationToken);
-        
+
         token = (await Repository.FindAsync(entity.Id, cancellationToken: cancellationToken)).ToModel();
     }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/IOpenIddictTokenRepository.cs

@@ -31,4 +31,6 @@ public interface IOpenIddictTokenRepository : IBasicRepository<OpenIddictToken,
     Task<List<OpenIddictToken>> ListAsync(int? count, int? offset, CancellationToken cancellationToken = default);
 
     Task<List<OpenIddictToken>> GetPruneListAsync(DateTime date, int count, CancellationToken cancellationToken = default);
+
+    Task PruneAsync(DateTime date, CancellationToken cancellationToken = default);
 }

modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo/Abp/OpenIddict/Authorizations/EfCoreOpenIddictAuthorizationRepository.cs

@@ -85,9 +85,20 @@ public class EfCoreOpenIddictAuthorizationRepository : EfCoreRepository<IOpenIdd
         return await (await GetDbSetAsync())
             .Where(x => x.CreationDate < date)
             .Where(x => x.Status != OpenIddictConstants.Statuses.Valid ||
-                        (x.Type == OpenIddictConstants.AuthorizationTypes.AdHoc && tokenQueryable.Any(t => t.AuthorizationId == x.Id)))
+                        (x.Type == OpenIddictConstants.AuthorizationTypes.AdHoc &&
+                         !tokenQueryable.Any(t => t.AuthorizationId == x.Id)))
             .OrderBy(x => x.Id)
             .Take(count)
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
+
+    public virtual async Task PruneAsync(DateTime date, CancellationToken cancellationToken = default)
+    {
+        var tokenQueryable = (await GetDbContextAsync()).Tokens.AsQueryable();
+        await DeleteDirectAsync(x => x.CreationDate < date &&
+                                     x.Status != OpenIddictConstants.Statuses.Valid ||
+                                     (x.Type == OpenIddictConstants.AuthorizationTypes.AdHoc &&
+                                      !tokenQueryable.Any(t => t.AuthorizationId == x.Id)),
+            cancellationToken: cancellationToken);
+    }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.EntityFrameworkCore/Volo/Abp/OpenIddict/Tokens/EfCoreOpenIddictTokenRepository.cs

@@ -87,7 +87,7 @@ public class EfCoreOpenIddictTokenRepository : EfCoreRepository<IOpenIddictDbCon
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
-    public async Task<List<OpenIddictToken>> GetPruneListAsync(DateTime date, int count, CancellationToken cancellationToken = default)
+    public virtual async Task<List<OpenIddictToken>> GetPruneListAsync(DateTime date, int count, CancellationToken cancellationToken = default)
     {
         return await (from token in await GetQueryableAsync()
             join authorization in (await GetDbContextAsync()).Set<OpenIddictAuthorization>().AsQueryable()
@@ -102,4 +102,20 @@ public class EfCoreOpenIddictTokenRepository : EfCoreRepository<IOpenIddictDbCon
             select token).Take(count)
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
+
+    public virtual async Task PruneAsync(DateTime date, CancellationToken cancellationToken = default)
+    {
+        await (from token in await GetQueryableAsync()
+                join authorization in (await GetDbContextAsync()).Set<OpenIddictAuthorization>().AsQueryable()
+                    on token.AuthorizationId equals authorization.Id into ta
+                from a in ta
+                where token.CreationDate < date
+                where (token.Status != OpenIddictConstants.Statuses.Inactive &&
+                       token.Status != OpenIddictConstants.Statuses.Valid) ||
+                      (a != null && a.Status != OpenIddictConstants.Statuses.Valid) ||
+                      token.ExpirationDate < DateTime.UtcNow
+                orderby token.Id
+                select token)
+            .ExecuteDeleteAsync(GetCancellationToken(cancellationToken));
+    }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo/Abp/OpenIddict/Authorizations/MongoOpenIddictAuthorizationRepository.cs

@@ -68,15 +68,23 @@ public class MongoOpenIddictAuthorizationRepository : MongoDbRepository<OpenIddi
     public virtual async Task<List<OpenIddictAuthorization>> GetPruneListAsync(DateTime date, int count, CancellationToken cancellationToken = default)
     {
         var tokenQueryable = await GetMongoQueryableAsync<OpenIddictToken>(GetCancellationToken(cancellationToken));
-        
+        return await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken)))
-        var authorizations = await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken)))
             .Where(x => x.CreationDate < date)
             .Where(x => x.Status != OpenIddictConstants.Statuses.Valid ||
-                        (x.Type == OpenIddictConstants.AuthorizationTypes.AdHoc))
+                        (x.Type == OpenIddictConstants.AuthorizationTypes.AdHoc &&
+                         !tokenQueryable.Any(t => t.AuthorizationId == x.Id)))
             .OrderBy(x => x.Id)
             .Take(count)
             .ToListAsync(GetCancellationToken(cancellationToken));
-        
+    }
-        return authorizations.Where(x => tokenQueryable.Any(t => t.AuthorizationId == x.Id)).ToList();
+
+    public virtual async Task PruneAsync(DateTime date, CancellationToken cancellationToken = default)
+    {
+        var tokenQueryable = await GetMongoQueryableAsync<OpenIddictToken>(GetCancellationToken(cancellationToken));
+        await DeleteDirectAsync(x => x.CreationDate < date &&
+                                     x.Status != OpenIddictConstants.Statuses.Valid ||
+                                     (x.Type == OpenIddictConstants.AuthorizationTypes.AdHoc &&
+                                      !tokenQueryable.Any(t => t.AuthorizationId == x.Id)),
+            GetCancellationToken(cancellationToken));
     }
 }

modules/openiddict/src/Volo.Abp.OpenIddict.MongoDB/Volo/Abp/OpenIddict/Tokens/MongoOpenIddictTokenRepository.cs

@@ -100,20 +100,35 @@ public class MongoOpenIddictTokenRepository : MongoDbRepository<OpenIddictMongoD
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
-    public async Task<List<OpenIddictToken>> GetPruneListAsync(DateTime date, int count, CancellationToken cancellationToken = default)
+    public virtual async Task<List<OpenIddictToken>> GetPruneListAsync(DateTime date, int count, CancellationToken cancellationToken = default)
     {
-        var authorizationIds = await (await GetMongoQueryableAsync<OpenIddictAuthorization>(cancellationToken))
+        return await (from token in await GetMongoQueryableAsync(cancellationToken)
-            .Where(x => x.Status != OpenIddictConstants.Statuses.Valid)
+            join authorization in await GetMongoQueryableAsync<OpenIddictAuthorization>(cancellationToken)
-            .Select(x => x.Id)
+                on token.AuthorizationId equals authorization.Id into ta
-            .ToListAsync(GetCancellationToken(cancellationToken));
+            from a in ta
+            where token.CreationDate < date
+            where (token.Status != OpenIddictConstants.Statuses.Inactive &&
+                   token.Status != OpenIddictConstants.Statuses.Valid) ||
+                  (a != null && a.Status != OpenIddictConstants.Statuses.Valid) ||
+                  token.ExpirationDate < DateTime.UtcNow
+            orderby token.Id
+            select token).Take(count).ToListAsync(GetCancellationToken(cancellationToken));
+    }
 
-        return await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken)))
+    public virtual async Task PruneAsync(DateTime date, CancellationToken cancellationToken = default)
-            .Where(x => x.CreationDate < date)
+    {
-            .Where(x => (x.Status != OpenIddictConstants.Statuses.Inactive &&
+        var tokens = await (from token in await GetMongoQueryableAsync(cancellationToken)
-                         x.Status != OpenIddictConstants.Statuses.Valid) ||
+            join authorization in await GetMongoQueryableAsync<OpenIddictAuthorization>(cancellationToken)
-                        authorizationIds.Contains(x.Id) ||
+                on token.AuthorizationId equals authorization.Id into ta
-                        x.ExpirationDate < DateTime.UtcNow)
+            from a in ta
-            .OrderBy(x => x.Id)
+            where token.CreationDate < date
-            .Take(count).ToListAsync(GetCancellationToken(cancellationToken));
+            where (token.Status != OpenIddictConstants.Statuses.Inactive &&
+                   token.Status != OpenIddictConstants.Statuses.Valid) ||
+                  (a != null && a.Status != OpenIddictConstants.Statuses.Valid) ||
+                  token.ExpirationDate < DateTime.UtcNow
+            orderby token.Id
+            select token).ToListAsync(cancellationToken: cancellationToken);
+
+        await DeleteManyAsync(tokens, cancellationToken: cancellationToken);
     }
 }