[svn] commit: r3853 - in /branches/trac422/src/lib/datasrc: memory_datasrc.cc memory_datasrc.h tests/memory_datasrc_unittest.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Dec 16 03:16:35 UTC 2010
Author: chenzhengzhang
Date: Thu Dec 16 03:16:35 2010
New Revision: 3853
Log:
update according to review comments(remove redundant code)
Modified:
branches/trac422/src/lib/datasrc/memory_datasrc.cc
branches/trac422/src/lib/datasrc/memory_datasrc.h
branches/trac422/src/lib/datasrc/tests/memory_datasrc_unittest.cc
Modified: branches/trac422/src/lib/datasrc/memory_datasrc.cc
==============================================================================
--- branches/trac422/src/lib/datasrc/memory_datasrc.cc (original)
+++ branches/trac422/src/lib/datasrc/memory_datasrc.cc Thu Dec 16 03:16:35 2010
@@ -38,7 +38,7 @@
delete impl_;
}
-isc::datasrc::result::Result
+result::Result
MemoryDataSrc::addZone(ZonePtr zone) {
if (!zone) {
isc_throw(InvalidParameter,
Modified: branches/trac422/src/lib/datasrc/memory_datasrc.h
==============================================================================
--- branches/trac422/src/lib/datasrc/memory_datasrc.h (original)
+++ branches/trac422/src/lib/datasrc/memory_datasrc.h Thu Dec 16 03:16:35 2010
@@ -74,11 +74,10 @@
/// See the description of \c find() for the semantics of the member
/// variables.
struct FindResult {
- FindResult(isc::datasrc::result::Result param_code,
- const ConstZonePtr param_zone) :
+ FindResult(result::Result param_code, const ConstZonePtr param_zone) :
code(param_code), zone(param_zone)
{}
- const isc::datasrc::result::Result code;
+ const result::Result code;
const ConstZonePtr zone;
};
@@ -114,11 +113,11 @@
/// This method never throws an exception otherwise.
///
/// \param zone A \c Zone object to be added.
- /// \return \c isc::datasrc::result::SUCCESS If the zone is successfully
+ /// \return \c result::SUCCESS If the zone is successfully
/// added to the memory data source.
- /// \return \c isc::datasrc::result::EXIST The memory data source already
+ /// \return \c result::EXIST The memory data source already
/// stores a zone that has the same origin.
- isc::datasrc::result::Result addZone(ZonePtr zone);
+ result::Result addZone(ZonePtr zone);
/// Find a \c Zone that best matches the given name in the \c MemoryDataSrc.
///
@@ -126,11 +125,11 @@
/// longest match against \c name, and returns the result in the
/// form of a \c FindResult object as follows:
/// - \c code: The result code of the operation.
- /// - \c isc::datasrc::result::SUCCESS: A zone that gives an exact match
+ /// - \c result::SUCCESS: A zone that gives an exact match
// is found
- /// - \c isc::datasrc::result::PARTIALMATCH: A zone whose origin is a
+ /// - \c result::PARTIALMATCH: A zone whose origin is a
// super domain of \c name is found (but there is no exact match)
- /// - \c isc::datasrc::result::NOTFOUND: For all other cases.
+ /// - \c result::NOTFOUND: For all other cases.
/// - \c zone: A <Boost> shared pointer to the found \c Zone object if one
// is found; otherwise \c NULL.
///
Modified: branches/trac422/src/lib/datasrc/tests/memory_datasrc_unittest.cc
==============================================================================
--- branches/trac422/src/lib/datasrc/tests/memory_datasrc_unittest.cc (original)
+++ branches/trac422/src/lib/datasrc/tests/memory_datasrc_unittest.cc Thu Dec 16 03:16:35 2010
@@ -40,77 +40,74 @@
EXPECT_THROW(memory_datasrc.addZone(ZonePtr()), isc::InvalidParameter);
// add zones with different names one by one
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::IN(), Name("a")))));
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::CH(), Name("b")))));
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::IN(), Name("c")))));
// add zones with the same name suffix
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::CH(),
Name("x.d.e.f")))));
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::CH(),
Name("o.w.y.d.e.f")))));
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::CH(),
Name("p.w.y.d.e.f")))));
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::IN(),
Name("q.w.y.d.e.f")))));
// add super zone and its subzone
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::CH(), Name("g.h")))));
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::IN(), Name("i.g.h")))));
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::IN(),
Name("z.d.e.f")))));
- EXPECT_EQ(isc::datasrc::result::SUCCESS, memory_datasrc.addZone(
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::IN(),
Name("j.z.d.e.f")))));
// different zone class isn't allowed.
- EXPECT_EQ(isc::datasrc::result::EXIST, memory_datasrc.addZone(
+ EXPECT_EQ(result::EXIST, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::CH(),
Name("q.w.y.d.e.f")))));
// names are compared in a case insensitive manner.
- EXPECT_EQ(isc::datasrc::result::EXIST, memory_datasrc.addZone(
+ EXPECT_EQ(result::EXIST, memory_datasrc.addZone(
ZonePtr(new MemoryZone(RRClass::IN(),
Name("Q.W.Y.d.E.f")))));
// test find zone
- EXPECT_EQ(isc::datasrc::result::SUCCESS,
- memory_datasrc.findZone(Name("a")).code);
+ EXPECT_EQ(result::SUCCESS, memory_datasrc.findZone(Name("a")).code);
EXPECT_EQ(Name("a"),
memory_datasrc.findZone(Name("a")).zone->getOrigin());
- EXPECT_EQ(isc::datasrc::result::SUCCESS,
+ EXPECT_EQ(result::SUCCESS,
memory_datasrc.findZone(Name("j.z.d.e.f")).code);
EXPECT_EQ(Name("j.z.d.e.f"),
memory_datasrc.findZone(Name("j.z.d.e.f")).zone->getOrigin());
// NOTFOUND
- EXPECT_EQ(isc::datasrc::result::NOTFOUND,
- memory_datasrc.findZone(Name("d.e.f")).code);
- EXPECT_EQ(ConstZonePtr(),
- memory_datasrc.findZone(Name("d.e.f")).zone);
+ EXPECT_EQ(result::NOTFOUND, memory_datasrc.findZone(Name("d.e.f")).code);
+ EXPECT_EQ(ConstZonePtr(), memory_datasrc.findZone(Name("d.e.f")).zone);
- EXPECT_EQ(isc::datasrc::result::NOTFOUND,
+ EXPECT_EQ(result::NOTFOUND,
memory_datasrc.findZone(Name("w.y.d.e.f")).code);
EXPECT_EQ(ConstZonePtr(),
memory_datasrc.findZone(Name("w.y.d.e.f")).zone);
// there's no exact match. the result should be the longest match,
// and the code should be PARTIALMATCH.
- EXPECT_EQ(isc::datasrc::result::PARTIALMATCH,
+ EXPECT_EQ(result::PARTIALMATCH,
memory_datasrc.findZone(Name("j.g.h")).code);
EXPECT_EQ(Name("g.h"),
memory_datasrc.findZone(Name("g.h")).zone->getOrigin());
- EXPECT_EQ(isc::datasrc::result::PARTIALMATCH,
+ EXPECT_EQ(result::PARTIALMATCH,
memory_datasrc.findZone(Name("z.i.g.h")).code);
EXPECT_EQ(Name("i.g.h"),
memory_datasrc.findZone(Name("z.i.g.h")).zone->getOrigin());
More information about the bind10-changes
mailing list