BIND 10 trac2268, updated. ed2b8eb0e3f827c89ba16200312424384a54a9a7 [2268] separated zone data Loader from ZoneDataUpdater.
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Oct 9 23:14:16 UTC 2012
The branch, trac2268 has been updated
via ed2b8eb0e3f827c89ba16200312424384a54a9a7 (commit)
via c16c1ab29b3a52012a806974dd6afaddc01c9436 (commit)
via 2eb96fb05e736e2f16d03174f663d030cc883f00 (commit)
via c6f7cced73d38d5108862be4a104cb89d0f832e4 (commit)
from 587a13699275e9a582fb9358463047362ef9f21e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ed2b8eb0e3f827c89ba16200312424384a54a9a7
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Tue Oct 9 15:37:16 2012 -0700
[2268] separated zone data Loader from ZoneDataUpdater.
it doesn't have to be part of the updater (with the ability of accessing
private members).
commit c16c1ab29b3a52012a806974dd6afaddc01c9436
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Tue Oct 9 15:09:37 2012 -0700
[2268] cleanup: removed (now-)unnecessary include
commit 2eb96fb05e736e2f16d03174f663d030cc883f00
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Tue Oct 9 14:44:42 2012 -0700
[2268] constify
commit c6f7cced73d38d5108862be4a104cb89d0f832e4
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Tue Oct 9 14:40:13 2012 -0700
[2268] doxigen editorial fixes: use \code for code snippet; folded a long line
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/memory/memory_client.cc | 6 ++----
src/lib/datasrc/memory/zone_data_updater.cc | 9 ++++-----
src/lib/datasrc/memory/zone_data_updater.h | 18 +++++++++---------
3 files changed, 15 insertions(+), 18 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index 552c5e7..0857541 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -92,10 +92,8 @@ InMemoryClient::load(const Name& zone_name,
SegmentObjectHolder<ZoneData, RRClass> holder(
mem_sgmt_, ZoneData::create(mem_sgmt_, zone_name), rrclass_);
- ZoneDataUpdater::Loader loader(mem_sgmt_, rrclass_,
- zone_name, *holder.get());
- rrset_installer(boost::bind(&ZoneDataUpdater::Loader::addFromLoad,
- &loader, _1));
+ ZoneDataLoader loader(mem_sgmt_, rrclass_, zone_name, *holder.get());
+ rrset_installer(boost::bind(&ZoneDataLoader::addFromLoad, &loader, _1));
// Add any last RRsets that were left
loader.flushNodeRRsets();
diff --git a/src/lib/datasrc/memory/zone_data_updater.cc b/src/lib/datasrc/memory/zone_data_updater.cc
index 3303065..3404fea 100644
--- a/src/lib/datasrc/memory/zone_data_updater.cc
+++ b/src/lib/datasrc/memory/zone_data_updater.cc
@@ -18,7 +18,6 @@
#include <dns/rdataclass.h>
-#include <boost/scoped_ptr.hpp>
#include <boost/foreach.hpp>
using namespace isc::dns;
@@ -347,7 +346,7 @@ ZoneDataUpdater::add(const ConstRRsetPtr& rrset,
void
-ZoneDataUpdater::Loader::addFromLoad(const ConstRRsetPtr& rrset) {
+ZoneDataLoader::addFromLoad(const ConstRRsetPtr& rrset) {
// If we see a new name, flush the temporary holders, adding the
// pairs of RRsets and RRSIGs of the previous name to the zone.
if ((!node_rrsets_.empty() || !node_rrsigsets_.empty()) &&
@@ -370,7 +369,7 @@ ZoneDataUpdater::Loader::addFromLoad(const ConstRRsetPtr& rrset) {
}
void
-ZoneDataUpdater::Loader::flushNodeRRsets() {
+ZoneDataLoader::flushNodeRRsets() {
BOOST_FOREACH(NodeRRsetsVal val, node_rrsets_) {
// Identify the corresponding RRSIG for the RRset, if any. If
// found add both the RRset and its RRSIG at once.
@@ -397,7 +396,7 @@ ZoneDataUpdater::Loader::flushNodeRRsets() {
}
RRType
-ZoneDataUpdater::Loader::getCoveredType(const ConstRRsetPtr& sig_rrset) {
+ZoneDataLoader::getCoveredType(const ConstRRsetPtr& sig_rrset) {
RdataIteratorPtr it = sig_rrset->getRdataIterator();
// Empty RRSIG shouldn't be passed either via a master file or
// another data source iterator, but it could still happen if the
@@ -412,7 +411,7 @@ ZoneDataUpdater::Loader::getCoveredType(const ConstRRsetPtr& sig_rrset) {
}
const Name&
-ZoneDataUpdater::Loader::getCurrentName() const {
+ZoneDataLoader::getCurrentName() const {
if (!node_rrsets_.empty()) {
return (node_rrsets_.begin()->second->getName());
}
diff --git a/src/lib/datasrc/memory/zone_data_updater.h b/src/lib/datasrc/memory/zone_data_updater.h
index 6ccad26..092668d 100644
--- a/src/lib/datasrc/memory/zone_data_updater.h
+++ b/src/lib/datasrc/memory/zone_data_updater.h
@@ -40,9 +40,11 @@ namespace memory {
/// The way to use this is to make a ZoneDataUpdater instance, and call
/// add() on it as follows:
///
+/// \code
/// ZoneDataUpdater updater(mem_sgmt, rrclass, zone_origin_name, zone_data);
/// ConstRRsetPtr rrset;
/// updater.add(rrset, ConstRRsetPtr());
+/// \endcode
///
/// We enforce that instances are non-copyable as it's pointless to make
/// copies.
@@ -59,7 +61,8 @@ public:
///
/// \param mem_sgmt The memory segment used for the zone data.
/// \param rrclass The RRclass of the zone data.
- /// \param zone_name The Name of the zone under which records will be added.
+ /// \param zone_name The Name of the zone under which records will be
+ /// added.
// \param zone_data The ZoneData object which is populated with
// record data.
ZoneDataUpdater(util::MemorySegment& mem_sgmt,
@@ -123,10 +126,6 @@ public:
void add(const isc::dns::ConstRRsetPtr& rrset,
const isc::dns::ConstRRsetPtr& sig_rrset);
- // A helper internal class used by InMemoryClient::load(). It
- // maintains some intermediate states while loading RRs of the zone.
- class Loader;
-
private:
// Add the necessary magic for any wildcard contained in 'name'
// (including itself) to be found in the zone.
@@ -168,7 +167,7 @@ private:
const isc::dns::Name& zone_name_;
ZoneData& zone_data_;
RdataEncoder encoder_;
- isc::dns::NSEC3Hash* hash_;
+ const isc::dns::NSEC3Hash* hash_;
};
// A helper internal class for load(). make it non-copyable to avoid
@@ -189,10 +188,11 @@ private:
// do it, but since we cannot guarantee the adding operation is exception free,
// we don't choose that option to maintain the common expectation for
// destructors.
-class ZoneDataUpdater::Loader : boost::noncopyable {
+class ZoneDataLoader : boost::noncopyable {
public:
- Loader(util::MemorySegment& mem_sgmt, const isc::dns::RRClass rrclass,
- const isc::dns::Name& zone_name, ZoneData& zone_data) :
+ ZoneDataLoader(util::MemorySegment& mem_sgmt,
+ const isc::dns::RRClass rrclass,
+ const isc::dns::Name& zone_name, ZoneData& zone_data) :
updater_(mem_sgmt, rrclass, zone_name, zone_data)
{}
More information about the bind10-changes
mailing list