Changeset 2203

Timestamp:

05/29/11 21:19:58 (2 years ago)

Author:

ahu

Message:

latest revision of the mongodb backend

Location:

trunk/pdns/modules/mongodbbackend

Files:

• dnssec.cc (modified) (1 diff)
• minimal.cc (modified) (7 diffs)
• private.cc (modified) (1 diff)

trunk/pdns/modules/mongodbbackend/dnssec.cc

@@ -282 +282 @@
 
     m_db.update(collection_cryptokeys, mongo_q, update );
-
-    if(logging_cerr) 
-        cerr << backend_name << "(removeDomainKey) getLastError: "<< m_db.getLastError()<< endl;
+    
+    string m_error = m_db.getLastError();
+
+    if(logging_cerr && !m_error.empty())
+        cerr << backend_name << "(removeDomainKey) getLastError: "<< m_error << endl;
     
     return true; //?? how do we know that ??

trunk/pdns/modules/mongodbbackend/minimal.cc

@@ -66 +66 @@
             L<<Logger::Error << backend_name << "(Re)creating index... " << endl;
 
+
             m_db.ensureIndex(collection_domains , BSON( "domain_id" << 1), true, "domain_id", true); //, true);
+            L<<Logger::Error << backend_name << "Index: domains: 'domain_id' done." << endl;
+
             m_db.ensureIndex(collection_domains , BSON( "name" << 1), true, "name", true); //, true);
+            L<<Logger::Error << backend_name << "Index: domains: 'name' done." << endl;
+
             m_db.ensureIndex(collection_domains , BSON( "type" << 1), false, "type", true); //, true);
-            m_db.ensureIndex(collection_domains , BSON( "account" << 1), false, "type", true); //, true);
+            L<<Logger::Error << backend_name << "Index: domains: 'type' done." << endl;
+
+            m_db.ensureIndex(collection_domains , BSON( "account" << 1), false, "account", true); //, true);
+            L<<Logger::Error << backend_name << "Index: domains: 'account' done." << endl;
+
 
             m_db.ensureIndex(collection_records, BSON( "domain_id" << 1), false, "domain_id", true); //, true);
+            L<<Logger::Error << backend_name << "Index: records: 'domain_id' done." << endl;
+            
             m_db.ensureIndex(collection_records, BSON( "name" << 1), false, "name", true); //, true);
+            L<<Logger::Error << backend_name << "Index: records: 'name' done." << endl;
+
             m_db.ensureIndex(collection_records, BSON( "name" << 1 << "type" << 1), true, "name_type", true); //, true);
+            L<<Logger::Error << backend_name << "Index: records: 'name_type' done." << endl;
+
             m_db.ensureIndex(collection_records, BSON( "domain_id" << 1 << "auth" << 1 << "ordername" << -1), false, "domainid_auth_ordername_desc", true); //, true);
+            L<<Logger::Error << backend_name << "Index: records: 'domainid_auth_ordername_desc' done." << endl;
+
             m_db.ensureIndex(collection_records, BSON( "domain_id" << 1 << "auth" << 1 << "ordername" << 1), false, "domainid_auth_ordername_asc", true); //, true);
+            L<<Logger::Error << backend_name << "Index: records: 'domainid_auth_ordername_asc' done." << endl;
+
             m_db.ensureIndex(collection_records, BSON( "domain_id" << 1 << "name" << 1 ), false, "domainid_name", true); //, true);
+            L<<Logger::Error << backend_name << "Index: records: 'domainid_name' done." << endl;
+
 
             m_db.ensureIndex(collection_domainmetadata, BSON( "name" << 1 ), true, "name", true); //, true);
+            L<<Logger::Error << backend_name << "Index: domainmetadata: 'name' done." << endl;
+
             m_db.ensureIndex(collection_domainmetadata, BSON( "name" << 1 << "content.kind" << 1), true, "name_kind", true); //, true);
+            L<<Logger::Error << backend_name << "Index: domainmetadata: 'name_kind' done." << endl;
+
 
             m_db.ensureIndex(collection_cryptokeys, BSON( "domain_id" << 1 ), true, "domain_id", true); //, true);
+            L<<Logger::Error << backend_name << "Index: cryptokeys: 'domain_id' done." << endl;
+
             m_db.ensureIndex(collection_cryptokeys, BSON( "name" << 1 ), true, "name", true); //, true);
+            L<<Logger::Error << backend_name << "Index: cryptokeys: 'name'  done." << endl;
+
             m_db.ensureIndex(collection_cryptokeys, BSON( "name" << 1 << "domain_id" << 1), true, "name_domainid", true); //, true);
+            L<<Logger::Error << backend_name << "Index: cryptokeys: 'name_domainid'  done." << endl;
+
             m_db.ensureIndex(collection_cryptokeys, BSON( "domain_id" << 1 << "content.id" << 1), true, "domainid_id", true); //, true);
+            L<<Logger::Error << backend_name << "Index: cryptokeys: 'domainid_id'  done." << endl;
+
             m_db.ensureIndex(collection_cryptokeys, BSON( "name" << 1 << "content.id" << 1), true, "name_id", true); //, true);
+            L<<Logger::Error << backend_name << "Index: cryptokeys: 'name_id'  done." << endl;
+
 
             m_db.ensureIndex(collection_tsigkeys, BSON( "name" << 1 << "content.algorithm" << 1), true, "name_algo", true); //, true);
+            L<<Logger::Error << backend_name << "Index: tsigkeys: 'name_algo' done." << endl;
+
+
+            L<<Logger::Error << backend_name << "(Re)creating index... DONE!" << endl;
 
         }
@@ -102 +141 @@
   
 MONGODBBackend::~MONGODBBackend() {
-//      delete m_db;
+//    delete m_db;
     L<<Logger::Info<<backend_name<<"Disconnected!" << endl;
 }
@@ -128 +167 @@
     
     mongo_query = q_type == "ANY" ? QUERY( "name" << toLower(qname) ) : QUERY( "name" << toLower(qname) << "type" << q_type);
+    mongo_query.hint(q_type == "ANY" ? BSON("name" << 1) : BSON("name" << 1 << "type" << 1));
         
     elements = false;
@@ -136 +176 @@
         
     cursor = m_db.query(collection_records, mongo_query);
-        
+    
 }
 
@@ -253 +293 @@
             }
         
-//              if (contents)
-//                      delete contents;
+//          if (contents)
+//              delete []contents;
 
             contents = new mongo::BSONObjIterator(mongo_record.getObjectField("content"));
@@ -265 +305 @@
         }
     } 
-        
+
     return !rr.content.empty() ;
 }
@@ -273 +313 @@
     
     DomainInfo DI;
-
+    
     return getDomainInfo(name, DI, &soadata);
 }

trunk/pdns/modules/mongodbbackend/private.cc

@@ -29 +29 @@
         di->id = mongo_r->getIntField("domain_id");
         di->last_check = mongo_r->getIntField("last_check");
+        di->notified_serial = mongo_r->getIntField("notified_serial");
 
         if (soadata == NULL)