Merge pull request #7686 from FirebirdSQL/work/gh-7682

Feature #7682 : use ParallelWorkers setting from firebird.conf as default for all parallelised operations
FirebirdSQL · Jul 28, 2023 · fc24dfa · fc24dfa
2 parents 7b130a4 + 2b5f7a4
commit fc24dfa
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 4 deletions.
diff --git a/src/alice/alice.cpp b/src/alice/alice.cpp
@@ -146,6 +146,7 @@ int alice(Firebird::UtilSvc* uSvc)
 #ifdef TRUSTED_AUTH
 	tdgbl->ALICE_data.ua_trusted = false;
 #endif
+	tdgbl->ALICE_data.ua_parallel_workers = uSvc->getParallelWorkers();
 
 	//  Start by parsing switches
 

diff --git a/src/alice/exe.cpp b/src/alice/exe.cpp
@@ -325,7 +325,7 @@ static void buildDpb(Firebird::ClumpletWriter& dpb, const SINT64 switches)
 		dpb.insertByte(isc_dpb_set_db_replica, tdgbl->ALICE_data.ua_replica_mode);
 	}
 
-	if (switches & sw_parallel_workers) {
+	if (tdgbl->ALICE_data.ua_parallel_workers > 0) {
 		dpb.insertInt(isc_dpb_parallel_workers, tdgbl->ALICE_data.ua_parallel_workers);
 	}
 

diff --git a/src/burp/backup.epp b/src/burp/backup.epp
@@ -300,6 +300,12 @@ int BACKUP_backup(const TEXT* dbb_file, const TEXT* file_name)
 			stmt->free(fbStatus);
 	}
 
+	if (tdgbl->gbl_sw_par_workers)
+	{
+		BURP_verbose(410, SafeArg() << tdgbl->gbl_sw_par_workers);
+		// msg 410 use up to @1 parallel workers
+	}
+
 	// decide what type of database we've got
 
 	detectRuntimeODS();

diff --git a/src/burp/burp.cpp b/src/burp/burp.cpp
@@ -597,7 +597,7 @@ int gbak(Firebird::UtilSvc* uSvc)
 	tdgbl->gbl_sw_old_descriptions = false;
 	tdgbl->gbl_sw_mode = false;
 	tdgbl->gbl_sw_skip_count = 0;
-	tdgbl->gbl_sw_par_workers = 1;
+	tdgbl->gbl_sw_par_workers = uSvc->getParallelWorkers();
 	tdgbl->action = NULL;
 
 	burp_fil* file = NULL;

diff --git a/src/burp/restore.epp b/src/burp/restore.epp
@@ -1019,7 +1019,8 @@ void create_database(BurpGlobals* tdgbl, Firebird::IProvider* provider, const TE
 	}
 	else
 	{
-		dpb.insertInt(isc_dpb_parallel_workers, tdgbl->gbl_sw_par_workers);
+		if (tdgbl->gbl_sw_par_workers > 0)
+			dpb.insertInt(isc_dpb_parallel_workers, tdgbl->gbl_sw_par_workers);
 		dpb.insertByte(isc_dpb_shutdown, isc_dpb_shut_multi);
 	}
 	dpb.insertInt(isc_dpb_shutdown_delay, 0);
@@ -10333,6 +10334,12 @@ bool restore(BurpGlobals* tdgbl, Firebird::IProvider* provider, const TEXT* file
  *
  **************************************/
 
+	if (tdgbl->gbl_sw_par_workers)
+	{
+		BURP_verbose(410, SafeArg() << tdgbl->gbl_sw_par_workers);
+		// msg 410 use up to @1 parallel workers
+	}
+
 	// Read burp record first
 
 	MVOL_init_read (file_name, &tdgbl->RESTORE_format);

diff --git a/src/common/UtilSvc.cpp b/src/common/UtilSvc.cpp
@@ -147,6 +147,7 @@ class StandaloneUtilityInterface : public UtilSvc
 	virtual void initStatus() { }
 	virtual bool utf8FileNames() { return false; }
 	virtual Firebird::ICryptKeyCallback* getCryptCallback() { return NULL; }
+	virtual int getParallelWorkers() { return 0; };
 };
 
 

