[svn] commit: r836 - in /branches/each-ds/src/lib/auth/cpp: data_source.cc data_source.h data_source_sqlite3.cc data_source_static.cc

[BIND 10 source code commits]

Author: mgraff
Date: Tue Feb 16 11:08:39 2010
New Revision: 836

Log:
checkpoint; use rrsetlist.  This breaks the upper level datasource currently.

Modified:
    branches/each-ds/src/lib/auth/cpp/data_source.cc
    branches/each-ds/src/lib/auth/cpp/data_source.h
    branches/each-ds/src/lib/auth/cpp/data_source_sqlite3.cc
    branches/each-ds/src/lib/auth/cpp/data_source_static.cc

Modified: branches/each-ds/src/lib/auth/cpp/data_source.cc
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/data_source.cc (original)
+++ branches/each-ds/src/lib/auth/cpp/data_source.cc Tue Feb 16 11:08:39 2010
@@ -110,6 +110,8 @@
     case QueryTask::REF_QUERY:
         return (ds->findReferral(q, task.qname, task.qclass, target, sigs));
     }
+
+    // XXX what to return if none of these works?  Throw an exception?
 }
 
 //

Modified: branches/each-ds/src/lib/auth/cpp/data_source.h
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/data_source.h (original)
+++ branches/each-ds/src/lib/auth/cpp/data_source.h Tue Feb 16 11:08:39 2010
@@ -20,6 +20,7 @@
 #include <boost/foreach.hpp>
 #include <dns/name.h>
 #include <dns/rrset.h>
+#include <dns/rrsetlist.h>
 #include <auth/query.h>
 #include <iostream>
 
@@ -30,8 +31,6 @@
 
 class DataSrc;
 class NameMatch;
-
-typedef std::vector<RRsetPtr> RRsetList;
 
 class AbstractDataSrc {
 public:

Modified: branches/each-ds/src/lib/auth/cpp/data_source_sqlite3.cc
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/data_source_sqlite3.cc (original)
+++ branches/each-ds/src/lib/auth/cpp/data_source_sqlite3.cc Tue Feb 16 11:08:39 2010
@@ -3,6 +3,7 @@
 #include <dns/rrttl.h>
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
+#include <dns/rrsetlist.h>
 
 #include <iostream>
 
@@ -155,7 +156,7 @@
 
     if (rows > 0) {
         rrset->setTTL(RRTTL(target_ttl));
-        target.push_back(rrset);
+        target.addRRset(rrset);
         node_exists = true;
         return (rows);
     }

Modified: branches/each-ds/src/lib/auth/cpp/data_source_static.cc
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/data_source_static.cc (original)
+++ branches/each-ds/src/lib/auth/cpp/data_source_static.cc Tue Feb 16 11:08:39 2010
@@ -78,21 +78,21 @@
 {
     if (qname == version_name &&
         qclass == version->getClass() && qtype == version->getType()) {
-        target.push_back(version);
+        target.addRRset(version);
         return (SUCCESS);
     } else if (qname == version_name &&
                qclass == version_ns->getClass() &&
                qtype == version_ns->getType()) {
-        target.push_back(version_ns);
+        target.addRRset(version_ns);
         return (SUCCESS);
     } else if (qname == authors_name &&
                qclass == authors->getClass() && qtype == authors->getType()) {
-        target.push_back(authors);
+        target.addRRset(authors);
         return (SUCCESS);
     } else if (qname == authors_name &&
                qclass == authors_ns->getClass() &&
                qtype == authors_ns->getType()) {
-        target.push_back(authors_ns);
+        target.addRRset(authors_ns);
         return (SUCCESS);
     }