Add UseLock and AllowQueryBatch options

Add UseLock and AllowQueryBatch options

Author: zzzprojects

src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs

@@ -39,7 +39,7 @@ public class BatchDelete
         /// <summary>The command text template.</summary>
         internal const string CommandTextTemplate = @"
 DELETE
-FROM    A
+FROM    A {Hint}
 FROM    {TableName} AS A
         INNER JOIN ( {Select}
                     ) AS B ON {PrimaryKeys}
@@ -85,7 +85,7 @@ WHILE @rowAffected IS NULL
     OR @rowAffected > 0
     BEGIN
         DELETE TOP ({Top})
-        FROM    A
+        FROM    A {Hint}
         FROM    {TableName} AS A
                 INNER JOIN ( {Select}
                            ) AS B ON {PrimaryKeys}
@@ -113,7 +113,7 @@ WAITFOR DELAY '{Delay}'
             END
 
         DELETE TOP ({Top})
-        FROM    A
+        FROM    A {Hint}
         FROM    {TableName} AS A
                 INNER JOIN ( {Select}
                            ) AS B ON {PrimaryKeys}
@@ -139,6 +139,10 @@ public BatchDelete()
         /// <value>The batch delay interval in milliseconds (The wait time between batch).</value>
         public int BatchDelayInterval { get; set; }
 
+        /// <summary>Gets or sets a value indicating whether the query use table lock.</summary>
+        /// <value>True if use table lock, false if not.</value>
+        public bool UseTableLock { get; set; }
+
         /// <summary>Gets or sets the DbCommand before being executed.</summary>
         /// <value>The DbCommand before being executed.</value>
         public Action<DbCommand> Executing { get; set; }
@@ -444,7 +448,8 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
                 .Replace("{Select}", querySelect)
                 .Replace("{PrimaryKeys}", primaryKeys)
                 .Replace("{Top}", BatchSize.ToString())
-                .Replace("{Delay}", TimeSpan.FromMilliseconds(BatchDelayInterval).ToString(@"hh\:mm\:ss\:fff"));
+                .Replace("{Delay}", TimeSpan.FromMilliseconds(BatchDelayInterval).ToString(@"hh\:mm\:ss\:fff"))
+                .Replace("{Hint}", UseTableLock ? "WITH ( TABLOCK )" : "");
 
             // CREATE command
             command.CommandText = commandTextTemplate;
@@ -639,7 +644,8 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity)
                     .Replace("{Select}", querySelect)
                     .Replace("{PrimaryKeys}", primaryKeys)
                     .Replace("{Top}", BatchSize.ToString())
-                    .Replace("{Delay}", TimeSpan.FromMilliseconds(BatchDelayInterval).ToString(@"hh\:mm\:ss\:fff"));
+                    .Replace("{Delay}", TimeSpan.FromMilliseconds(BatchDelayInterval).ToString(@"hh\:mm\:ss\:fff"))
+                    .Replace("{Hint}", UseTableLock ? "WITH ( TABLOCK )" : "");
 
                 // CREATE command
                 var command = query.GetDbContext().CreateStoreCommand();

src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs

