BIND 10 trac2811, updated. 1cc8f4ee3e37c0db41adb32903ea8728f8bdffd4 [2811] Don't call rebalance for subtree roots

[BIND 10 source code commits]

The branch, trac2811 has been updated
       via  1cc8f4ee3e37c0db41adb32903ea8728f8bdffd4 (commit)
       via  2d464c6352e5caf548c18de74377c0601ef2db73 (commit)
      from  46660bcb71022d1732161951a59519998cbd0207 (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 1cc8f4ee3e37c0db41adb32903ea8728f8bdffd4
Author: Mukund Sivaraman <muks at isc.org>
Date:   Sat Mar 2 19:58:14 2013 +0530

    [2811] Don't call rebalance for subtree roots

commit 2d464c6352e5caf548c18de74377c0601ef2db73
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Feb 26 13:42:03 2013 +0530

    [2811] Use ints for consistency
    
    These are better replaced with size_ts everywhere, but we set it the
    test DomainTree's data, and the data is an int, so it has been changed
    everywhere to be an int for consistency.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/memory/domaintree.h                |    4 +++-
 .../datasrc/tests/memory/domaintree_unittest.cc    |    6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h
index c08e6e0..ffd2831 100644
--- a/src/lib/datasrc/memory/domaintree.h
+++ b/src/lib/datasrc/memory/domaintree.h
@@ -1847,11 +1847,13 @@ DomainTree<T>::insert(util::MemorySegment& mem_sgmt,
     } else if (order < 0) {
         node->setSubTreeRoot(false);
         parent->left_ = node;
+        insertRebalance(current_root, node);
     } else {
         node->setSubTreeRoot(false);
         parent->right_ = node;
+        insertRebalance(current_root, node);
     }
-    insertRebalance(current_root, node);
+
     if (new_node != NULL) {
         *new_node = node;
     }
diff --git a/src/lib/datasrc/tests/memory/domaintree_unittest.cc b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
index e65da18..6a633e5 100644
--- a/src/lib/datasrc/tests/memory/domaintree_unittest.cc
+++ b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
@@ -151,7 +151,7 @@ TEST_F(DomainTreeTest, getDistance) {
 }
 
 void
-checkDistances(const TestDomainTree& tree, size_t distance) {
+checkDistances(const TestDomainTree& tree, int distance) {
     TestDomainTreeNodeChain node_path;
     const TestDomainTreeNode* node = NULL;
 
@@ -177,7 +177,7 @@ TEST_F(DomainTreeTest, checkDistanceRandom) {
     TreeHolder mytree_holder(mem_sgmt_, TestDomainTree::create(mem_sgmt_));
     TestDomainTree& mytree = *mytree_holder.get();
     isc::util::random::UniformRandomIntegerGenerator gen('a', 'z');
-    const size_t log_num_nodes = 20;
+    const int log_num_nodes = 20;
 
     // Make a large million+ node top-level domain tree, i.e., the
     // following code inserts names such as:
@@ -219,7 +219,7 @@ TEST_F(DomainTreeTest, checkDistanceSorted) {
 
     TreeHolder mytree_holder(mem_sgmt_, TestDomainTree::create(mem_sgmt_));
     TestDomainTree& mytree = *mytree_holder.get();
-    const size_t log_num_nodes = 20;
+    const int log_num_nodes = 20;
 
     // Make a large million+ node top-level domain tree, i.e., the
     // following code inserts names such as: