Changeset 462 for trunk

Timestamp:

02/27/13 17:20:18 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

RPC tweaks and fixes.

• Add config-loader line to check for RPC mode (XMLRPC, HTTP, or socket)
• Speedup in getRevPattern by limiting the records to be cast as inet to the zone(s) the requested CIDR is in

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1304 +1304 @@
           push @{$config{rpcacl}{$rpcsys}}, @ips;
         }
+        $config{rpcmode} = $1 if /^rpc_mode\s*=\s*(socket|HTTP|XMLRPC)\s*$/i;
       }
     }
@@ -3990 +3991 @@
   my $group = shift || 1;       # just in case
 
-  my ($revpatt) = $dbh->selectrow_array("SELECT r.host FROM records r JOIN revzones z ON r.rdns_id=z.rdns_id ".
-        "WHERE (r.type in (12,65280,65281,65282,65283,65284)) AND z.group_id=? AND CAST (r.val AS inet) >>= ? ".
-        "ORDER BY CAST (r.val AS inet) DESC LIMIT 1", undef, ($group, $cidr) );
+  # for speed!  Casting and comparing even ~7K records takes ~2.5s, so narrow it down to one revzone first.
+  my ($revid) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >>= ? AND group_id = ?",
+        undef, ($cidr, $group) );
+
+##fixme?  may need to narrow things down more by octet-chopping and doing text comparisons before casting.
+  my ($revpatt) = $dbh->selectrow_array("SELECT host FROM records ".
+        "WHERE (type in (12,65280,65281,65282,65283,65284)) AND rdns_id = ? AND CAST (val AS inet) >>= ? ".
+        "ORDER BY CAST (val AS inet) DESC LIMIT 1", undef, ($revid, $cidr) );
   return $revpatt;
 } # end getRevPattern()