From: Mukund Sivaraman <muks@isc.org>
Date: Tue, 4 Sep 2012 03:00:31 +0000 (+0530)
Subject: [2108] Remove what's left of RBNodeRRset
X-Git-Tag: trac2351_base~70^2~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=120561d3bf2290360dd5e2b341cfc306017c2db4;p=thirdparty%2Fkea.git

[2108] Remove what's left of RBNodeRRset
---

diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index ab62f191a1..0ceefd8d9c 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -429,21 +429,16 @@ public:
      */
 
     // Implementation of InMemoryClient::add()
-    result::Result add(const ConstRRsetPtr& rawrrset,
+    result::Result add(const ConstRRsetPtr& rrset,
                        const Name& zone_name, ZoneData& zone_data)
     {
         // Sanitize input.  This will cause an exception to be thrown
         // if the input RRset is empty.
-        addValidation(zone_name, rawrrset);
+        addValidation(zone_name, rrset);
 
         // OK, can add the RRset.
         LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_MEM_ADD_RRSET).
-            arg(rawrrset->getName()).arg(rawrrset->getType()).arg(zone_name);
-
-        // ... although instead of loading the RRset directly, we encapsulate
-        // it within an RBNodeRRset.  This contains additional information that
-        // speeds up queries.
-        RBNodeRRsetPtr rrset(new RBNodeRRset(rawrrset));
+            arg(rrset->getName()).arg(rrset->getType()).arg(zone_name);
 
         if (rrset->getType() == RRType::NSEC3()) {
             return (addNSEC3(rrset, zone_data));