Commit fb8ce6a0 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[2209] Rename DataSourceInfo::segment_

To ztable_segment_. The previous could be misunderstood, we have other
segments too.
parent 85ccee0a
......@@ -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_))));
}
......
......@@ -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.
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment