RavenDB-21233: modified test to run faster, changed to using 'Disable…

…MaxStatements',formatting
TheGoldenPlatypus · Nov 28, 2023 · 2375d09 · 2375d09
1 parent 4384805
commit 2375d09
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/Raven.Server/Documents/CollectionRunner.cs b/src/Raven.Server/Documents/CollectionRunner.cs
@@ -47,7 +47,7 @@ public Task<IOperationResult> ExecutePatch(string collectionName, long start, lo
             BlittableJsonReaderObject patchArgs, Action<IOperationProgress> onProgress, OperationCancelToken token)
         {
             return ExecuteOperation(collectionName, start, take, options, Context, onProgress,
-                key => new PatchDocumentCommand(Context, key, expectedChangeVector: null, skipPatchIfChangeVectorMismatch: false, patch: (patch, patchArgs), patchIfMissing: (null, null), createIfMissing: null, Database, isTest: false, debugMode: false, collectResultsNeeded: false, returnDocument: false,options.IgnoreMaxStepsForScript), token);
+                key => new PatchDocumentCommand(Context, key, expectedChangeVector: null, skipPatchIfChangeVectorMismatch: false, patch: (patch, patchArgs), patchIfMissing: (null, null), createIfMissing: null, Database, isTest: false, debugMode: false, collectResultsNeeded: false, returnDocument: false, options.IgnoreMaxStepsForScript), token);
         }
 
         protected async Task<IOperationResult> ExecuteOperation(string collectionName, long start, long take, CollectionOperationOptions options, DocumentsOperationContext context,

diff --git a/src/Raven.Server/Documents/Patch/PatchDocumentCommand.cs b/src/Raven.Server/Documents/Patch/PatchDocumentCommand.cs
@@ -450,7 +450,7 @@ public PatchDocumentCommand(
             bool debugMode,
             bool collectResultsNeeded,
             bool returnDocument,
-            bool ignoreMaxStepsForScript =false) : base(context, skipPatchIfChangeVectorMismatch, patch, patchIfMissing, createIfMissing, database, isTest, debugMode, collectResultsNeeded, returnDocument)
+            bool ignoreMaxStepsForScript = false) : base(context, skipPatchIfChangeVectorMismatch, patch, patchIfMissing, createIfMissing, database, isTest, debugMode, collectResultsNeeded, returnDocument)
         {
             _id = id;
             _expectedChangeVector = expectedChangeVector;
@@ -469,7 +469,7 @@ protected override long ExecuteCmd(DocumentsOperationContext context)
                 try
                 {
                     if (_ignoreMaxStepsForScript)
-                        run.ScriptEngine.ChangeMaxStatements(int.MaxValue);
+                        run.ScriptEngine.DisableMaxStatements();
 
                     using (_patchIfMissing.Run != null ? _database.Scripts.GetScriptRunner(_patchIfMissing.Run, readOnly: false, out runIfMissing) : (IDisposable)null)
                     {

diff --git a/test/SlowTests/Issues/RavenDB_21233.cs b/test/SlowTests/Issues/RavenDB_21233.cs
@@ -6,6 +6,7 @@
 using Raven.Client.Documents.Operations;
 using Raven.Client.Documents.Operations.Indexes;
 using Raven.Client.Documents.Queries;
+using Raven.Server.Config;
 using Tests.Infrastructure;
 using Xunit;
 
@@ -20,7 +21,7 @@ public class RavenDB_21233 : RavenTestBase
         {
             Query = @"
 from ""Orders"" update {
-    for (var i = 0; i < 10000; i++){
+    for (var i = 0; i < 100; i++){
         this.Freight = 13;
     }
 }"
@@ -31,7 +32,7 @@ public class RavenDB_21233 : RavenTestBase
             Query = @"
 from index ""Orders/ByCompany""
  update {
-    for (var i = 0; i < 10000; i++){
+    for (var i = 0; i < 100; i++){
         this.Total = 0;
     }
 }"
@@ -56,13 +57,17 @@ public RavenDB_21233(ITestOutputHelper output) : base(output)
         {
         }
 
-        [Fact]
+        [RavenFact(RavenTestCategory.Patching)]
         public async Task ExecutePatchScriptShouldRespectIgnoreMaxStepsForScriptFlag()
         {
             Operation operation;
             QueryOperationOptions options = new();
 
-            using (var store = GetDocumentStore())
+            using (var store = GetDocumentStore(new Options
+            {
+               ModifyDatabaseRecord = record =>
+                   record.Settings[RavenConfiguration.GetKey(x => x.Patching.MaxStepsForScript)] = "100"
+            }))
             {
 
                 await store.Maintenance.SendAsync(new CreateSampleDataOperation());
@@ -91,7 +96,7 @@ public async Task ExecutePatchScriptShouldRespectIgnoreMaxStepsForScriptFlag()
                 });
 
                 Assert.Contains(
-                    "The maximum number of statements executed have been reached - 10000. You can configure it by modifying the configuration option: 'Patching.MaxStepsForScript'.",
+                    "The maximum number of statements executed have been reached - 100. You can configure it by modifying the configuration option: 'Patching.MaxStepsForScript'.",
                     exception.ToString());
 
 
@@ -124,7 +129,7 @@ public async Task ExecutePatchScriptShouldRespectIgnoreMaxStepsForScriptFlag()
                 });
 
                 Assert.Contains(
-                    "The maximum number of statements executed have been reached - 10000. You can configure it by modifying the configuration option: 'Patching.MaxStepsForScript'.",
+                    "The maximum number of statements executed have been reached - 100. You can configure it by modifying the configuration option: 'Patching.MaxStepsForScript'.",
                     exception2.ToString());
             }
         }