From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Mon, 29 Oct 2012 12:21:53 +0000 (+0100)
Subject: [2209] Rename DataSourceInfo::segment_
X-Git-Tag: trac2487_base~21^2~8^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb8ce6a031254899bc2fdc101e5e279bed51829d;p=thirdparty%2Fkea.git

[2209] Rename DataSourceInfo::segment_

To ztable_segment_. The previous could be misunderstood, we have other
segments too.
---

diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index 448277d0fb..d28b822bfc 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -50,7 +50,7 @@ ConfigurableClientList::DataSourceInfo::DataSourceInfo(
 {
     if (has_cache) {
         cache_.reset(new InMemoryClient(segment, rrclass));
-        segment_ = segment;
+        ztable_segment_ = segment;
     }
 }
 
@@ -61,7 +61,7 @@ ConfigurableClientList::DataSourceInfo::DataSourceInfo(
 {
     if (has_cache) {
         cache_.reset(new InMemoryClient(segment, rrclass));
-        segment_ = segment;
+        ztable_segment_ = segment;
     }
 }
 
@@ -448,7 +448,7 @@ ConfigurableClientList::getCachedZoneWriter(const Name& name) {
     }
     return (ZoneWriterPair(ZONE_SUCCESS,
                            ZoneWriterPtr(
-                               result.info->segment_->
+                               result.info->ztable_segment_->
                                getZoneWriter(load_action, name, rrclass_))));
 }
 
diff --git a/src/lib/datasrc/client_list.h b/src/lib/datasrc/client_list.h
index 9df4950f95..5f792378bc 100644
--- a/src/lib/datasrc/client_list.h
+++ b/src/lib/datasrc/client_list.h
@@ -353,7 +353,7 @@ public:
         // No other applications or tests may use it.
         const DataSourceClient* getCacheClient() const;
         boost::shared_ptr<memory::InMemoryClient> cache_;
-        boost::shared_ptr<memory::ZoneTableSegment> segment_;
+        boost::shared_ptr<memory::ZoneTableSegment> ztable_segment_;
     };
 
     /// \brief The collection of data sources.
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index fff2936083..be593fe6a1 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -293,7 +293,7 @@ public:
         ConfigurableClientList::DataSourceInfo& dsrc_info =
                 list_->getDataSources()[index];
         dsrc_info.cache_ = cache;
-        dsrc_info.segment_ = ztable_segment_;
+        dsrc_info.ztable_segment_ = ztable_segment_;
     }
     // Check the positive result is as we expect it.
     void positiveResult(const ClientList::FindResult& result,