Improvement CORE-5727 : Make faster engine response on cancel\shutdow…

…n signals when scanning long list of pointer pages
FirebirdSQL · Jan 28, 2018 · 9bd8685 · 9bd8685
1 parent 9d6b8f4
commit 9bd8685
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/jrd/dpm.epp b/src/jrd/dpm.epp
@@ -649,6 +649,8 @@ ULONG DPM_data_pages(thread_db* tdbb, jrd_rel* relation)
 				break;
 
 			CCH_RELEASE(tdbb, &window);
+
+			tdbb->checkCancelState(true);
 		}
 
 		CCH_RELEASE(tdbb, &window);
@@ -1827,6 +1829,9 @@ bool DPM_next(thread_db* tdbb, record_param* rpb, USHORT lock_type, bool onepage
 
 		if (flags & ppg_eof || onepage)
 			return false;
+
+		if (sweeper)
+			tdbb->checkCancelState(true);
 	}
 }