diff --git a/src/common/UtilSvc.h b/src/common/UtilSvc.h
@@ -77,6 +77,7 @@ class UtilSvc : public Firebird::GlobalStorage
 	virtual unsigned int getAuthBlock(const unsigned char** bytes) = 0;
 	virtual bool utf8FileNames() = 0;
 	virtual Firebird::ICryptKeyCallback* getCryptCallback() = 0;
+	virtual int getParallelWorkers() = 0;
 
 	void setDataMode(bool value)
 	{

diff --git a/src/include/firebird/impl/msg/gbak.h b/src/include/firebird/impl/msg/gbak.h
@@ -405,3 +405,4 @@ FB_IMPL_MSG_NO_SYMBOL(GBAK, 406, "    @1PAR(ALLEL)           parallel workers")
 FB_IMPL_MSG_SYMBOL(GBAK, 407, gbak_missing_prl_wrks, "parallel workers parameter missing")
 FB_IMPL_MSG_SYMBOL(GBAK, 408, gbak_inv_prl_wrks, "expected parallel workers, encountered \"@1\"")
 FB_IMPL_MSG_NO_SYMBOL(GBAK, 409, "    @1D(IRECT_IO)          direct IO for backup file(s)")
+FB_IMPL_MSG_NO_SYMBOL(GBAK, 410, "use up to @1 parallel workers")
diff --git a/src/jrd/svc.cpp b/src/jrd/svc.cpp
@@ -701,7 +701,7 @@ Service::Service(const TEXT* service_name, USHORT spb_length, const UCHAR* spb_d
 	svc_username(getPool()), svc_sql_role(getPool()), svc_auth_block(getPool()),
 	svc_expected_db(getPool()), svc_trusted_role(false), svc_utf8(false),
 	svc_switches(getPool()), svc_perm_sw(getPool()), svc_address_path(getPool()),
-	svc_command_line(getPool()),
+	svc_command_line(getPool()), svc_parallel_workers(0),
 	svc_network_protocol(getPool()), svc_remote_address(getPool()), svc_remote_process(getPool()),
 	svc_remote_pid(0), svc_trace_manager(NULL), svc_crypt_callback(crypt_callback),
 	svc_existence(FB_NEW_POOL(*getDefaultMemoryPool()) SvcMutex(this)),
@@ -731,6 +731,8 @@ Service::Service(const TEXT* service_name, USHORT spb_length, const UCHAR* spb_d
 		if (svcname == "@@@")
 			svc_debug = true;
 #endif
+		// Could be overrided in SPB
+		svc_parallel_workers = Config::getParallelWorkers();
 
 		// Process the service parameter block.
 		ClumpletReader spb(ClumpletReader::spbList, spb_data, spb_length, spbVersionError);

diff --git a/src/jrd/svc.h b/src/jrd/svc.h
@@ -146,6 +146,7 @@ class Service : public Firebird::UtilSvc, public TypedHandle<type_svc>
 	virtual bool utf8FileNames();
 	// get database encryption key transfer callback routine
 	virtual Firebird::ICryptKeyCallback* getCryptCallback();
+	virtual int getParallelWorkers() { return svc_parallel_workers; }
 
 	virtual TraceManager* getTraceManager()
 	{
@@ -324,6 +325,7 @@ class Service : public Firebird::UtilSvc, public TypedHandle<type_svc>
 	Firebird::string	svc_perm_sw;	// Switches, taken from services table and/or passed using spb_command_line
 	Firebird::UCharBuffer	svc_address_path;
 	Firebird::string	svc_command_line;
+	int					svc_parallel_workers;
 
 	Firebird::string	svc_network_protocol;
 	Firebird::string	svc_remote_address;