@@ -36,7 +36,7 @@ public class BatchUpdate
     {
         /// <summary>The command text template.</summary>
         internal const string CommandTextTemplate = @"
-UPDATE A 
+UPDATE A {Hint}
 SET {SetValue}
 FROM {TableName} AS A
 INNER JOIN ( {Select}
@@ -144,6 +144,10 @@ public BatchUpdate()
         /// <value>The DbCommand before being executed.</value>
         public Action<DbCommand> Executing { get; set; }
 
+        /// <summary>Gets or sets a value indicating whether the query use table lock.</summary>
+        /// <value>True if use table lock, false if not.</value>
+        public bool UseTableLock { get; set; }
+
         /// <summary>Executes the batch delete operation.</summary>
         /// <typeparam name="T">The type of elements of the query.</typeparam>
         /// <param name="query">The query used to execute the batch operation.</param>
@@ -429,7 +433,8 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
             commandTextTemplate = commandTextTemplate.Replace("{TableName}", tableName)
                 .Replace("{Select}", querySelect)
                 .Replace("{PrimaryKeys}", primaryKeys)
-                .Replace("{SetValue}", setValues);
+                .Replace("{SetValue}", setValues)
+                .Replace("{Hint}", UseTableLock ? "WITH ( TABLOCK )" : "");
 
             // CREATE command
             command.CommandText = commandTextTemplate;
@@ -660,7 +665,8 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity, List<Tuple<
                 commandTextTemplate = commandTextTemplate.Replace("{TableName}", tableName)
                     .Replace("{Select}", querySelect)
                     .Replace("{PrimaryKeys}", primaryKeys)
-                    .Replace("{SetValue}", setValues);
+                    .Replace("{SetValue}", setValues)
+                    .Replace("{Hint}", UseTableLock ? "WITH ( TABLOCK )" : "");
 
                 // CREATE command
                 var command = query.GetDbContext().CreateStoreCommand();

src/shared/Z.EF.Plus.QueryFuture.Shared/Extensions/IQueryable`/Future.cs

@@ -29,6 +29,13 @@ public static partial class QueryFutureExtensions
         /// </returns>
         public static QueryFutureEnumerable<T> Future<T>(this IQueryable<T> query)
         {
+            if (!QueryFutureManager.AllowQueryBatch)
+            {
+                var queryFuture = new QueryFutureEnumerable<T>(null, null);
+                queryFuture.GetResultDirectly(query);
+                return queryFuture;
+            }
+
 #if EF5 || EF6
             var objectQuery = query.GetObjectQuery();
             var futureBatch = QueryFutureManager.AddOrGetBatch(objectQuery.Context);

src/shared/Z.EF.Plus.QueryFuture.Shared/Extensions/IQueryable`/FutureValue.cs

@@ -29,6 +29,13 @@ public static partial class QueryFutureExtensions
         /// </returns>
         public static QueryFutureValue<TResult> FutureValue<TResult>(this IQueryable<TResult> query)
         {
+            if (!QueryFutureManager.AllowQueryBatch)
+            {
+                var futureValue = new QueryFutureValue<TResult>(null, null);
+                futureValue.GetResultDirectly(query);
+                return futureValue;
+            }
+
 #if EF5 || EF6
             var objectQuery = query.GetObjectQuery();
             var futureBatch = QueryFutureManager.AddOrGetBatch(objectQuery.Context);

src/shared/Z.EF.Plus.QueryFuture.Shared/Extensions/QueryDeferred/FutureValue.cs

@@ -21,6 +21,13 @@ public static partial class QueryFutureExtensions
         /// </returns>
         public static QueryFutureValue<TResult> FutureValue<TResult>(this QueryDeferred<TResult> query)
         {
+            if (!QueryFutureManager.AllowQueryBatch)
+            {
+                var futureValue = new QueryFutureValue<TResult>(null, null);
+                futureValue.GetResultDirectly(query.Query);
+                return futureValue;
+            }
+
 #if EF5 || EF6
             var objectQuery = query.Query.GetObjectQuery();
             var futureBatch = QueryFutureManager.AddOrGetBatch(objectQuery.Context);

src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs

@@ -93,6 +93,17 @@ public void ExecuteQueries()
                 return;
             }
 
+            if (!QueryFutureManager.AllowQueryBatch)
+            {
+                foreach (var query in Queries)
+                {
+                    query.GetResultDirectly();
+                }
+
+                Queries.Clear();
+                return;
+            }
+
 #if EF5 || EF6
             var connection = (EntityConnection)Context.Connection;
 #elif EFCORE

src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureEnumerable.cs

@@ -165,5 +165,12 @@ public override void GetResultDirectly()
 
             SetResult(enumerator);
         }
+
+        internal void GetResultDirectly(IQueryable<T> query)
+        {
+            var enumerator = query.GetEnumerator();
+
+            SetResult(enumerator);
+        }
     }
 }

src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureManager.cs

@@ -38,6 +38,10 @@ static QueryFutureManager()
 #endif
         }
 
+        /// <summary>Gets or sets a value indicating whether we allow query batch.</summary>
+        /// <value>True if allow query batch, false if not.</value>
+        public static bool AllowQueryBatch { get; set; } = true;
+
         /// <summary>Gets or sets the weak table used to cache future batch associated to a context.</summary>
         /// <value>The weak table used to cache future batch associated to a context.</value>
 #if EF5 || EF6

src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureValue.cs

@@ -131,6 +131,14 @@ public override void GetResultDirectly()
             HasValue = true;
         }
 
+        internal void GetResultDirectly(IQueryable<TResult> query)
+        {
+            var value = query.Provider.Execute<TResult>(query.Expression);
+
+            _result = value;
+            HasValue = true;
+        }
+
         /// <summary>
         /// Performs an implicit conversion from QueryFutureValue to TResult.
         /// </summary>

version.txt

@@ -1 +1 @@
-v1.6.9
+v1.6.10