[svn] commit: r2229 - in /branches/trac192/src/lib/datasrc: ./ tests/

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Jun 23 07:08:52 UTC 2010


Author: each
Date: Wed Jun 23 07:08:52 2010
New Revision: 2229

Log:
Refactor: Change all instances of NameMatch to the clearer name ZoneInfo.

Modified:
    branches/trac192/src/lib/datasrc/cache.cc
    branches/trac192/src/lib/datasrc/data_source.cc
    branches/trac192/src/lib/datasrc/data_source.h
    branches/trac192/src/lib/datasrc/sqlite3_datasrc.cc
    branches/trac192/src/lib/datasrc/sqlite3_datasrc.h
    branches/trac192/src/lib/datasrc/static_datasrc.cc
    branches/trac192/src/lib/datasrc/static_datasrc.h
    branches/trac192/src/lib/datasrc/tests/datasrc_unittest.cc
    branches/trac192/src/lib/datasrc/tests/sqlite3_unittest.cc
    branches/trac192/src/lib/datasrc/tests/static_unittest.cc
    branches/trac192/src/lib/datasrc/tests/test_datasrc.cc
    branches/trac192/src/lib/datasrc/tests/test_datasrc.h

Modified: branches/trac192/src/lib/datasrc/cache.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/cache.cc (original)
+++ branches/trac192/src/lib/datasrc/cache.cc Wed Jun 23 07:08:52 2010
@@ -199,78 +199,6 @@
     return (now < expiry);
 }
 
-// HotCache constructor
-HotCache::HotCache(const int slots) {
-    impl_ = new HotCacheImpl(slots);
-}
-
-// HotCache destructor
-HotCache::~HotCache() {
-    delete impl_;
-}
-
-void
-HotCache::cache(RRsetPtr rrset, const uint32_t flags, const time_t interval) {
-    impl_->insert(CacheNodePtr(new CacheNode(rrset, flags, interval)));
-}
-
-void
-HotCache::ncache(const Name& name, const RRClass &rrclass,
-                 const RRType& rrtype, const uint32_t flags,
-                 const time_t interval)
-{
-    if (rrtype == RRType::ANY() || rrclass == RRClass::ANY()) {
-        return;
-    }
-
-    impl_->insert(CacheNodePtr(new CacheNode(name, rrclass, rrtype,
-                                             flags, interval)));
-}
-
-bool
-HotCache::retrieve(const Name& n, const RRClass& c, const RRType& t,
-                   RRsetPtr& rrset, uint32_t& flags)
-{
-    std::map<Question, CacheNodePtr>::const_iterator iter;
-    iter = impl_->map_.find(Question(n, c, t));
-    if (iter == impl_->map_.end()) {
-        return (false);
-    }
-
-    CacheNodePtr node = iter->second;
-
-    if (node->isValid()) {
-        impl_->promote(node);
-        rrset = node->getRRset();
-        flags = node->getFlags();
-        return (true);
-    }
-
-    impl_->remove(node);
-    return (false);
-}
-
-void
-HotCache::setSlots(const int slots) {
-    impl_->slots_ = slots;
-
-    while (impl_->slots_ != 0 && impl_->count_ > impl_->slots_ &&
-           impl_->lru_tail_)
-    {
-        impl_->remove(impl_->lru_tail_);
-    }
-}
-
-int
-HotCache::getSlots() const {
-    return (impl_->slots_);
-}
-
-int
-HotCache::getCount() const {
-    return (impl_->count_);
-}
-
 // HotCacheImpl constructor
 HotCacheImpl::HotCacheImpl(const int slots) : slots_(slots), count_(0) {}
 
@@ -368,5 +296,77 @@
     --count_;
 }
 
