You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/05/06 15:03:13 UTC

svn commit: r1900630 - in /spamassassin/trunk: lib/Mail/SpamAssassin/BayesStore/MySQL.pm sql/bayes_mysql.sql

Author: hege
Date: Fri May  6 15:03:13 2022
New Revision: 1900630

URL: http://svn.apache.org/viewvc?rev=1900630&view=rev
Log:
Use primary key for MySQL bayes_expire to make it potentially Galera compatible

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
    spamassassin/trunk/sql/bayes_mysql.sql

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm?rev=1900630&r1=1900629&r2=1900630&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm Fri May  6 15:03:13 2022
@@ -295,7 +295,8 @@ sub set_running_expire_tok {
 
   return 0 unless (defined($self->{_dbh}));
 
-  my $sql = "INSERT INTO bayes_expire (id,runtime) VALUES (?,?)";
+  my $sql = "INSERT INTO bayes_expire (id,runtime) VALUES (?,?)
+             ON DUPLICATE KEY UPDATE runtime=VALUES(runtime)";
 
   my $time = time();
 

Modified: spamassassin/trunk/sql/bayes_mysql.sql
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sql/bayes_mysql.sql?rev=1900630&r1=1900629&r2=1900630&view=diff
==============================================================================
--- spamassassin/trunk/sql/bayes_mysql.sql (original)
+++ spamassassin/trunk/sql/bayes_mysql.sql Fri May  6 15:03:13 2022
@@ -2,7 +2,7 @@
 CREATE TABLE bayes_expire (
   id int(11) NOT NULL default '0',
   runtime int(11) NOT NULL default '0',
-  KEY bayes_expire_idx1 (id)
+  PRIMARY KEY  (id)
 ) ENGINE=InnoDB;
 
 CREATE TABLE bayes_global_vars (