[svn] commit: r4136 - in /branches/trac469/src/lib/datasrc: memory_datasrc.cc rbtree.h tests/rbtree_unittest.cc zonetable.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Jan 3 20:01:45 UTC 2011
Author: vorner
Date: Mon Jan 3 20:01:45 2011
New Revision: 4136
Log:
Nicer constant names
SUCCEED (imperative) -> SUCCESS (noun)
ALREADYEXIST -> ALREADYEXISTS (third form)
Modified:
branches/trac469/src/lib/datasrc/memory_datasrc.cc
branches/trac469/src/lib/datasrc/rbtree.h
branches/trac469/src/lib/datasrc/tests/rbtree_unittest.cc
branches/trac469/src/lib/datasrc/zonetable.cc
Modified: branches/trac469/src/lib/datasrc/memory_datasrc.cc
==============================================================================
--- branches/trac469/src/lib/datasrc/memory_datasrc.cc (original)
+++ branches/trac469/src/lib/datasrc/memory_datasrc.cc Mon Jan 3 20:01:45 2011
@@ -84,8 +84,8 @@
DomainNode* node;
switch (domains->insert(name, &node)) {
// Just check it returns reasonable results
- case DomainTree::SUCCEED:
- case DomainTree::ALREADYEXIST:
+ case DomainTree::SUCCESS:
+ case DomainTree::ALREADYEXISTS:
break;
// Something odd got out
default:
Modified: branches/trac469/src/lib/datasrc/rbtree.h
==============================================================================
--- branches/trac469/src/lib/datasrc/rbtree.h (original)
+++ branches/trac469/src/lib/datasrc/rbtree.h Mon Jan 3 20:01:45 2011
@@ -291,12 +291,12 @@
public:
/// \brief The return value for the \c find() insert() and erase() method
enum Result {
- SUCCEED, //insert or erase succeed
+ SUCCESS, //insert or erase succeed
EXACTMATCH, //find the target name
PARTIALMATCH, //find part of target name
NOTFOUND, // for find function means no related name found
// for erase function means erase not exist name
- ALREADYEXIST, //for insert operation, the name to insert already exist
+ ALREADYEXISTS, //for insert operation, the name to insert already exist
};
/// \name Constructor and Destructor
@@ -424,8 +424,8 @@
/// Anyway the pointer point to the node with the name will be assigned to
/// inserted_node
/// \return
- // - SUCCEED means no node exists in the tree with the name before insert
- /// - ALREADYEXIST means already has the node with the given name
+ // - SUCCESS means no node exists in the tree with the name before insert
+ /// - ALREADYEXISTS means already has the node with the given name
//
/// \node To modify the data related with one name but not sure the name has
/// inserted or not, it is better to call \c insert,instead of
@@ -632,7 +632,7 @@
if (new_node != NULL) {
*new_node = current;
}
- return (ALREADYEXIST);
+ return (ALREADYEXISTS);
} else {
const int common_label_count = compare_result.getCommonLabels();
if (common_label_count == 1) {
@@ -685,7 +685,7 @@
++node_count_;
node.release();
- return (SUCCEED);
+ return (SUCCESS);
}
template <typename T>
Modified: branches/trac469/src/lib/datasrc/tests/rbtree_unittest.cc
==============================================================================
--- branches/trac469/src/lib/datasrc/tests/rbtree_unittest.cc (original)
+++ branches/trac469/src/lib/datasrc/tests/rbtree_unittest.cc Mon Jan 3 20:01:45 2011
@@ -90,62 +90,62 @@
}
TEST_F(RBTreeTest, insertNames) {
- EXPECT_EQ(RBTree<int>::ALREADYEXIST, rbtree.insert(Name("d.e.f"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::ALREADYEXISTS, rbtree.insert(Name("d.e.f"), &rbtnode));
EXPECT_EQ(Name("d.e.f"), rbtnode->getName());
EXPECT_EQ(13, rbtree.getNodeCount());
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("."), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("."), &rbtnode));
EXPECT_EQ(Name("."), rbtnode->getName());
EXPECT_EQ(14, rbtree.getNodeCount());
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("example.com"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("example.com"), &rbtnode));
EXPECT_EQ(15, rbtree.getNodeCount());
rbtnode->setData(RBNode<int>::NodeDataPtr(new int(12)));
- // return ALREADYEXIST, since node "example.com" already has been explicitly inserted
- EXPECT_EQ(RBTree<int>::ALREADYEXIST, rbtree.insert(Name("example.com"), &rbtnode));
+ // return ALREADYEXISTS, since node "example.com" already has been explicitly inserted
+ EXPECT_EQ(RBTree<int>::ALREADYEXISTS, rbtree.insert(Name("example.com"), &rbtnode));
EXPECT_EQ(15, rbtree.getNodeCount());
// split the node "d.e.f"
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("k.e.f"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("k.e.f"), &rbtnode));
EXPECT_EQ(Name("k"), rbtnode->getName());
EXPECT_EQ(17, rbtree.getNodeCount());
// split the node "g.h"
- EXPECT_EQ(RBTree<int>::ALREADYEXIST, rbtree.insert(Name("h"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::ALREADYEXISTS, rbtree.insert(Name("h"), &rbtnode));
EXPECT_EQ(Name("h"), rbtnode->getName());
EXPECT_EQ(18, rbtree.getNodeCount());
// add child domain
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("m.p.w.y.d.e.f"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("m.p.w.y.d.e.f"), &rbtnode));
EXPECT_EQ(Name("m"), rbtnode->getName());
EXPECT_EQ(19, rbtree.getNodeCount());
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("n.p.w.y.d.e.f"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("n.p.w.y.d.e.f"), &rbtnode));
EXPECT_EQ(Name("n"), rbtnode->getName());
EXPECT_EQ(20, rbtree.getNodeCount());
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("l.a"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("l.a"), &rbtnode));
EXPECT_EQ(Name("l"), rbtnode->getName());
EXPECT_EQ(21, rbtree.getNodeCount());
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("r.d.e.f"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("s.d.e.f"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("r.d.e.f"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("s.d.e.f"), &rbtnode));
EXPECT_EQ(23, rbtree.getNodeCount());
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("h.w.y.d.e.f"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("h.w.y.d.e.f"), &rbtnode));
// add more nodes one by one to cover leftRotate and rightRotate
- EXPECT_EQ(RBTree<int>::ALREADYEXIST, rbtree.insert(Name("f"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("m"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("nm"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("om"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("k"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("l"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("fe"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("ge"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("i"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("ae"), &rbtnode));
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("n"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::ALREADYEXISTS, rbtree.insert(Name("f"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("m"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("nm"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("om"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("k"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("l"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("fe"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("ge"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("i"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("ae"), &rbtnode));
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("n"), &rbtnode));
}
TEST_F(RBTreeTest, findName) {
@@ -177,7 +177,7 @@
TEST_F(RBTreeTest, callback) {
// by default callback isn't enabled
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("callback.example"),
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("callback.example"),
&rbtnode));
rbtnode->setData(RBNode<int>::NodeDataPtr(new int(1)));
EXPECT_FALSE(rbtnode->isCallbackEnabled());
@@ -192,11 +192,11 @@
rbtnode->enableCallback();
// add more levels below and above the callback node for partial match.
RBNode<int>* subrbtnode;
- EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("sub.callback.example"),
+ EXPECT_EQ(RBTree<int>::SUCCESS, rbtree.insert(Name("sub.callback.example"),
&subrbtnode));
subrbtnode->setData(RBNode<int>::NodeDataPtr(new int(2)));
RBNode<int>* parentrbtnode;
- EXPECT_EQ(RBTree<int>::ALREADYEXIST, rbtree.insert(Name("example"),
+ EXPECT_EQ(RBTree<int>::ALREADYEXISTS, rbtree.insert(Name("example"),
&parentrbtnode));
// the chilld/parent nodes shouldn't "inherit" the callback flag.
// "rbtnode" may be invalid due to the insertion, so we need to re-find
Modified: branches/trac469/src/lib/datasrc/zonetable.cc
==============================================================================
--- branches/trac469/src/lib/datasrc/zonetable.cc (original)
+++ branches/trac469/src/lib/datasrc/zonetable.cc Mon Jan 3 20:01:45 2011
@@ -51,8 +51,8 @@
ZoneNode* node(NULL);
switch (zones_.insert(zone->getOrigin(), &node)) {
// This is OK
- case ZoneTree::SUCCEED:
- case ZoneTree::ALREADYEXIST:
+ case ZoneTree::SUCCESS:
+ case ZoneTree::ALREADYEXISTS:
break;
// Can Not Happen
default:
More information about the bind10-changes
mailing list