From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 14 Dec 2012 16:13:29 +0000 (+0100)
Subject: Allow for multiple inserts in one transaction.
X-Git-Tag: release_2_2_1~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=825f728c59d964fc456ae23d2a66dd131b777893;p=thirdparty%2Ffreeradius-server.git

Allow for multiple inserts in one transaction.

Patch from Uwe Meyer-Gruhl
---

diff --git a/scripts/radsqlrelay b/scripts/radsqlrelay
index 92868eda8c5..3a1efa9971c 100755
--- a/scripts/radsqlrelay
+++ b/scripts/radsqlrelay
@@ -35,6 +35,11 @@ use POSIX qw(:unistd_h :errno_h);
 use warnings;
 use strict;
 
+my $maxcollect = 100;    # tunable, works for MySQL!
+
+my $lastinsert;
+my @values;
+
 my $need_exit = 0;
 
 sub got_signal()
@@ -96,10 +101,37 @@ sub connect_wait($)
     $dbinfo->{handle} = $dbh;
 }
 
+
+
 sub process_file($$)
 {
     my ($dbinfo, $path) = @_;
 
+    sub do_inserts($) {
+        my $dbinfo = shift;
+        if (scalar(@values) > 0) {
+            my $query = $lastinsert . " ";
+            $query .= join(" ), ( ",@values);
+            $query .= " );";
+            do_query($dbinfo,$query);
+        }
+        @values = ();
+    }
+
+    sub do_query($$) {
+        my ($dbinfo,$query) = @_;
+        until ($dbinfo->{handle}->do($query)) {
+            print $dbinfo->{handle}->errstr."\n";
+            if ($dbinfo->{handle}->ping) {
+		sleep (1);
+            } else {
+		print "error: Lost connection to database\n";
+		$dbinfo->{handle}->disconnect;
+		connect_wait($dbinfo);
+            }
+        }
+    }
+
     unless (-e $path.'.work') {
 	until (rename($path, $path.'.work')) {
 	    if ($! == ENOENT) {
@@ -115,20 +147,46 @@ sub process_file($$)
     open(FILE, "+< $path.work") or die "error: Couldn't open $path.work: $!\n";
     setlock(\*FILE) or die "error: Couldn't lock $path.work: $!\n";
 
+    $lastinsert = "";
+    @values = ();
+
     while (<FILE>) {
-	chomp(my $query = $_);
-	until ($dbinfo->{handle}->do($query)) {
-	    print $dbinfo->{handle}->errstr."\n";
-	    if ($dbinfo->{handle}->ping) {
-		sleep (1);
-	    } else {
-		print "error: Lost connection to database\n";
-		$dbinfo->{handle}->disconnect;
-		connect_wait($dbinfo);
+        chomp (my $line = $_);
+
+        if (!($line =~ /^\s*insert\s+into\s+`?\w+`?\s+(?:\(.*?\)\s+)?
+                            values\s*\(.*\)\s*;\s*$/ix)) {
+            # This is no INSERT, so start new collection
+            do_inserts($dbinfo);
+            $lastinsert = "";
+            # must output this line
+            do_query($dbinfo, "$line");
+
+	} else {
+            # This is an INSERT, so collect it
+            my $insert = $line;
+            my $values = $line;
+            $insert =~ s/^\s*(insert\s+into\s+`?\w+`?\s+(?:\(.*?\)\s+)?
+                              values\s*\().*\)\s*;\s*$/$1/ix;
+            $values =~ s/^\s*insert\s+into\s+`?\w+`?\s+(?:\(.*?\)\s+)?
+                             values\s*\((.*)\)\s*;\s*$/$1/ix;
+
+            if (($lastinsert ne "") && ($insert ne $lastinsert)) {
+                # This is different from the last one
+                do_inserts($dbinfo);
 	    }
+            push(@values, $values);
+            $lastinsert = $insert; # start new collection
 	}
+
+        # limit to $maxcollect collected lines
+        if (scalar(@values) >= $maxcollect) {
+            do_inserts($dbinfo);
+        }
     }
 
+    # Cleanup
+    do_inserts($dbinfo);
+
     unlink($path.'.work');
     close(FILE); # and unlock
 }
@@ -159,6 +217,8 @@ if (lc($args{d}) eq 'mysql') {
     $data_source = "DBI:Pg:dbname=$args{b};host=$args{h}";
 } elsif (lc($args{d}) eq 'oracle') {
     $data_source = "DBI:Oracle:$args{b}";
+    # Oracle does not conform to the SQL standard for multirow INSERTs
+    $maxcollect = 1;
 } else {
     print STDERR "error: SQL driver not supported yet: $args{d}\n";
     exit 1;
@@ -195,3 +255,4 @@ until ($need_exit) {
 }
 
 $dbinfo{handle}->disconnect;
+