Commit e2757e28 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

cleanup: removed unused "Query" parameter from various data source methods


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1316 e5f2f494-b856-4b98-b285-d166d9295462
parent 6950466e
......@@ -142,25 +142,25 @@ chaseCname(Query& q, QueryTaskPtr task, RRsetPtr rrset)
// Perform the query specified in a QueryTask object
static DataSrc::Result
doQueryTask(const DataSrc* ds, const Name* zonename, Query& q, QueryTask& task,
doQueryTask(const DataSrc* ds, const Name* zonename, QueryTask& task,
RRsetList& target)
{
switch (task.op) {
case QueryTask::AUTH_QUERY:
return (ds->findRRset(q, task.qname, task.qclass, task.qtype,
return (ds->findRRset(task.qname, task.qclass, task.qtype,
target, task.flags, zonename));
case QueryTask::SIMPLE_QUERY:
return (ds->findExactRRset(q, task.qname, task.qclass, task.qtype,
return (ds->findExactRRset(task.qname, task.qclass, task.qtype,
target, task.flags, zonename));
case QueryTask::GLUE_QUERY:
case QueryTask::NOGLUE_QUERY:
return (ds->findAddrs(q, task.qname, task.qclass, target,
return (ds->findAddrs(task.qname, task.qclass, target,
task.flags, zonename));
case QueryTask::REF_QUERY:
return (ds->findReferral(q, task.qname, task.qclass, target,
return (ds->findReferral(task.qname, task.qclass, target,
task.flags, zonename));
}
......@@ -191,7 +191,7 @@ refQuery(const Name& name, Query& q, const DataSrc* ds, const Name* zonename,
{
QueryTask newtask(name, q.qclass(), QueryTask::REF_QUERY);
if (doQueryTask(ds, zonename, q, newtask, target) != DataSrc::SUCCESS) {
if (doQueryTask(ds, zonename, newtask, target) != DataSrc::SUCCESS) {
// Lookup failed
return (false);
}
......@@ -269,7 +269,7 @@ addSOA(Query& q, const Name* zonename, const DataSrc* ds) {
QueryTask newtask(*zonename, q.qclass(), RRType::SOA(),
QueryTask::SIMPLE_QUERY);
RETERR(doQueryTask(ds, zonename, q, newtask, soa));
RETERR(doQueryTask(ds, zonename, newtask, soa));
if (newtask.flags != 0) {
return (DataSrc::ERROR);
}
......@@ -287,7 +287,7 @@ addNSEC(Query& q, const QueryTaskPtr task, const Name& name,
QueryTask newtask(name, task->qclass, RRType::NSEC(),
QueryTask::SIMPLE_QUERY);
RETERR(doQueryTask(ds, &zonename, q, newtask, nsec));
RETERR(doQueryTask(ds, &zonename, newtask, nsec));
if (newtask.flags == 0) {
m.addRRset(Section::AUTHORITY(), nsec[RRType::NSEC()], true);
}
......@@ -296,11 +296,11 @@ addNSEC(Query& q, const QueryTaskPtr task, const Name& name,
}
static inline DataSrc::Result
getNsec3(Query& q, const DataSrc* ds, const Name& zonename, string& hash,
getNsec3(const DataSrc* ds, const Name& zonename, string& hash,
RRsetPtr& target)
{
RRsetList rl;
RETERR(ds->findCoveringNSEC3(q, zonename, hash, rl));
RETERR(ds->findCoveringNSEC3(zonename, hash, rl));
target = rl[RRType::NSEC3()];
return (DataSrc::SUCCESS);
}
......@@ -312,7 +312,7 @@ getNsec3Param(Query& q, const DataSrc* ds, const Name& zonename) {
QueryTask newtask(zonename, q.qclass(), RRType::NSEC3PARAM(),
QueryTask::SIMPLE_QUERY);
result = doQueryTask(ds, &zonename, q, newtask, nsec3param);
result = doQueryTask(ds, &zonename, newtask, nsec3param);
newtask.flags &= ~DataSrc::REFERRAL;
if (result != DataSrc::SUCCESS || newtask.flags != 0) {
return (ConstNsec3ParamPtr());
......@@ -347,7 +347,7 @@ proveNX(Query& q, QueryTaskPtr task, const DataSrc* ds, const Name& zonename)
// Attach the NSEC3 record covering the QNAME
RRsetPtr rrset;
string hash1(nsec3->getHash(task->qname)), hash2;
RETERR(getNsec3(q, ds, zonename, hash1, rrset));
RETERR(getNsec3(ds, zonename, hash1, rrset));
m.addRRset(Section::AUTHORITY(), rrset, true);
// If this is an NXRRSET or NOERROR/NODATA, we're done
......@@ -370,7 +370,7 @@ proveNX(Query& q, QueryTaskPtr task, const DataSrc* ds, const Name& zonename)
// hash2 will be overwritten with the actual hash found;
// we don't want to use one until we find an exact match
RETERR(getNsec3(q, ds, zonename, hash2, rrset));
RETERR(getNsec3(ds, zonename, hash2, rrset));
if (hash2 == nodehash) {
m.addRRset(Section::AUTHORITY(), rrset, true);
break;
......@@ -380,14 +380,14 @@ proveNX(Query& q, QueryTaskPtr task, const DataSrc* ds, const Name& zonename)
// Now add a covering NSEC3 for a wildcard under the
// closest provable enclosing name
string hash3(nsec3->getHash(Name("*").concatenate(enclosure)));
RETERR(getNsec3(q, ds, zonename, hash3, rrset));
RETERR(getNsec3(ds, zonename, hash3, rrset));
if (hash3 != hash1 && hash3 != hash2) {
m.addRRset(Section::AUTHORITY(), rrset, true);
}
} else {
Name nsecname(task->qname);
if ((task->flags & DataSrc::NAME_NOT_FOUND) != 0) {
ds->findPreviousName(q, task->qname, nsecname, &zonename);
ds->findPreviousName(task->qname, nsecname, &zonename);
}
RETERR(addNSEC(q, task, nsecname, zonename, ds));
......@@ -432,7 +432,7 @@ tryWildcard(Query& q, QueryTaskPtr task, const DataSrc* ds,
const Name& wname(star.concatenate(task->qname.split(i, nlen - i)));
QueryTask newtask(wname, task->qclass, task->qtype,
QueryTask::SIMPLE_QUERY);
result = doQueryTask(ds, zonename, q, newtask, wild);
result = doQueryTask(ds, zonename, newtask, wild);
if (result == DataSrc::SUCCESS &&
(newtask.flags == 0 || (newtask.flags & DataSrc::CNAME_FOUND))) {
rflags = newtask.flags;
......@@ -524,7 +524,7 @@ DataSrc::doQuery(Query& q)
continue;
}
result = doQueryTask(datasource, zonename, q, *task, data);
result = doQueryTask(datasource, zonename, *task, data);
if (result != SUCCESS) {
m.setRcode(Rcode::SERVFAIL());
return;
......@@ -669,8 +669,7 @@ DataSrc::doQuery(Query& q)
Name nsecname(task->qname);
if ((task->flags & NAME_NOT_FOUND) != 0) {
datasource->findPreviousName(q, task->qname, nsecname,
zonename);
datasource->findPreviousName(task->qname, nsecname, zonename);
}
if (q.wantDnssec()) {
......@@ -707,7 +706,7 @@ DataSrc::doQuery(Query& q)
}
DataSrc::Result
DataSrc::findAddrs(const Query& q, const Name& qname, const RRClass& qclass,
DataSrc::findAddrs(const Name& qname, const RRClass& qclass,
RRsetList& target, uint32_t& flags,
const Name* zonename) const
{
......@@ -715,13 +714,13 @@ DataSrc::findAddrs(const Query& q, const Name& qname, const RRClass& qclass,
bool a = false, aaaa = false;
flags = 0;
r = findExactRRset(q, qname, qclass, RRType::A(), target, flags, zonename);
r = findExactRRset(qname, qclass, RRType::A(), target, flags, zonename);
if (r == SUCCESS && flags == 0) {
a = true;
}
flags = 0;
r = findExactRRset(q, qname, qclass, RRType::AAAA(), target, flags,
r = findExactRRset(qname, qclass, RRType::AAAA(), target, flags,
zonename);
if (r == SUCCESS && flags == 0) {
aaaa = true;
......@@ -737,7 +736,7 @@ DataSrc::findAddrs(const Query& q, const Name& qname, const RRClass& qclass,
}
DataSrc::Result
DataSrc::findReferral(const Query& q, const Name& qname, const RRClass& qclass,
DataSrc::findReferral(const Name& qname, const RRClass& qclass,
RRsetList& target, uint32_t& flags,
const Name* zonename) const
{
......@@ -745,7 +744,7 @@ DataSrc::findReferral(const Query& q, const Name& qname, const RRClass& qclass,
bool ns = false, ds = false, dname = false;
flags = 0;
r = findExactRRset(q, qname, qclass, RRType::NS(), target, flags, zonename);
r = findExactRRset(qname, qclass, RRType::NS(), target, flags, zonename);
if (r == SUCCESS && flags == 0) {
ns = true;
} else if ((flags & (NO_SUCH_ZONE|NAME_NOT_FOUND))) {
......@@ -753,7 +752,7 @@ DataSrc::findReferral(const Query& q, const Name& qname, const RRClass& qclass,
}
flags = 0;
r = findExactRRset(q, qname, qclass, RRType::DS(), target, flags, zonename);
r = findExactRRset(qname, qclass, RRType::DS(), target, flags, zonename);
if (r == SUCCESS && flags == 0) {
ds = true;
} else if ((flags & (NO_SUCH_ZONE|NAME_NOT_FOUND))) {
......@@ -761,7 +760,7 @@ DataSrc::findReferral(const Query& q, const Name& qname, const RRClass& qclass,
}
flags = 0;
r = findExactRRset(q, qname, qclass, RRType::DNAME(), target, flags,
r = findExactRRset(qname, qclass, RRType::DNAME(), target, flags,
zonename);
if (r == SUCCESS && flags == 0) {
dname = true;
......
......@@ -110,16 +110,14 @@ public:
// Mandatory 'low-level' methods: These will NOT be implemented by
// the general DataSrc class; subclasses MUST implement them.
virtual Result findRRset(const Query& q,
const isc::dns::Name& qname,
virtual Result findRRset(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
const isc::dns::RRType& qtype,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const = 0;
virtual Result findExactRRset(const Query& q,
const isc::dns::Name& qname,
virtual Result findExactRRset(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
const isc::dns::RRType& qtype,
isc::dns::RRsetList& target,
......@@ -128,15 +126,13 @@ public:
// These will have dumb implementations in the general DataSrc
// class, and SHOULD be overwritten by subclasses.
virtual Result findAddrs(const Query& q,
const isc::dns::Name& qname,
virtual Result findAddrs(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const = 0;
virtual Result findReferral(const Query& q,
const isc::dns::Name& qname,
virtual Result findReferral(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
isc::dns::RRsetList& target,
uint32_t& flags,
......@@ -144,15 +140,13 @@ public:
// This MUST be implemented by concrete data sources which support
// DNSSEC, but is optional for others (e.g., the static data source).
virtual Result findPreviousName(const Query& q,
const isc::dns::Name& qname,
virtual Result findPreviousName(const isc::dns::Name& qname,
isc::dns::Name& target,
const isc::dns::Name* zonename) const = 0;
// This MUST be implemented by concrete data sources which support
// NSEC3, but is optional for others
virtual Result findCoveringNSEC3(const Query& q,
const isc::dns::Name& zonename,
virtual Result findCoveringNSEC3(const isc::dns::Name& zonename,
std::string& hash,
isc::dns::RRsetList& target) const = 0;
};
......@@ -189,43 +183,37 @@ public:
{ return NOT_IMPLEMENTED; }
Result close() { return NOT_IMPLEMENTED; }
virtual Result findRRset(const Query& q,
const isc::dns::Name& qname,
virtual Result findRRset(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
const isc::dns::RRType& qtype,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const = 0;
virtual Result findExactRRset(const Query& q,
const isc::dns::Name& qname,
virtual Result findExactRRset(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
const isc::dns::RRType& qtype,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const = 0;
virtual Result findAddrs(const Query& q,
const isc::dns::Name& qname,
virtual Result findAddrs(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
virtual Result findReferral(const Query& q,
const isc::dns::Name& qname,
virtual Result findReferral(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
virtual Result findPreviousName(const Query& q,
const isc::dns::Name& qname,
virtual Result findPreviousName(const isc::dns::Name& qname,
isc::dns::Name& target,
const isc::dns::Name* zonename) const = 0;
virtual Result findCoveringNSEC3(const Query& q,
const isc::dns::Name& zonename,
virtual Result findCoveringNSEC3(const isc::dns::Name& zonename,
std::string& hash,
isc::dns::RRsetList& target) const = 0;
......@@ -264,8 +252,7 @@ public:
// to get a pointer to the best concrete data source for the specified
// zone, then send all queries directly to that data source.
Result findRRset(const Query& q UNUSED_PARAM,
const isc::dns::Name& qname UNUSED_PARAM,
Result findRRset(const isc::dns::Name& qname UNUSED_PARAM,
const isc::dns::RRClass& qclass UNUSED_PARAM,
const isc::dns::RRType& qtype UNUSED_PARAM,
isc::dns::RRsetList& target UNUSED_PARAM,
......@@ -275,8 +262,7 @@ public:
return (NOT_IMPLEMENTED);
}
Result findExactRRset(const Query& q UNUSED_PARAM,
const isc::dns::Name& qname UNUSED_PARAM,
Result findExactRRset(const isc::dns::Name& qname UNUSED_PARAM,
const isc::dns::RRClass& qclass UNUSED_PARAM,
const isc::dns::RRType& qtype UNUSED_PARAM,
isc::dns::RRsetList& target UNUSED_PARAM,
......@@ -286,8 +272,7 @@ public:
return (NOT_IMPLEMENTED);
}
Result findAddrs(const Query& q UNUSED_PARAM,
const isc::dns::Name& qname UNUSED_PARAM,
Result findAddrs(const isc::dns::Name& qname UNUSED_PARAM,
const isc::dns::RRClass& qclass UNUSED_PARAM,
isc::dns::RRsetList& target UNUSED_PARAM,
uint32_t& flags UNUSED_PARAM,
......@@ -296,8 +281,7 @@ public:
return (NOT_IMPLEMENTED);
}
Result findReferral(const Query& q UNUSED_PARAM,
const isc::dns::Name& qname UNUSED_PARAM,
Result findReferral(const isc::dns::Name& qname UNUSED_PARAM,
const isc::dns::RRClass& qclass UNUSED_PARAM,
isc::dns::RRsetList& target UNUSED_PARAM,
uint32_t& flags UNUSED_PARAM,
......@@ -307,7 +291,6 @@ public:
}
virtual Result findPreviousName(
const Query& q UNUSED_PARAM,
const isc::dns::Name& qname UNUSED_PARAM,
isc::dns::Name& target UNUSED_PARAM,
const isc::dns::Name* zonename UNUSED_PARAM) const
......@@ -316,7 +299,6 @@ public:
}
virtual Result findCoveringNSEC3(
const Query& q UNUSED_PARAM,
const isc::dns::Name& zonename UNUSED_PARAM,
std::string& hash UNUSED_PARAM,
isc::dns::RRsetList& target UNUSED_PARAM) const
......
......@@ -505,8 +505,7 @@ Sqlite3DataSrc::findClosestEnclosure(NameMatch& match,
}
DataSrc::Result
Sqlite3DataSrc::findPreviousName(const Query& q,
const Name& qname,
Sqlite3DataSrc::findPreviousName(const Name& qname,
Name& target,
const Name* zonename) const
{
......@@ -544,8 +543,7 @@ Sqlite3DataSrc::findPreviousName(const Query& q,
}
DataSrc::Result
Sqlite3DataSrc::findCoveringNSEC3(const Query& q,
const Name& zonename,
Sqlite3DataSrc::findCoveringNSEC3(const Name& zonename,
string& hashstr,
RRsetList& target) const
{
......@@ -616,8 +614,7 @@ Sqlite3DataSrc::findCoveringNSEC3(const Query& q,
}
DataSrc::Result
Sqlite3DataSrc::findRRset(const Query& q,
const Name& qname,
Sqlite3DataSrc::findRRset(const Name& qname,
const RRClass& qclass,
const RRType& qtype,
RRsetList& target,
......@@ -629,8 +626,7 @@ Sqlite3DataSrc::findRRset(const Query& q,
}
DataSrc::Result
Sqlite3DataSrc::findExactRRset(const Query& q,
const Name& qname,
Sqlite3DataSrc::findExactRRset(const Name& qname,
const RRClass& qclass,
const RRType& qtype,
RRsetList& target,
......@@ -652,8 +648,7 @@ Sqlite3DataSrc::findExactRRset(const Query& q,
}
DataSrc::Result
Sqlite3DataSrc::findAddrs(const Query& q,
const Name& qname,
Sqlite3DataSrc::findAddrs(const Name& qname,
const RRClass& qclass,
RRsetList& target,
uint32_t& flags,
......@@ -664,8 +659,7 @@ Sqlite3DataSrc::findAddrs(const Query& q,
}
DataSrc::Result
Sqlite3DataSrc::findReferral(const Query& q,
const Name& qname,
Sqlite3DataSrc::findReferral(const Name& qname,
const RRClass& qclass,
RRsetList& target,
uint32_t& flags,
......
......@@ -62,43 +62,37 @@ public:
void findClosestEnclosure(NameMatch& match,
const isc::dns::RRClass& qclass) const;
Result findRRset(const Query& q,
const isc::dns::Name& qname,
Result findRRset(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
const isc::dns::RRType& qtype,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
Result findExactRRset(const Query& q,
const isc::dns::Name& qname,
Result findExactRRset(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
const isc::dns::RRType& qtype,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
Result findAddrs(const Query& q,
const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
Result findAddrs(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
Result findReferral(const Query& q,
const isc::dns::Name& qname,
Result findReferral(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
DataSrc::Result findPreviousName(const Query& q,
const isc::dns::Name& qname,
DataSrc::Result findPreviousName(const isc::dns::Name& qname,
isc::dns::Name& target,
const isc::dns::Name* zonename) const;
Result findCoveringNSEC3(const Query& q,
const isc::dns::Name& zonename,
Result findCoveringNSEC3(const isc::dns::Name& zonename,
std::string& hash,
isc::dns::RRsetList& target) const;
......
......@@ -14,6 +14,8 @@
// $Id$
#include "config.h"
#include <dns/name.h>
#include <dns/rdataclass.h>
#include <dns/rrclass.h>
......@@ -126,7 +128,7 @@ StaticDataSrc::findClosestEnclosure(NameMatch& match,
}
DataSrc::Result
StaticDataSrc::findRRset(const Query& q, const Name& qname,
StaticDataSrc::findRRset(const Name& qname,
const RRClass& qclass, const RRType& qtype,
RRsetList& target, uint32_t& flags,
const Name* zonename) const
......@@ -164,24 +166,26 @@ StaticDataSrc::findRRset(const Query& q, const Name& qname,
}
DataSrc::Result
StaticDataSrc::findExactRRset(const Query& q, const Name& qname,
StaticDataSrc::findExactRRset(const Name& qname,
const RRClass& qclass, const RRType& qtype,
RRsetList& target, uint32_t& flags,
const Name* zonename) const
{
return (findRRset(q, qname, qclass, qtype, target, flags, zonename));
return (findRRset(qname, qclass, qtype, target, flags, zonename));
}
DataSrc::Result
StaticDataSrc::findPreviousName(const Query& q, const Name& qname,
Name& target, const Name* zonename) const
StaticDataSrc::findPreviousName(const Name& qname UNUSED_PARAM,
Name& target UNUSED_PARAM,
const Name* zonename UNUSED_PARAM) const
{
return (NOT_IMPLEMENTED);
}
DataSrc::Result
StaticDataSrc::findCoveringNSEC3(const Query& q, const Name& zonename,
string& hash, RRsetList& target) const
StaticDataSrc::findCoveringNSEC3(const Name& zonename UNUSED_PARAM,
string& hash UNUSED_PARAM,
RRsetList& target UNUSED_PARAM) const
{
return (NOT_IMPLEMENTED);
}
......
......@@ -61,29 +61,25 @@ public:
void findClosestEnclosure(NameMatch& match,
const isc::dns::RRClass& qclass) const;
Result findRRset(const Query& q,
const isc::dns::Name& qname,
Result findRRset(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
const isc::dns::RRType& qtype,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
Result findExactRRset(const Query& q,
const isc::dns::Name& qname,
Result findExactRRset(const isc::dns::Name& qname,
const isc::dns::RRClass& qclass,
const isc::dns::RRType& qtype,
isc::dns::RRsetList& target,
uint32_t& flags,
const isc::dns::Name* zonename) const;
Result findPreviousName(const Query& q,
const isc::dns::Name& qname,
Result findPreviousName(const isc::dns::Name& qname,
isc::dns::Name& target,
const isc::dns::Name* zonename) const;
Result findCoveringNSEC3(const Query& q,
const isc::dns::Name& zonename,
Result findCoveringNSEC3(const isc::dns::Name& zonename,
std::string& hash,
isc::dns::RRsetList& target) const;
......
This diff is collapsed.
......@@ -41,20 +41,12 @@ using namespace isc::auth;
namespace {
class StaticDataSourceTest : public ::testing::Test {
protected:
StaticDataSourceTest() : message(Message::PARSE),
query(NULL),
version_name("version.bind"),
StaticDataSourceTest() : version_name("version.bind"),
authors_name("authors.bind"),
nomatch_name("example.com"),
rrclass(RRClass::CH()), rrtype(RRType::TXT()),
rrttl(RRTTL(0)), find_flags(0), matched_rdata(0)
{
// static data source will ignore the message, and the encapsulating
// query object so the content doesn't matter.
// (it's a bad practice, but it's a different issue)
message.addQuestion(Question(Name(version_name), rrclass, rrtype));
query = new Query(message, true);
// XXX: the following values can change as release/developers change,
// in which case the test code must be updated accordingly.
version_data.push_back("BIND10 0.0.0 (pre-alpha)");
......@@ -75,10 +67,7 @@ protected:
version_ns_data.push_back("version.bind.");
authors_ns_data.push_back("authors.bind.");
}
~StaticDataSourceTest() { delete query; }
StaticDataSrc data_source;
Message message;
Query* query;
const Name version_name;
const Name authors_name;
const Name nomatch_name;
......@@ -168,7 +157,7 @@ TEST_F(StaticDataSourceTest, findClosestEnclosureNoMatch) {
TEST_F(StaticDataSourceTest, findRRsetVersionTXT) {
EXPECT_EQ(DataSrc::SUCCESS,
data_source.findRRset(*query, version_name, rrclass, rrtype,
data_source.findRRset(version_name, rrclass, rrtype,
result_sets, find_flags, NULL));
EXPECT_EQ(0, find_flags);
// There should be only item in result_sets, which should be
......@@ -186,7 +175,7 @@ TEST_F(StaticDataSourceTest, findRRsetVersionTXT) {
TEST_F(StaticDataSourceTest, findRRsetVersionNS) {
rrtype = RRType::NS();
EXPECT_EQ(DataSrc::SUCCESS,