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/02 14:21:38 UTC
svn commit: r1900479 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm sql/decodeshorturl_mysql.sql sql/decodeshorturl_pg.sql
Author: hege
Date: Mon May 2 14:21:38 2022
New Revision: 1900479
URL: http://svn.apache.org/viewvc?rev=1900479&view=rev
Log:
Revert back to unix timestamps (int)
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm
spamassassin/trunk/sql/decodeshorturl_mysql.sql
spamassassin/trunk/sql/decodeshorturl_pg.sql
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm?rev=1900479&r1=1900478&r2=1900479&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm Mon May 2 14:21:38 2022
@@ -372,8 +372,8 @@ sub initialise_url_shortener_cache {
short_url TEXT PRIMARY KEY NOT NULL,
decoded_url TEXT NOT NULL,
hits INTEGER NOT NULL DEFAULT 1,
- created INTEGER NOT NULL DEFAULT (strftime('%s','now')),
- modified INTEGER NOT NULL DEFAULT (strftime('%s','now'))
+ created INTEGER NOT NULL,
+ modified INTEGER NOT NULL
)
");
# Maintaining index for cleaning is likely more expensive than occasional full table scan
@@ -382,8 +382,8 @@ sub initialise_url_shortener_cache {
# ON short_url_cache(modified)
#");
$self->{sth_insert} = $self->{dbh}->prepare("
- INSERT INTO short_url_cache (short_url, decoded_url, modified)
- VALUES (?,?,strftime('%s','now'))
+ INSERT INTO short_url_cache (short_url, decoded_url, created, modified)
+ VALUES (?,?,strftime('%s','now'),strftime('%s','now'))
ON CONFLICT(short_url) DO UPDATE
SET decoded_url = excluded.decoded_url,
modified = excluded.modified,
@@ -422,8 +422,8 @@ sub initialise_url_shortener_cache {
{RaiseError => 1, PrintError => 0, InactiveDestroy => 1, AutoCommit => 1}
);
$self->{sth_insert} = $self->{dbh}->prepare("
- INSERT INTO short_url_cache (short_url, decoded_url, modified)
- VALUES (?,?,NOW())
+ INSERT INTO short_url_cache (short_url, decoded_url, created, modified)
+ VALUES (?,?,UNIX_TIMESTAMP(),UNIX_TIMESTAMP())
ON DUPLICATE KEY UPDATE
decoded_url = VALUES(decoded_url),
modified = VALUES(modified),
@@ -431,11 +431,11 @@ sub initialise_url_shortener_cache {
");
$self->{sth_select} = $self->{dbh}->prepare("
SELECT decoded_url FROM short_url_cache
- WHERE short_url = ? AND modified >= DATE_SUB(NOW(), INTERVAL $conf->{url_shortener_cache_ttl} SECOND)
+ WHERE short_url = ? AND modified >= UNIX_TIMESTAMP() - $conf->{url_shortener_cache_ttl}
");
$self->{sth_delete} = $self->{dbh}->prepare("
DELETE FROM short_url_cache
- WHERE modified < DATE_SUB(NOW(), INTERVAL $conf->{url_shortener_cache_ttl} SECOND)
+ WHERE modified < UNIX_TIMESTAMP() - $conf->{url_shortener_cache_ttl}
");
};
if ($@) {
@@ -462,8 +462,8 @@ sub initialise_url_shortener_cache {
{RaiseError => 1, PrintError => 0, InactiveDestroy => 1, AutoCommit => 1}
);
$self->{sth_insert} = $self->{dbh}->prepare("
- INSERT INTO short_url_cache (short_url, decoded_url, modified)
- VALUES (?,?,NOW())
+ INSERT INTO short_url_cache (short_url, decoded_url, created, modified)
+ VALUES (?,?,CAST(EXTRACT(epoch FROM NOW()) AS INT),CAST(EXTRACT(epoch FROM NOW()) AS INT))
ON CONFLICT (short_url) DO UPDATE SET
decoded_url = EXCLUDED.decoded_url,
modified = EXCLUDED.modified,
@@ -471,11 +471,11 @@ sub initialise_url_shortener_cache {
");
$self->{sth_select} = $self->{dbh}->prepare("
SELECT decoded_url FROM short_url_cache
- WHERE short_url = ? AND modified >= NOW() - INTERVAL '$conf->{url_shortener_cache_ttl} SECONDS'
+ WHERE short_url = ? AND modified >= CAST(EXTRACT(epoch FROM NOW()) AS INT) - $conf->{url_shortener_cache_ttl}
");
$self->{sth_delete} = $self->{dbh}->prepare("
DELETE FROM short_url_cache
- WHERE modified < NOW() - INTERVAL '$conf->{url_shortener_cache_ttl} SECONDS'
+ WHERE modified < CAST(EXTRACT(epoch FROM NOW()) AS INT) - $conf->{url_shortener_cache_ttl}
");
};
if ($@) {
Modified: spamassassin/trunk/sql/decodeshorturl_mysql.sql
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sql/decodeshorturl_mysql.sql?rev=1900479&r1=1900478&r2=1900479&view=diff
==============================================================================
--- spamassassin/trunk/sql/decodeshorturl_mysql.sql (original)
+++ spamassassin/trunk/sql/decodeshorturl_mysql.sql Mon May 2 14:21:38 2022
@@ -2,8 +2,8 @@ CREATE TABLE `short_url_cache`
( `short_url` VARCHAR(256) NOT NULL,
`decoded_url` VARCHAR(512) NOT NULL,
`hits` INT NOT NULL DEFAULT 1,
- `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `created` INT(11) NOT NULL,
+ `modified` INT(11) NOT NULL,
PRIMARY KEY (`short_url`)
) ENGINE = InnoDB;
-- Maintaining index for cleaning is likely more expensive than occasional full table scan
Modified: spamassassin/trunk/sql/decodeshorturl_pg.sql
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sql/decodeshorturl_pg.sql?rev=1900479&r1=1900478&r2=1900479&view=diff
==============================================================================
--- spamassassin/trunk/sql/decodeshorturl_pg.sql (original)
+++ spamassassin/trunk/sql/decodeshorturl_pg.sql Mon May 2 14:21:38 2022
@@ -2,8 +2,8 @@ CREATE TABLE short_url_cache (
short_url VARCHAR(256) NOT NULL,
decoded_url VARCHAR(512) NOT NULL,
hits INT NOT NULL DEFAULT 1,
- created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- modified TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ created INT NOT NULL,
+ modified INT NOT NULL,
PRIMARY KEY (short_url)
);
-- Maintaining index for cleaning is likely more expensive than occasional full table scan