From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 26 Sep 2012 00:03:21 +0000 (-0700)
Subject: [2282] cleanup: remove the findAll version of inmemory finder context ctor.
X-Git-Tag: trac2351_base~37^2~1^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a8a4d185ddee401aeed95f9f51d443d725c4d5f;p=thirdparty%2Fkea.git

[2282] cleanup: remove the findAll version of inmemory finder context ctor.

just as originally planned.
---

diff --git a/src/lib/datasrc/memory/zone_finder.cc b/src/lib/datasrc/memory/zone_finder.cc
index ad28e1ca98..83937c75a2 100644
--- a/src/lib/datasrc/memory/zone_finder.cc
+++ b/src/lib/datasrc/memory/zone_finder.cc
@@ -537,18 +537,12 @@ InMemoryZoneFinderNSEC3Calculate(const Name& name,
 
 /// \brief Specialization of the ZoneFinder::Context for the in-memory finder.
 ///
-/// \note Right now we don't implement optimization using this specialized
-/// version, but assuming we'll do pretty soon we'll keep and use the
-/// definition.  The note below will apply at that point (and at that point
-/// we should remove the other constructor for findAll()).
-///
 /// Note that we don't have a specific constructor for the findAll() case.
 /// For (successful) type ANY query, found_node points to the
 /// corresponding zone node, which is recorded within this specialized
 /// context.
 class InMemoryZoneFinder::Context : public ZoneFinder::Context {
 public:
-    /// \brief Constructor for normal find().
     Context(ZoneFinder& finder, ZoneFinder::FindOptions options,
             const RRClass& rrclass, const ZoneFinderResultContext& result) :
         ZoneFinder::Context(finder, options,
@@ -559,18 +553,6 @@ public:
         found_rdset_(result.found_rdset)
     {}
 
-    /// \brief Constructor for findAll().
-    Context(ZoneFinder& finder, ZoneFinder::FindOptions options,
-            const RRClass& rrclass, const ZoneFinderResultContext& result,
-            std::vector<isc::dns::ConstRRsetPtr>& target) :
-        ZoneFinder::Context(finder, options,
-                            ResultContext(result.code, result.rrset,
-                                          result.flags), target),
-        rrclass_(rrclass), zone_data_(result.zone_data),
-        found_node_(result.found_node),
-        found_rdset_(result.found_rdset)
-    {}
-
 protected:
     virtual void getAdditionalImpl(const std::vector<RRType>& requested_types,
                                    std::vector<ConstRRsetPtr>& result)
@@ -739,8 +721,7 @@ InMemoryZoneFinder::findAll(const isc::dns::Name& name,
                                              find_internal(name,
                                                            RRType::ANY(),
                                                            &target,
-                                                           options),
-                                             target)));
+                                                           options))));
 }
 
 ZoneFinderResultContext