You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2018/10/21 12:10:40 UTC
svn commit: r1844485 - in /spamassassin: branches/3.4/UPGRADE
branches/3.4/sql/awl_mysql.sql branches/3.4/sql/awl_pg.sql trunk/UPGRADE
trunk/sql/awl_mysql.sql trunk/sql/awl_pg.sql
Author: gbechis
Date: Sun Oct 21 12:10:40 2018
New Revision: 1844485
URL: http://svn.apache.org/viewvc?rev=1844485&view=rev
Log:
Add last_hit to awl table as well
bz #7631
Modified:
spamassassin/branches/3.4/UPGRADE
spamassassin/branches/3.4/sql/awl_mysql.sql
spamassassin/branches/3.4/sql/awl_pg.sql
spamassassin/trunk/UPGRADE
spamassassin/trunk/sql/awl_mysql.sql
spamassassin/trunk/sql/awl_pg.sql
Modified: spamassassin/branches/3.4/UPGRADE
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/UPGRADE?rev=1844485&r1=1844484&r2=1844485&view=diff
==============================================================================
--- spamassassin/branches/3.4/UPGRADE (original)
+++ spamassassin/branches/3.4/UPGRADE Sun Oct 21 12:10:40 2018
@@ -7,9 +7,11 @@ Note for Users Upgrading to SpamAssassin
MySQL:
"ALTER TABLE `txrep` CHANGE `count` `msgcount` INT(11) NOT NULL DEFAULT '0';"
"ALTER TABLE `awl` CHANGE `count` `msgcount` INT(11) NOT NULL DEFAULT '0';"
+ "ALTER TABLE `awl` ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;"
PostgreSQL:
"ALTER TABLE txrep RENAME COLUMN count TO msgcount;"
"ALTER TABLE awl RENAME COLUMN count TO msgcount;"
+ "ALTER TABLE awl ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP;"
- ALL pseudo-header now returns decoded headers, so it's usage is consistent
with single header matching (:raw returns undecoded and folded like before).
Modified: spamassassin/branches/3.4/sql/awl_mysql.sql
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sql/awl_mysql.sql?rev=1844485&r1=1844484&r2=1844485&view=diff
==============================================================================
--- spamassassin/branches/3.4/sql/awl_mysql.sql (original)
+++ spamassassin/branches/3.4/sql/awl_mysql.sql Sun Oct 21 12:10:40 2018
@@ -5,5 +5,6 @@ CREATE TABLE awl (
msgcount int(11) NOT NULL default '0',
totscore float NOT NULL default '0',
signedby varchar(255) NOT NULL default '',
+ last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (username,email,signedby,ip)
) ENGINE=InnoDB;
Modified: spamassassin/branches/3.4/sql/awl_pg.sql
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sql/awl_pg.sql?rev=1844485&r1=1844484&r2=1844485&view=diff
==============================================================================
--- spamassassin/branches/3.4/sql/awl_pg.sql (original)
+++ spamassassin/branches/3.4/sql/awl_pg.sql Sun Oct 21 12:10:40 2018
@@ -5,8 +5,22 @@ CREATE TABLE awl (
msgcount bigint NOT NULL default '0',
totscore float NOT NULL default '0',
signedby varchar(255) NOT NULL default '',
+ last_hit timestamp NOT NULL default CURRENT_TIMESTAMP,
PRIMARY KEY (username,email,signedby,ip)
);
-ALTER TABLE awl SET (fillfactor=95);
+create index awl_last_hit on awl (last_hit);
+
+create OR REPLACE function update_awl_last_hit()
+RETURNS TRIGGER AS $$
+BEGIN
+ NEW.last_hit = CURRENT_TIMESTAMP;
+ RETURN NEW;
+END;
+$$ language 'plpgsql';
+create TRIGGER update_awl_update_last_hit BEFORE UPDATE
+ON awl FOR EACH ROW EXECUTE PROCEDURE
+update_awl_last_hit();
+
+ALTER TABLE awl SET (fillfactor=95);
Modified: spamassassin/trunk/UPGRADE
URL: http://svn.apache.org/viewvc/spamassassin/trunk/UPGRADE?rev=1844485&r1=1844484&r2=1844485&view=diff
==============================================================================
--- spamassassin/trunk/UPGRADE (original)
+++ spamassassin/trunk/UPGRADE Sun Oct 21 12:10:40 2018
@@ -8,9 +8,11 @@ Note for Users Upgrading to SpamAssassin
MySQL:
"ALTER TABLE `txrep` CHANGE `count` `msgcount` INT(11) NOT NULL DEFAULT '0';"
"ALTER TABLE `awl` CHANGE `count` `msgcount` INT(11) NOT NULL DEFAULT '0';"
+ "ALTER TABLE `awl` ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;"
PostgreSQL:
"ALTER TABLE txrep RENAME COLUMN count TO msgcount;"
"ALTER TABLE awl RENAME COLUMN count TO msgcount;"
+ "ALTER TABLE awl ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP;"
- URILocalBL: uri_block_cc/uri_block_cont support negation (Bug 7528)
Modified: spamassassin/trunk/sql/awl_mysql.sql
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sql/awl_mysql.sql?rev=1844485&r1=1844484&r2=1844485&view=diff
==============================================================================
--- spamassassin/trunk/sql/awl_mysql.sql (original)
+++ spamassassin/trunk/sql/awl_mysql.sql Sun Oct 21 12:10:40 2018
@@ -5,5 +5,6 @@ CREATE TABLE awl (
msgcount int(11) NOT NULL default '0',
totscore float NOT NULL default '0',
signedby varchar(255) NOT NULL default '',
+ last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (username,email,signedby,ip)
) ENGINE=InnoDB;
Modified: spamassassin/trunk/sql/awl_pg.sql
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sql/awl_pg.sql?rev=1844485&r1=1844484&r2=1844485&view=diff
==============================================================================
--- spamassassin/trunk/sql/awl_pg.sql (original)
+++ spamassassin/trunk/sql/awl_pg.sql Sun Oct 21 12:10:40 2018
@@ -5,8 +5,22 @@ CREATE TABLE awl (
msgcount bigint NOT NULL default '0',
totscore float NOT NULL default '0',
signedby varchar(255) NOT NULL default '',
+ last_hit timestamp NOT NULL default CURRENT_TIMESTAMP,
PRIMARY KEY (username,email,signedby,ip)
);
-ALTER TABLE awl SET (fillfactor=95);
+create index awl_last_hit on awl (last_hit);
+
+create OR REPLACE function update_awl_last_hit()
+RETURNS TRIGGER AS $$
+BEGIN
+ NEW.last_hit = CURRENT_TIMESTAMP;
+ RETURN NEW;
+END;
+$$ language 'plpgsql';
+create TRIGGER update_awl_update_last_hit BEFORE UPDATE
+ON awl FOR EACH ROW EXECUTE PROCEDURE
+update_awl_last_hit();
+
+ALTER TABLE awl SET (fillfactor=95);