-}
-}
+// HotCache constructor
+HotCache::HotCache(const int slots) {
+    impl_ = new HotCacheImpl(slots);
+}
+
+// HotCache destructor
+HotCache::~HotCache() {
+    delete impl_;
+}
+
+void
+HotCache::cache(RRsetPtr rrset, const uint32_t flags, const time_t interval) {
+    impl_->insert(CacheNodePtr(new CacheNode(rrset, flags, interval)));
+}
+
+void
+HotCache::ncache(const Name& name, const RRClass &rrclass,
+                 const RRType& rrtype, const uint32_t flags,
+                 const time_t interval)
+{
+    if (rrtype == RRType::ANY() || rrclass == RRClass::ANY()) {
+        return;
+    }
+
+    impl_->insert(CacheNodePtr(new CacheNode(name, rrclass, rrtype,
+                                             flags, interval)));
+}
+
+bool
+HotCache::retrieve(const Name& n, const RRClass& c, const RRType& t,
+                   RRsetPtr& rrset, uint32_t& flags)
+{
+    std::map<Question, CacheNodePtr>::const_iterator iter;
+    iter = impl_->map_.find(Question(n, c, t));
+    if (iter == impl_->map_.end()) {
+        return (false);
+    }
+
+    CacheNodePtr node = iter->second;
+
+    if (node->isValid()) {
+        impl_->promote(node);
+        rrset = node->getRRset();
+        flags = node->getFlags();
+        return (true);
+    }
+
+    impl_->remove(node);
+    return (false);
+}
+
+void
+HotCache::setSlots(const int slots) {
+    impl_->slots_ = slots;
+
+    while (impl_->slots_ != 0 && impl_->count_ > impl_->slots_ &&
+           impl_->lru_tail_)
+    {
+        impl_->remove(impl_->lru_tail_);
+    }
+}
+
+int
+HotCache::getSlots() const {
+    return (impl_->slots_);
+}
+
+int
+HotCache::getCount() const {
+    return (impl_->count_);
+}
+
+}
+}

Modified: branches/trac192/src/lib/datasrc/data_source.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/data_source.cc (original)
+++ branches/trac192/src/lib/datasrc/data_source.cc Wed Jun 23 07:08:52 2010
@@ -140,7 +140,7 @@
 
 // Perform the query specified in a QueryTask object
 DataSrc::Result
