remove plpgsql code

No longer required, because new postgres "ON CONFLICT" can do the same.

diff --git a/PMG/Cluster.pm b/PMG/Cluster.pm
index 1bdffc01d1f328ec459489b5e1cf733d530beafc..31d9c3360fb5b67463482205d9df639b2b78282b 100644 (file)
--- a/PMG/Cluster.pm
+++ b/PMG/Cluster.pm
@@ -688,9 +688,7 @@ sub sync_greylist_db {
            "mtime >= $lastmt AND CID != 0";
     };
 
-    my $merge_sth = $dbh->prepare(
-       "SELECT merge_greylist(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) AS newcount");
-
+    my $merge_sth = $dbh->prepare($PMG::DBTools::cgreylist_merge_sql);
     my $mergefunc = sub {
        my ($ref) = @_;
 

diff --git a/PMG/DBTools.pm b/PMG/DBTools.pm
index 9c61238a8e60d33b20694ec3f04f54f3b69ab703..e5bca7d47ebec06945cecd45d50d20d5235b9aa0 100644 (file)
--- a/PMG/DBTools.pm
+++ b/PMG/DBTools.pm
@@ -15,6 +15,19 @@ use PMG::RuleDB;
 
 our $default_db_name = "Proxmox_ruledb";
 
+# our $cgreylist_merge_sql = 'SELECT merge_greylist(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) AS newcount';
+our $cgreylist_merge_sql =
+    'INSERT INTO CGREYLIST (IPNet,Host,Sender,Receiver,Instance,RCTime,' .
+    'ExTime,Delay,Blocked,Passed,MTime,CID) ' .
+    'VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ' .
+    'ON CONFLICT (IPNet,Sender,Receiver) DO UPDATE SET ' .
+    'Host = CASE WHEN MTime >= excluded.MTime THEN Host ELSE excluded.Host END,' .
+    'CID = GREATEST(CID, excluded.CID), RCTime = LEAST(RCTime, excluded.RCTime),' .
+    'ExTime = GREATEST(ExTime, excluded.ExTime),' .
+    'Delay = GREATEST(Delay, excluded.Delay),' .
+    'Blocked = GREATEST(Blocked, excluded.Blocked),' .
+    'Passed = GREATEST(Passed, excluded.Passed)';
+
 sub open_ruledb {
     my ($database, $host, $port) = @_;
 
@@ -97,50 +110,6 @@ sub database_list {
     return $database_list;
 }
 
-my $dbfunction_maxint =  <<__EOD;
-    CREATE OR REPLACE FUNCTION maxint (INTEGER, INTEGER) RETURNS INTEGER AS
-    'BEGIN IF \$1 > \$2 THEN RETURN \$1; ELSE RETURN \$2; END IF; END;' LANGUAGE plpgsql;
-__EOD
-
-my $dbfunction_minint =  <<__EOD;
-    CREATE OR REPLACE FUNCTION minint (INTEGER, INTEGER) RETURNS INTEGER AS
-    'BEGIN IF \$1 < \$2 THEN RETURN \$1; ELSE RETURN \$2; END IF; END;' LANGUAGE plpgsql;
-__EOD
-
-# merge function to avoid update/insert race condition
-# see: http://www.postgresql.org/docs/9.1/static/plpgsql-control-structures.html#PLPGSQL-ERROR-TRAPPING
-my $dbfunction_merge_greylist = <<__EOD;
-    CREATE OR REPLACE FUNCTION merge_greylist (in_ipnet VARCHAR, in_host INTEGER, in_sender VARCHAR,
-                                              in_receiver VARCHAR, in_instance VARCHAR,
-                                              in_rctime INTEGER, in_extime INTEGER, in_delay INTEGER,
-                                              in_blocked INTEGER, in_passed INTEGER, in_mtime INTEGER,
-                                              in_cid INTEGER) RETURNS INTEGER AS
-    'BEGIN
-      LOOP
-        UPDATE CGreylist SET Host = CASE WHEN MTime >= in_mtime THEN Host ELSE in_host END,
-                             CID = maxint (CID, in_cid), RCTime = minint (rctime, in_rctime),
-                            ExTime = maxint (extime, in_extime),
-                            Delay = maxint (delay, in_delay),
-                            Blocked = maxint (blocked, in_blocked),
-                            Passed = maxint (passed, in_passed)
-                            WHERE IPNet = in_ipnet AND Sender = in_sender AND Receiver = in_receiver;
-
-        IF found THEN
-          RETURN 0;
-        END IF;
-
-       BEGIN
-         INSERT INTO CGREYLIST (IPNet, Host, Sender, Receiver, Instance, RCTime, ExTime, Delay, Blocked, Passed, MTime, CID)
-             VALUES (in_ipnet, in_host, in_sender, in_receiver, in_instance, in_rctime, in_extime,
-                     in_delay, in_blocked, in_passed, in_mtime, in_cid);
-         RETURN 1;
-         EXCEPTION WHEN unique_violation THEN
-           -- do nothing - continue loop
-       END;
-      END LOOP;
-    END;'  LANGUAGE plpgsql;
-__EOD
-
 my $cgreylist_ctablecmd =  <<__EOD;
     CREATE TABLE CGreylist
     (IPNet VARCHAR(16) NOT NULL,
@@ -368,15 +337,6 @@ sub create_ruledb {
     # make sure 'www-data' can read all tables
     $dbh->do("ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO \"www-data\"");
 
-    #$dbh->do ($dbloaddrivers_sql);
-    #$dbh->do ($dbfunction_update_modtime);
-
-    $dbh->do ($dbfunction_minint);
-
-    $dbh->do ($dbfunction_maxint);
-
-    $dbh->do ($dbfunction_merge_greylist);
-
     $dbh->do (
 <<EOD
              CREATE TABLE Attribut
@@ -710,12 +670,6 @@ sub upgradedb {
 
     my $dbh = $ruledb->{dbh};
 
-    $dbh->do($dbfunction_minint);
-
-    $dbh->do($dbfunction_maxint);
-
-    $dbh->do($dbfunction_merge_greylist);
-
     # make sure we do not use slow sequential scans when upgraing
     # database (before analyze can gather statistics)
     $dbh->do("set enable_seqscan = false");
@@ -1236,7 +1190,7 @@ sub read_int_clusterinfo {
 sub write_maxint_clusterinfo {
     my ($dbh, $rcid, $name, $value) = @_;
 
-    $dbh->do("UPDATE ClusterInfo SET ivalue = maxint (ivalue, ?) " .
+    $dbh->do("UPDATE ClusterInfo SET ivalue = GREATEST(ivalue, ?) " .
             "WHERE cid = ? AND name = ?", undef,
             $value, $rcid, $name);
 }

diff --git a/bin/pmgpolicy b/bin/pmgpolicy
index 22f83328539d2517e884201f0d25c3fdde30e20f..e2acb248c810258a228928464cb74269f4babb50 100755 (executable)
--- a/bin/pmgpolicy
+++ b/bin/pmgpolicy
@@ -578,7 +578,7 @@ sub greylist_value {
 
                    if (!defined($ref->{rctime})) {
 
-                       $dbh->do("SELECT merge_greylist(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", undef,
+                       $dbh->do($PMG::DBTools::cgreylist_merge_sql, undef,
                                 $net, $host, $sender, $rcpt, $instance,
                                 $ctime, $ctime + 10, 0, 100000, 0, $ctime, $self->{lcid});
                    }
@@ -623,9 +623,9 @@ sub greylist_value {
 
        if (!defined($ref->{rctime})) {
 
-           $dbh->do ("SELECT merge_greylist(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", undef,
-                     $net, $host, $sender, $rcpt, $instance,
-                     $ctime, $ctime + $greylist_lifetime, 0, 1, 0, $ctime, $self->{lcid});
+           $dbh->do($PMG::DBTools::cgreylist_merge_sql, undef,
+                    $net, $host, $sender, $rcpt, $instance,
+                    $ctime, $ctime + $greylist_lifetime, 0, 1, 0, $ctime, $self->{lcid});
 
            $res = $defer_res;
            $self->log(3, "defer greylisted mail");