From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 12 Dec 2012 18:55:27 +0000 (-0800)
Subject: [2470] renamed RRCollator::finish() to flush() as suggested in review.
X-Git-Tag: bind10-1.0.0-beta-release~15^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a709670c0cb9ca9f1b8ea4f13a7191fcba0ab8cd;p=thirdparty%2Fkea.git

[2470] renamed RRCollator::finish() to flush() as suggested in review.
---

diff --git a/src/lib/datasrc/memory/zone_data_loader.cc b/src/lib/datasrc/memory/zone_data_loader.cc
index ef74e47fef..e224224219 100644
--- a/src/lib/datasrc/memory/zone_data_loader.cc
+++ b/src/lib/datasrc/memory/zone_data_loader.cc
@@ -200,7 +200,7 @@ masterLoaderWrapper(const char* const filename, const Name& origin,
                           createMasterLoaderCallbacks(origin, zone_class,
                                                       &load_ok),
                           collator.getCallback()).load();
-        collator.finish();
+        collator.flush();
     } catch (const dns::MasterLoaderError& e) {
         isc_throw(ZoneLoaderException, e.what());
     }
diff --git a/src/lib/dns/rrcollator.cc b/src/lib/dns/rrcollator.cc
index 1d30ce6e39..7090e6c4a4 100644
--- a/src/lib/dns/rrcollator.cc
+++ b/src/lib/dns/rrcollator.cc
@@ -95,7 +95,7 @@ RRCollator::getCallback() {
 }
 
 void
-RRCollator::finish() {
+RRCollator::flush() {
     if (impl_->current_rrset_) {
         impl_->callback_(impl_->current_rrset_);
         impl_->current_rrset_.reset();
diff --git a/src/lib/dns/rrcollator.h b/src/lib/dns/rrcollator.h
index 6028c07683..3a9e0aa019 100644
--- a/src/lib/dns/rrcollator.h
+++ b/src/lib/dns/rrcollator.h
@@ -78,7 +78,7 @@ public:
     /// impossible to predict how this class is used (to see if it's a very
     /// rare case where propagating an exception from a destructor is
     /// justified).  Instead, the application needs to make sure that
-    /// \c finish() is called before the object of this class is destroyed.
+    /// \c flush() is called before the object of this class is destroyed.
     ///
     /// \throw None
     ~RRCollator();
@@ -96,7 +96,7 @@ public:
     ///
     /// It propagates any exception thrown from the callback; otherwise it
     /// doesn't throw anything.
-    void finish();
+    void flush();
 
     /// \brief Return \c MasterLoader compatible callback.
     ///
diff --git a/src/lib/dns/tests/rrcollator_unittest.cc b/src/lib/dns/tests/rrcollator_unittest.cc
index 68b4fe3066..11e442e97c 100644
--- a/src/lib/dns/tests/rrcollator_unittest.cc
+++ b/src/lib/dns/tests/rrcollator_unittest.cc
@@ -138,12 +138,12 @@ TEST_F(RRCollatorTest, basicCases) {
                rdatas_);
 
     // Tell the collator we are done, then we'll see the last RR as an RRset.
-    collator_.finish();
+    collator_.flush();
     checkRRset(Name("txt.example.com"), RRClass::CH(), RRType::TXT(), rrttl_,
                rdatas_);
 
-    // Redundant finish() will be no-op.
-    collator_.finish();
+    // Redundant flush() will be no-op.
+    collator_.flush();
     EXPECT_TRUE(rrsets_.empty());
 }
 
@@ -154,7 +154,7 @@ TEST_F(RRCollatorTest, minTTLFirst) {
     rr_callback_(origin_, rrclass_, RRType::A(), RRTTL(20), a_rdata2_);
     rdatas_.push_back(a_rdata1_);
     rdatas_.push_back(a_rdata2_);
-    collator_.finish();
+    collator_.flush();
     checkRRset(origin_, rrclass_, RRType::A(), RRTTL(10), rdatas_);
 }
 
@@ -165,7 +165,7 @@ TEST_F(RRCollatorTest, maxTTLFirst) {
     rr_callback_(origin_, rrclass_, RRType::A(), RRTTL(10), a_rdata2_);
     rdatas_.push_back(a_rdata1_);
     rdatas_.push_back(a_rdata2_);
-    collator_.finish();
+    collator_.flush();
     checkRRset(origin_, rrclass_, RRType::A(), RRTTL(10), rdatas_);
 }
 
@@ -178,8 +178,8 @@ TEST_F(RRCollatorTest, addRRSIGs) {
     checkRRset(origin_, rrclass_, RRType::RRSIG(), rrttl_, rdatas_);
 }
 
-TEST_F(RRCollatorTest, emptyFinish) {
-    collator_.finish();
+TEST_F(RRCollatorTest, emptyFlush) {
+    collator_.flush();
     EXPECT_TRUE(rrsets_.empty());
 }
 
@@ -195,7 +195,7 @@ TEST_F(RRCollatorTest, throwFromCallback) {
 
     // We'll only see the A RR.
     throw_from_callback_ = false;
-    collator_.finish();
+    collator_.flush();
     rdatas_.push_back(a_rdata1_);
     checkRRset(origin_, rrclass_, RRType::A(), rrttl_, rdatas_);
 }
@@ -209,7 +209,7 @@ TEST_F(RRCollatorTest, withMasterLoader) {
                         MasterLoaderCallbacks::getNullCallbacks(),
                         collator_.getCallback());
     loader.load();
-    collator_.finish();
+    collator_.flush();
     rdatas_.push_back(a_rdata1_);
     checkRRset(origin_, rrclass_, RRType::A(), rrttl_, rdatas_);
 }