Browse Source

[trac1062] minor cleanup

Jelte Jansen 13 years ago
parent
commit
82667b0cdd
2 changed files with 7 additions and 4 deletions
  1. 1 4
      src/lib/datasrc/database.cc
  2. 6 0
      src/lib/datasrc/tests/database_unittest.cc

+ 1 - 4
src/lib/datasrc/database.cc

@@ -74,7 +74,7 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
     connection_.searchForRecords(zone_id_, name.toText());
     connection_.searchForRecords(zone_id_, name.toText());
 
 
     isc::dns::RRsetPtr result_rrset;
     isc::dns::RRsetPtr result_rrset;
-    ZoneFinder::Result result_status = NXRRSET;
+    ZoneFinder::Result result_status = SUCCESS;
 
 
     std::vector<std::string> columns;
     std::vector<std::string> columns;
     while (connection_.getNextRecord(columns)) {
     while (connection_.getNextRecord(columns)) {
@@ -123,9 +123,6 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
                                                                 getClass(),
                                                                 getClass(),
                                                                 columns[3]));
                                                                 columns[3]));
             result_status = CNAME;
             result_status = CNAME;
-        } else if (cur_type == isc::dns::RRType::RRSIG()) {
-            // if we have data already, check covered type
-            // if not, covered type must be CNAME or type requested
         }
         }
     }
     }
 
 

+ 6 - 0
src/lib/datasrc/tests/database_unittest.cc

@@ -202,6 +202,12 @@ TEST_F(DatabaseClientTest, find) {
     EXPECT_EQ(1, result4.rrset->getRdataCount());
     EXPECT_EQ(1, result4.rrset->getRdataCount());
     EXPECT_EQ(isc::dns::RRType::CNAME(), result4.rrset->getType());
     EXPECT_EQ(isc::dns::RRType::CNAME(), result4.rrset->getType());
 
 
+    ZoneFinder::FindResult result5 = finder->find(isc::dns::Name("doesnotexist.example.org."),
+                                                  isc::dns::RRType::A(),
+                                                  NULL, ZoneFinder::FIND_DEFAULT);
+    ASSERT_EQ(ZoneFinder::NXDOMAIN, result5.code);
+    EXPECT_EQ(isc::dns::ConstRRsetPtr(), result5.rrset);
+
     EXPECT_THROW(finder->find(isc::dns::Name("emptyvector.example.org."),
     EXPECT_THROW(finder->find(isc::dns::Name("emptyvector.example.org."),
                                               isc::dns::RRType::A(),
                                               isc::dns::RRType::A(),
                                               NULL, ZoneFinder::FIND_DEFAULT),
                                               NULL, ZoneFinder::FIND_DEFAULT),