[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 448277d0fb65d1cfdbfbafdd149bfa00cb5b0ac8..d28b822bfc3b9a405a5a058b6bc643f45cf8279e 100644 (file)
--- 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 9df4950f9591bb5aa55379045a7a0b7f8c96f356..5f792378bc756f1326ca1779c7a09809326720dc 100644 (file)
--- 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 fff2936083522148fbe3742721ec6343baacab17..be593fe6a158e19cccf3e0cd57ec909c0436bf54 100644 (file)
--- 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,