CRM-17626 Move BULK_MAIL_INSERT_COUNT

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 335a3fd50c03e8d7c324987d98f7b35e9a919afb..2f268a5265ff7bb26bfc0f7e6dbda4dbce9d2505 100644 (file)
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -54,10 +54,6 @@ class CRM_Core_DAO extends DB_DataObject {
     VALUE_SEPARATOR = "\ 1",
     BULK_INSERT_COUNT = 200,
     BULK_INSERT_HIGH_COUNT = 200,
-    // special value for mail bulk inserts to avoid
-    // potential duplication, assuming a smaller number reduces number of queries
-    // by some factor, so some tradeoff. CRM-8678
-    BULK_MAIL_INSERT_COUNT = 10,
     QUERY_FORMAT_WILDCARD = 1,
     QUERY_FORMAT_NO_QUOTES = 2;
 

diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php
index 998e046a61f43107a7696fe4b598846ee1e26798..9a9bf55e118ff25293e01d889456a5e7d5edd519 100644 (file)
--- a/CRM/Mailing/BAO/MailingJob.php
+++ b/CRM/Mailing/BAO/MailingJob.php
@@ -454,7 +454,7 @@ VALUES (%1, %2, %3, %4, %5, %6, %7)
           $recipients->phone_id,
         );
         $count++;
-        if ($count % CRM_Core_DAO::BULK_MAIL_INSERT_COUNT == 0) {
+        if ($count % CRM_Mailing_Config::BULK_MAIL_INSERT_COUNT == 0) {
           CRM_Mailing_Event_BAO_Queue::bulkCreate($params, $now);
           $count = 0;
           $params = array();
@@ -757,7 +757,7 @@ VALUES (%1, %2, %3, %4, %5, %6, %7)
         $targetParams[] = $field['contact_id'];
 
         $count++;
-        if ($count % CRM_Core_DAO::BULK_MAIL_INSERT_COUNT == 0) {
+        if ($count % CRM_Mailing_Config::BULK_MAIL_INSERT_COUNT == 0) {
           $this->writeToDB(
             $deliveredParams,
             $targetParams,

diff --git a/CRM/Mailing/Config.php b/CRM/Mailing/Config.php
index 26c6a2ecf785bced9625b441470d2a64337b6913..191a37740eefaf37337905b00c776666386c754f 100644 (file)
--- a/CRM/Mailing/Config.php
+++ b/CRM/Mailing/Config.php
@@ -39,4 +39,9 @@ class CRM_Mailing_Config {
   const OUTBOUND_OPTION_MOCK = 4; // seems to be the same as 2, but also calls Mail's pre/post hooks? - see packages/Mail
   const OUTBOUND_OPTION_REDIRECT_TO_DB = 5;
 
+  // special value for mail bulk inserts to avoid
+  // potential duplication, assuming a smaller number reduces number of queries
+  // by some factor, so some tradeoff. CRM-8678
+  const BULK_MAIL_INSERT_COUNT = 10;
+
 }