Changeset 1108

Timestamp:

11/30/07 23:25:36 (2 years ago)

Author:

ahu

Message:

first 20% speedup of bind backend, possibly much more in setups with a lot of zones

Location:

trunk/pdns/pdns/backends/bind

Files:

• bindbackend2.cc (modified) (8 diffs)
• bindbackend2.hh (modified) (1 diff)

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -726 +726 @@
 }
 
-bool operator<(const Bind2DNSRecord &a, const string &b)
-{
-  return a.qname < b;
-}
-
-bool operator<(const string &a, const Bind2DNSRecord &b)
-{
-  return a < b.qname;
-}
 
 
@@ -743 +734 @@
   string domain=toLower(qname);
 
-  bool mustlog=::arg().mustDo("query-logging");
+  static bool mustlog=::arg().mustDo("query-logging");
   if(mustlog) 
     L<<Logger::Warning<<"Lookup for '"<<qtype.getName()<<"' of '"<<domain<<"'"<<endl;
@@ -749 +740 @@
   shared_ptr<State> state = s_state;
 
-  while(!state->name_id_map.count(domain) && chopOff(domain));
-
-  name_id_map_t::const_iterator iditer=state->name_id_map.find(domain);
+  name_id_map_t::const_iterator iditer;
+  while((iditer=state->name_id_map.find(domain)) == state->name_id_map.end() && chopOff(domain))
+    ;
+
 
   if(iditer==state->name_id_map.end()) {
@@ -761 +753 @@
   //  unsigned int id=*iditer;
   if(mustlog)
-    L<<Logger::Warning<<"Found data in zone '"<<domain<<"' with id "<<iditer->second<<endl;
+    L<<Logger::Warning<<"Found a zone '"<<domain<<"' (with id " << iditer->second<<") that might contain data "<<endl;
     
   d_handle.id=iditer->second;
@@ -788 +780 @@
   }
 
-  d_handle.d_records = state->id_zone_map[iditer->second].d_records; // give it a reference counted copy
+  d_handle.d_records = bbd.d_records; // give it a reference counted copy
   
   if(d_handle.d_records->empty())
@@ -799 +791 @@
   string lname=toLower(d_handle.qname);
   range=equal_range(d_handle.d_records->begin(), d_handle.d_records->end(), lname);
+  d_handle.mustlog = mustlog;
   
   if(range.first==range.second) {
@@ -807 +800 @@
     d_handle.d_iter=range.first;
     d_handle.d_end_iter=range.second;
-    d_handle.mustlog = mustlog;
   }
 
@@ -820 +812 @@
 bool Bind2Backend::get(DNSResourceRecord &r)
 {
-  if(!d_handle.d_records)
+  if(!d_handle.d_records) {
+    if(d_handle.mustlog)
+      L<<Logger::Warning<<"There were no answers"<<endl;
     return false;
+  }
 
   if(!d_handle.get(r)) {
+    if(d_handle.mustlog)
+      L<<Logger::Warning<<"End of answers"<<endl;
+
     d_handle.reset();
-
-    if(::arg().mustDo("query-logging"))
-      L<<"End of answers"<<endl;
 
     return false;

trunk/pdns/pdns/backends/bind/bindbackend2.hh

@@ -54 +54 @@
     return tie(qtype,content, ttl) < tie(rhs.qtype, rhs.content, rhs.ttl);
   }
+  bool operator<(const string &b) const
+  {
+    return qname < b;
+  }
 };
+
+inline bool operator<(const string &a, const Bind2DNSRecord &b)
+{
+  return a < b.qname;
+}