-doQueryTask(QueryTask& task, NameMatch& zoneinfo, RRsetList& target) {
+doQueryTask(QueryTask& task, ZoneInfo& zoneinfo, RRsetList& target) {
     HotCache& cache = task.q.cache;
     RRsetList rrsets;
     RRsetPtr rrset;
@@ -437,7 +437,7 @@
 
 // Query for referrals (i.e., NS/DS or DNAME) at a given name
 inline bool
-refQuery(const Query& q, const Name& name, NameMatch& zoneinfo,
+refQuery(const Query& q, const Name& name, ZoneInfo& zoneinfo,
          RRsetList& target)
 {
     QueryTask newtask(q, name, QueryTask::REF_QUERY);
@@ -458,7 +458,7 @@
 // Match downward, from the zone apex to the query name, looking for
 // referrals.
 inline bool
-hasDelegation(Query& q, QueryTaskPtr task, NameMatch& zoneinfo) {
+hasDelegation(Query& q, QueryTaskPtr task, ZoneInfo& zoneinfo) {
     Name* zonename = zoneinfo.name();
     if (zonename == NULL) {
         if (task->state == QueryTask::GETANSWER) {
@@ -523,7 +523,7 @@
 }
 
 inline DataSrc::Result
-addSOA(Query& q, NameMatch& zoneinfo) {
+addSOA(Query& q, ZoneInfo& zoneinfo) {
     Message& m = q.message();
     RRsetList soa;
 
@@ -540,7 +540,7 @@
 }
 
 inline DataSrc::Result
-addNSEC(Query& q, const Name& name, NameMatch& zoneinfo) {
+addNSEC(Query& q, const Name& name, ZoneInfo& zoneinfo) {
     RRsetList nsec;
     Message& m = q.message();
 
@@ -555,7 +555,7 @@
 }
 
 inline DataSrc::Result
-getNsec3(Query& q, NameMatch& zoneinfo, string& hash, RRsetPtr& target) {
+getNsec3(Query& q, ZoneInfo& zoneinfo, string& hash, RRsetPtr& target) {
     const DataSrc* ds = zoneinfo.datasrc();
     Name* zonename = zoneinfo.name();
 
@@ -572,7 +572,7 @@
 }
 
 ConstNsec3ParamPtr
-getNsec3Param(Query& q, NameMatch& zoneinfo) {
+getNsec3Param(Query& q, ZoneInfo& zoneinfo) {
     DataSrc::Result result;
     RRsetList nsec3param;
 
@@ -606,7 +606,7 @@
 }
 
 inline DataSrc::Result
-proveNX(Query& q, QueryTaskPtr task, NameMatch& zoneinfo, const bool wildcard) {
+proveNX(Query& q, QueryTaskPtr task, ZoneInfo& zoneinfo, const bool wildcard) {
     Message& m = q.message();
     Name* zonename = zoneinfo.name();
     ConstNsec3ParamPtr nsec3 = getNsec3Param(q, zoneinfo);
@@ -691,7 +691,7 @@
 
 // Attempt a wildcard lookup
 inline DataSrc::Result
-tryWildcard(Query& q, QueryTaskPtr task, NameMatch& zoneinfo, bool& found) {
+tryWildcard(Query& q, QueryTaskPtr task, ZoneInfo& zoneinfo, bool& found) {
     Message& m = q.message();
     DataSrc::Result result;
     found = false;
@@ -811,7 +811,7 @@
             return;
         }
 
-        NameMatch zoneinfo(this, task->qname, task->qclass, task->qtype);
+        ZoneInfo zoneinfo(this, task->qname, task->qclass, task->qtype);
         RRsetList data;
         Result result = SUCCESS;
 
@@ -1103,23 +1103,23 @@
 }
 
 void
-MetaDataSrc::findClosestEnclosure(NameMatch& match) const {
-    if (getClass() != match.qclass() &&
-        getClass() != RRClass::ANY() && match.qclass() != RRClass::ANY()) {
+MetaDataSrc::findClosestEnclosure(ZoneInfo& zoneinfo) const {
+    if (getClass() != zoneinfo.qclass() &&
+        getClass() != RRClass::ANY() && zoneinfo.qclass() != RRClass::ANY()) {
         return;
     }
 
     BOOST_FOREACH (ConstDataSrcPtr data_src, data_sources) {
-        data_src->findClosestEnclosure(match);
-    }
-}
-
-NameMatch::~NameMatch() {
+        data_src->findClosestEnclosure(zoneinfo);
+    }
+}
+
+ZoneInfo::~ZoneInfo() {
     delete closest_name_;
 }
 
 void
-NameMatch::update(const DataSrc& new_source, const Name& container) {
+ZoneInfo::update(const DataSrc& new_source, const Name& container) {
     if (closest_name_ == NULL) {
         closest_name_ = new Name(container);
         best_source_ = &new_source;

Modified: branches/trac192/src/lib/datasrc/data_source.h
==============================================================================
--- branches/trac192/src/lib/datasrc/data_source.h (original)
+++ branches/trac192/src/lib/datasrc/data_source.h Wed Jun 23 07:08:52 2010
@@ -41,7 +41,7 @@
 
 namespace datasrc {
 
-class NameMatch;
+class ZoneInfo;
 class Query;
 
 class DataSrc;
@@ -111,7 +111,7 @@
 
     // 'Medium-level' methods.  This will be implemented by the general
     // DataSrc class but MAY be overwritten by subclasses.
-    virtual void findClosestEnclosure(NameMatch& match) const = 0;
+    virtual void findClosestEnclosure(ZoneInfo& zoneinfo) const = 0;
 
     // Optional 'low-level' methods.  These will have stub implementations
     // in the general DataSrc class but MAY be overwritten by subclasses
@@ -181,7 +181,7 @@
 
     virtual void doQuery(Query& q);
 
-    virtual void findClosestEnclosure(NameMatch& match) const = 0;
+    virtual void findClosestEnclosure(ZoneInfo& zoneinfo) const = 0;
 
     const isc::dns::RRClass& getClass() const { return rrclass; }
     void setClass(isc::dns::RRClass& c) { rrclass = c; }
@@ -250,7 +250,7 @@
     void removeDataSrc(ConstDataSrcPtr data_src);
     size_t dataSrcCount() { return data_sources.size(); };
     
-    void findClosestEnclosure(NameMatch& match) const;
+    void findClosestEnclosure(ZoneInfo& zoneinfo) const;
 
     // Actual queries for data should not be sent to a MetaDataSrc object,
     // so we return NOT_IMPLEMENTED if we receive any.
@@ -299,15 +299,15 @@
 
 /// \brief Information about the zone for a given query
 ///
-/// The \c NameMatch object is created with the query name and query
+/// The \c ZoneInfo object is created with the query name and query
 /// class (and optionally, query type) for an ongoing query, and the
 /// top-level data source.  When it becomes necessary to find the
 /// closest enclosing zone matching the query and the concrete data
-/// source which is authoritative for that zone, then the \c NameMatch
+/// source which is authoritative for that zone, then the \c ZoneInfo
 /// object will search through data sources to make that determination.
 /// (This is done only when needed, so that the search can be avoided
 /// when the query can be answered from the cache.)
-class NameMatch {
+class ZoneInfo {
     ///
     /// \name Constructors, Assignment Operator and Destructor.
     ///
@@ -315,15 +315,15 @@
     /// defined as private.
     //@{
 private:
-    NameMatch(const NameMatch& source);
-    NameMatch& operator=(const NameMatch& source);
+    ZoneInfo(const ZoneInfo& source);
+    ZoneInfo& operator=(const ZoneInfo& source);
 public:
     /// \brief Constructor suitable for most typical queries
     ///
     /// \param ds Pointer to the top-level data source
     /// \param qname Query name
     /// \param qclass Query class
-    NameMatch(const DataSrc* ds, const isc::dns::Name& qname,
+    ZoneInfo(const DataSrc* ds, const isc::dns::Name& qname,
               const isc::dns::RRClass& qclass) :
         top_source_(ds), closest_name_(NULL), best_source_(NULL),
         qname_(qname), qclass_(qclass), qtype_(isc::dns::RRType::ANY()) {}
@@ -339,7 +339,7 @@
     /// \param qname Query name
     /// \param qclass Query class
     /// \param qtype Query type
-    NameMatch(const DataSrc* ds, const isc::dns::Name& qname,
+    ZoneInfo(const DataSrc* ds, const isc::dns::Name& qname,
               const isc::dns::RRClass& qclass, const isc::dns::RRType& qtype) :
         top_source_(ds), closest_name_(NULL), best_source_(NULL),
         qname_(qname.getLabelCount() == 1 || qtype != isc::dns::RRType::DS()
@@ -347,7 +347,7 @@
                  : qname.split(1, qname.getLabelCount() - 1)),
         qclass_(qclass), qtype_(qtype)
     {}
-    ~NameMatch();
+    ~ZoneInfo();
     //@}
 
     /// \name Getter and Setter Methods

Modified: branches/trac192/src/lib/datasrc/sqlite3_datasrc.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/sqlite3_datasrc.cc (original)
+++ branches/trac192/src/lib/datasrc/sqlite3_datasrc.cc Wed Jun 23 07:08:52 2010
@@ -344,18 +344,21 @@
 }
 
 void
-Sqlite3DataSrc::findClosestEnclosure(NameMatch& match) const {
-    if (match.qclass() != getClass() && match.qclass() != RRClass::ANY()) {
+Sqlite3DataSrc::findClosestEnclosure(ZoneInfo& zoneinfo) const {
+    if (zoneinfo.qclass() != getClass() &&
+        zoneinfo.qclass() != RRClass::ANY())
+    {
         return;
     }
 
     unsigned int position;
-    if (findClosest(match.qname(), &position) == -1) {
+    if (findClosest(zoneinfo.qname(), &position) == -1) {
         return;
     }
 
-    match.update(*this, match.qname().split(position,
-                                            match.qname().getLabelCount() -
+    zoneinfo.update(*this,
+                     zoneinfo.qname().split(position,
+                                            zoneinfo.qname().getLabelCount() -
                                             position));
 }
 

Modified: branches/trac192/src/lib/datasrc/sqlite3_datasrc.h
==============================================================================
--- branches/trac192/src/lib/datasrc/sqlite3_datasrc.h (original)
+++ branches/trac192/src/lib/datasrc/sqlite3_datasrc.h Wed Jun 23 07:08:52 2010
@@ -58,7 +58,7 @@
     ~Sqlite3DataSrc();
     //@}
 
-    void findClosestEnclosure(NameMatch& match) const;
+    void findClosestEnclosure(ZoneInfo& zoneinfo) const;
 
     Result findRRset(const isc::dns::Name& qname,
                      const isc::dns::RRClass& qclass,

Modified: branches/trac192/src/lib/datasrc/static_datasrc.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/static_datasrc.cc (original)
+++ branches/trac192/src/lib/datasrc/static_datasrc.cc Wed Jun 23 07:08:52 2010
@@ -129,20 +129,21 @@
 }
 
 void
-StaticDataSrc::findClosestEnclosure(NameMatch& match) const {
-    const Name& qname = match.qname();
-
-    if (match.qclass() != getClass() && match.qclass() != RRClass::ANY()) {
+StaticDataSrc::findClosestEnclosure(ZoneInfo& zoneinfo) const {
+    const Name& qname = zoneinfo.qname();
+
+    if (zoneinfo.qclass() != getClass() &&
+        zoneinfo.qclass() != RRClass::ANY()) {
         return;
     }
 
     if (isSubdomain(qname, impl_->version_name)) {
-        match.update(*this, impl_->version_name);
+        zoneinfo.update(*this, impl_->version_name);
         return;
     }
 
     if (isSubdomain(qname, impl_->authors_name)) {
-        match.update(*this, impl_->authors_name);
+        zoneinfo.update(*this, impl_->authors_name);
         return;
     }
 }

Modified: branches/trac192/src/lib/datasrc/static_datasrc.h
==============================================================================
--- branches/trac192/src/lib/datasrc/static_datasrc.h (original)
+++ branches/trac192/src/lib/datasrc/static_datasrc.h Wed Jun 23 07:08:52 2010
@@ -39,8 +39,6 @@
 
 namespace datasrc {
 
-class Query;
-class NameMatch;
 struct StaticDataSrcImpl;
 
 class StaticDataSrc : public DataSrc {
@@ -58,7 +56,7 @@
     ~StaticDataSrc();
     //@}
 
-    void findClosestEnclosure(NameMatch& match) const;
+    void findClosestEnclosure(ZoneInfo& zoneinfo) const;
 
     Result findRRset(const isc::dns::Name& qname,
                      const isc::dns::RRClass& qclass,

Modified: branches/trac192/src/lib/datasrc/tests/datasrc_unittest.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/tests/datasrc_unittest.cc (original)
+++ branches/trac192/src/lib/datasrc/tests/datasrc_unittest.cc Wed Jun 23 07:08:52 2010
@@ -867,23 +867,23 @@
     EXPECT_EQ(0, ds.dataSrcCount());
 }
 
-TEST_F(DataSrcTest, NameMatch) {
+TEST_F(DataSrcTest, ZoneInfo) {
     MetaDataSrc ds;
     ConstDataSrcPtr tsp = ConstDataSrcPtr(new TestDataSrc);
     ds.addDataSrc(tsp);
-    NameMatch zoneinfo(&ds, Name("very.very.long.example.com"), RRClass::IN());
+    ZoneInfo zoneinfo(&ds, Name("very.very.long.example.com"), RRClass::IN());
     EXPECT_EQ(Name("example.com"), *zoneinfo.name());
     EXPECT_EQ(tsp.get(), zoneinfo.datasrc());
 }
 
-TEST_F(DataSrcTest, NameMatchByType) {
+TEST_F(DataSrcTest, ZoneInfoByType) {
     MetaDataSrc ds;
     ConstDataSrcPtr tsp = ConstDataSrcPtr(new TestDataSrc);
     ds.addDataSrc(tsp);
-    NameMatch zoneinfo1(&ds, Name("sql1.example.com"), RRClass::IN(),
+    ZoneInfo zoneinfo1(&ds, Name("sql1.example.com"), RRClass::IN(),
                        RRType::NS());
     EXPECT_EQ(Name("sql1.example.com"), *zoneinfo1.name());
-    NameMatch zoneinfo2(&ds, Name("sql1.example.com"), RRClass::IN(),
+    ZoneInfo zoneinfo2(&ds, Name("sql1.example.com"), RRClass::IN(),
                        RRType::DS());
     EXPECT_EQ(Name("example.com"), *zoneinfo2.name());
 }

Modified: branches/trac192/src/lib/datasrc/tests/sqlite3_unittest.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/tests/sqlite3_unittest.cc (original)
+++ branches/trac192/src/lib/datasrc/tests/sqlite3_unittest.cc Wed Jun 23 07:08:52 2010
@@ -374,9 +374,9 @@
     EXPECT_EQ(DataSrc::SUCCESS, data_source.close());
     EXPECT_EQ(DataSrc::SUCCESS, data_source.init(SQLITE_DBFILE_EXAMPLE2));
 
-    NameMatch name_match(&data_source, www_name, rrclass);
-    EXPECT_EQ(NULL, name_match.name());
-    EXPECT_EQ(NULL, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, www_name, rrclass);
+    EXPECT_EQ(NULL, zoneinfo.name());
+    EXPECT_EQ(NULL, zoneinfo.datasrc());
 }
 
 TEST_F(Sqlite3DataSourceTest, openFail) {
@@ -412,46 +412,46 @@
 }
 
 TEST_F(Sqlite3DataSourceTest, findClosestEnclosure) {
-    NameMatch name_match(&data_source, www_name, rrclass);
-    EXPECT_EQ(zone_name, *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, www_name, rrclass);
+    EXPECT_EQ(zone_name, *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 TEST_F(Sqlite3DataSourceTest, findClosestEnclosureMatchRoot) {
     EXPECT_EQ(DataSrc::SUCCESS, data_source.close());
     EXPECT_EQ(DataSrc::SUCCESS, data_source.init(SQLITE_DBFILE_EXAMPLE_ROOT));
 
-    NameMatch name_match(&data_source, Name("org."), rrclass);
-    EXPECT_EQ(Name("."), *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, Name("org."), rrclass);
+    EXPECT_EQ(Name("."), *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 TEST_F(Sqlite3DataSourceTest, findClosestEnclosureAtDelegation) {
     // The search name exists both in the parent and child zones, but
     // child has a better match.
-    NameMatch name_match(&data_source, child_name, rrclass);
-    EXPECT_EQ(child_name, *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, child_name, rrclass);
+    EXPECT_EQ(child_name, *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 TEST_F(Sqlite3DataSourceTest, findClosestEnclosureNoMatch) {
-    NameMatch name_match(&data_source, nomatch_name, rrclass);
-    EXPECT_EQ(NULL, name_match.name());
-    EXPECT_EQ(NULL, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, nomatch_name, rrclass);
+    EXPECT_EQ(NULL, zoneinfo.name());
+    EXPECT_EQ(NULL, zoneinfo.datasrc());
 }
 
 TEST_F(Sqlite3DataSourceTest, findClosestClassMismatch) {
-    NameMatch name_match(&data_source, www_name, rrclass_notmatch);
-    EXPECT_EQ(NULL, name_match.name());
-    EXPECT_EQ(NULL, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, www_name, rrclass_notmatch);
+    EXPECT_EQ(NULL, zoneinfo.name());
+    EXPECT_EQ(NULL, zoneinfo.datasrc());
 }
 
 // If the query class is ANY, the result should be the same as the case where
 // the class exactly matches.
 TEST_F(Sqlite3DataSourceTest, findClosestClassAny) {
-    NameMatch name_match(&data_source, www_name, RRClass::ANY());
-    EXPECT_EQ(zone_name, *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, www_name, RRClass::ANY());
+    EXPECT_EQ(zone_name, *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 TEST_F(Sqlite3DataSourceTest, findRRsetNormal) {

Modified: branches/trac192/src/lib/datasrc/tests/static_unittest.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/tests/static_unittest.cc (original)
+++ branches/trac192/src/lib/datasrc/tests/static_unittest.cc Wed Jun 23 07:08:52 2010
@@ -196,47 +196,47 @@
 }
 
 TEST_F(StaticDataSourceTest, findClosestEnclosureForVersion) {
-    NameMatch name_match(&data_source, version_name, rrclass);
-    EXPECT_EQ(version_name, *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, version_name, rrclass);
+    EXPECT_EQ(version_name, *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 // Class Any query should result in the same answer.
 TEST_F(StaticDataSourceTest, findClosestEnclosureForVersionClassAny) {
-    NameMatch name_match(&data_source, version_name, RRClass::ANY());
-    EXPECT_EQ(version_name, *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, version_name, RRClass::ANY());
+    EXPECT_EQ(version_name, *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 // If class doesn't match the lookup should fail.
 TEST_F(StaticDataSourceTest, findClosestEnclosureForVersionClassMismatch) {
-    NameMatch name_match(&data_source, version_name, RRClass::IN());
-    EXPECT_EQ(NULL, name_match.name());
-    EXPECT_EQ(NULL, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, version_name, RRClass::IN());
+    EXPECT_EQ(NULL, zoneinfo.name());
+    EXPECT_EQ(NULL, zoneinfo.datasrc());
 }
 
 TEST_F(StaticDataSourceTest, findClosestEnclosureForVersionPartial) {
-    NameMatch name_match(&data_source, Name("foo").concatenate(version_name), rrclass);
-    EXPECT_EQ(version_name, *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, Name("foo").concatenate(version_name), rrclass);
+    EXPECT_EQ(version_name, *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 TEST_F(StaticDataSourceTest, findClosestEnclosureForAuthors) {
-    NameMatch name_match(&data_source, authors_name, rrclass);
-    EXPECT_EQ(authors_name, *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, authors_name, rrclass);
+    EXPECT_EQ(authors_name, *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 TEST_F(StaticDataSourceTest, findClosestEnclosureForAuthorsPartial) {
-    NameMatch name_match(&data_source, Name("foo").concatenate(authors_name), rrclass);
-    EXPECT_EQ(authors_name, *name_match.name());
-    EXPECT_EQ(&data_source, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, Name("foo").concatenate(authors_name), rrclass);
+    EXPECT_EQ(authors_name, *zoneinfo.name());
+    EXPECT_EQ(&data_source, zoneinfo.datasrc());
 }
 
 TEST_F(StaticDataSourceTest, findClosestEnclosureNoMatch) {
-    NameMatch name_match(&data_source, nomatch_name, rrclass);
-    EXPECT_EQ(NULL, name_match.name());
-    EXPECT_EQ(NULL, name_match.datasrc());
+    ZoneInfo zoneinfo(&data_source, nomatch_name, rrclass);
+    EXPECT_EQ(NULL, zoneinfo.name());
+    EXPECT_EQ(NULL, zoneinfo.datasrc());
 }
 
 TEST_F(StaticDataSourceTest, findRRsetVersionTXT) {

Modified: branches/trac192/src/lib/datasrc/tests/test_datasrc.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/tests/test_datasrc.cc (original)
+++ branches/trac192/src/lib/datasrc/tests/test_datasrc.cc Wed Jun 23 07:08:52 2010
@@ -481,25 +481,26 @@
 }
 
 void
-TestDataSrc::findClosestEnclosure(NameMatch& match) const {
-    const Name& qname = match.qname();
+TestDataSrc::findClosestEnclosure(ZoneInfo& zoneinfo) const {
+    const Name& qname = zoneinfo.qname();
     NameComparisonResult::NameRelation cmp;
 
-    if (match.qclass() != getClass() && match.qclass() != RRClass::ANY()) {
+    if (zoneinfo.qclass() != getClass() &&
+        zoneinfo.qclass() != RRClass::ANY()) {
         return;
     }
 
     cmp = qname.compare(sql1).getRelation();
     if (cmp == NameComparisonResult::EQUAL ||
           cmp == NameComparisonResult::SUBDOMAIN) {
-        match.update(*this, sql1);
+        zoneinfo.update(*this, sql1);
         return;
     }
 
     cmp = qname.compare(example).getRelation();
     if (cmp == NameComparisonResult::EQUAL ||
           cmp == NameComparisonResult::SUBDOMAIN) {
-        match.update(*this, example);
+        zoneinfo.update(*this, example);
         return;
     }
 

Modified: branches/trac192/src/lib/datasrc/tests/test_datasrc.h
==============================================================================
--- branches/trac192/src/lib/datasrc/tests/test_datasrc.h (original)
+++ branches/trac192/src/lib/datasrc/tests/test_datasrc.h Wed Jun 23 07:08:52 2010
@@ -48,7 +48,7 @@
     ~TestDataSrc() {}
     //@}
 
-    void findClosestEnclosure(NameMatch& match) const;
+    void findClosestEnclosure(ZoneInfo& zoneinfo) const;
 
     Result findRRset(const isc::dns::Name& qname,
                      const isc::dns::RRClass& qclass,




More information about the bind10-changes mailing list