Commit all left commit changes

src/lib/cache/Makefile.am

@@ -21,7 +21,7 @@ AM_CXXFLAGS += -Wno-unused-parameter
 endif
 
 lib_LTLIBRARIES = libcache.la
-libcache_la_SOURCES  = recursor_cache.h recursor_cache.cc
+libcache_la_SOURCES  = resolver_cache.h resolver_cache.cc
 libcache_la_SOURCES  += message_cache.h message_cache.cc
 libcache_la_SOURCES  += message_entry.h message_entry.cc
 libcache_la_SOURCES  += rrset_cache.h rrset_cache.cc

src/lib/cache/message_entry.h

@@ -47,7 +47,7 @@ struct RRsetRef{
 
 /// \brief Message Entry
 /// The object of MessageEntry represents one response message
-/// answered to the recursor client.
+/// answered to the resolver client.
 class MessageEntry : public NsasEntry<MessageEntry>,
                      public boost::noncopyable
 {

src/lib/cache/resolver_cache.cc

@@ -14,7 +14,7 @@
 
 // $Id$
 
-#include "recursor_cache.h"
+#include "resolver_cache.h"
 #include "dns/message.h"
 #include "rrset_cache.h"
 #include <string>
@@ -26,7 +26,7 @@ using namespace std;
 namespace isc {
 namespace cache {
 
-RecursorCache::RecursorCache() {
+ResolverCache::ResolverCache() {
     uint16_t klass = 1; // class 'IN'
     class_supported_.push_back(klass);
     local_zone_data_[klass] = LocalZoneDataPtr(new LocalZoneData(klass));
@@ -36,7 +36,7 @@ RecursorCache::RecursorCache() {
                                                         klass));
 }
 
-RecursorCache::RecursorCache(std::vector<CacheSizeInfo> caches_size) {
+ResolverCache::ResolverCache(std::vector<CacheSizeInfo> caches_size) {
     uint32_t index = 0;
     uint32_t size = caches_size.size();
     for (; index < size; ++index) {
@@ -57,13 +57,13 @@ RecursorCache::RecursorCache(std::vector<CacheSizeInfo> caches_size) {
 }
 
 bool
-RecursorCache::classIsSupported(uint16_t klass) const {
+ResolverCache::classIsSupported(uint16_t klass) const {
     return binary_search(class_supported_.begin(),
                          class_supported_.end(), klass);
 }
 
 bool
-RecursorCache::lookup(const isc::dns::Name& qname,
+ResolverCache::lookup(const isc::dns::Name& qname,
                const isc::dns::RRType& qtype,
                const isc::dns::RRClass& qclass,
                isc::dns::Message& response) const
@@ -92,7 +92,7 @@ RecursorCache::lookup(const isc::dns::Name& qname,
 }
 
 isc::dns::RRsetPtr
-RecursorCache::lookup(const isc::dns::Name& qname,
+ResolverCache::lookup(const isc::dns::Name& qname,
                const isc::dns::RRType& qtype,
                const isc::dns::RRClass& qclass) const
 {
@@ -118,7 +118,7 @@ RecursorCache::lookup(const isc::dns::Name& qname,
 }
 
 isc::dns::RRsetPtr
-RecursorCache::lookupClosestRRset(const isc::dns::Name& qname,
+ResolverCache::lookupClosestRRset(const isc::dns::Name& qname,
                                   const isc::dns::RRType& qtype,
                                   const isc::dns::RRClass& qclass) const
 {
@@ -138,7 +138,7 @@ RecursorCache::lookupClosestRRset(const isc::dns::Name& qname,
 }
 
 bool
-RecursorCache::update(const isc::dns::Message& msg) {
+ResolverCache::update(const isc::dns::Message& msg) {
     QuestionIterator iter = msg.beginQuestion();
     uint16_t klass = (*iter)->getClass().getCode();
     if (!classIsSupported(klass)) {
@@ -149,7 +149,7 @@ RecursorCache::update(const isc::dns::Message& msg) {
 }
 
 bool
-RecursorCache::updateRRsetCache(const isc::dns::ConstRRsetPtr rrset_ptr,
+ResolverCache::updateRRsetCache(const isc::dns::ConstRRsetPtr rrset_ptr,
                                 RRsetCachePtr rrset_cache_ptr)
 {
     RRsetTrustLevel level;
@@ -165,7 +165,7 @@ RecursorCache::updateRRsetCache(const isc::dns::ConstRRsetPtr rrset_ptr,
 }
 
 bool
-RecursorCache::update(const isc::dns::ConstRRsetPtr rrset_ptr) {
+ResolverCache::update(const isc::dns::ConstRRsetPtr rrset_ptr) {
     uint16_t klass = rrset_ptr->getClass().getCode();
     if (!classIsSupported(klass)) {
         return false;
@@ -178,12 +178,12 @@ RecursorCache::update(const isc::dns::ConstRRsetPtr rrset_ptr) {
 }
 
 void
-RecursorCache::dump(const std::string&) {
+ResolverCache::dump(const std::string&) {
     //TODO
 }
 
 void
-RecursorCache::load(const std::string&) {
+ResolverCache::load(const std::string&) {
     //TODO
 }
 

src/lib/cache/resolver_cache.h

@@ -14,8 +14,8 @@
 
 // $Id$
 
-#ifndef __RECURSOR_CACHE_H
-#define __RECURSOR_CACHE_H
+#ifndef __RESOLVER_CACHE_H
+#define __RESOLVER_CACHE_H
 
 #include <map>
 #include <string>
@@ -67,22 +67,22 @@ public:
 };
 
 ///
-/// \brief Recursor Cache.
-/// The object of RecursorCache represents the cache of the recursor. It may holds
+/// \brief Resolver Cache.
+/// The object of ResolverCache represents the cache of the resolver. It may holds
 /// a list of message/rrset cache which are in different class.
 ///
-class RecursorCache {
+class ResolverCache {
 public:
     /// \brief Default Construct Function.
     ///  Only support for class "IN", and message cache size is
     /// MESSAGE_CACHE_DEFAULT_SIZE, rrset cache size is
     /// RRSET_CACHE_DEFAULT_SIZE
-    RecursorCache();
+    ResolverCache();
 
     /// \brief Construct Function.
     /// \param caches_size cache size information for each
     ///        messages/rrsets of different classes.
-    RecursorCache(std::vector<CacheSizeInfo> caches_size);
+    ResolverCache(std::vector<CacheSizeInfo> caches_size);
 
     /// \name Lookup Interfaces
     //@{
@@ -198,5 +198,5 @@ protected:
 } // namespace cache
 } // namespace isc
 
-#endif // __RECURSOR_CACHE_H
+#endif // __RESOLVER_CACHE_H
 

src/lib/cache/tests/Makefile.am

@@ -17,7 +17,7 @@ endif
 # Some versions of GCC warn about some versions of Boost regarding
 # missing initializer for members in its posix_time.
 # https://svn.boost.org/trac/boost/ticket/3477
-# But older GCC compilers don't have the flag.     
+# But older GCC compilers don't have the flag.
 AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 
 if USE_CLANGPP
@@ -37,7 +37,7 @@ run_unittests_SOURCES  += rrset_cache_unittest.cc
 run_unittests_SOURCES  += message_cache_unittest.cc
 run_unittests_SOURCES  += message_entry_unittest.cc
 run_unittests_SOURCES  += local_zone_data_unittest.cc
-run_unittests_SOURCES  += recursor_cache_unittest.cc
+run_unittests_SOURCES  += resolver_cache_unittest.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)

src/lib/cache/tests/message_cache_unittest.cc

@@ -20,7 +20,7 @@
 #include <dns/buffer.h>
 #include "../message_cache.h"
 #include "../rrset_cache.h"
-#include "../recursor_cache.h"
+#include "../resolver_cache.h"
 #include "cache_test_util.h"
 
 using namespace isc::cache;

src/lib/cache/tests/message_entry_unittest.cc

@@ -21,7 +21,7 @@
 #include <dns/buffer.h>
 #include "../message_entry.h"
 #include "../rrset_cache.h"
-#include "../recursor_cache.h"
+#include "../resolver_cache.h"
 #include "cache_test_util.h"
 
 using namespace isc::cache;

src/lib/cache/tests/resolver_cache_unittest.cc

@@ -17,7 +17,7 @@
 #include <string>
 #include <gtest/gtest.h>
 #include <dns/rrset.h>
-#include "recursor_cache.h"
+#include "resolver_cache.h"
 #include "cache_test_util.h"
 
 using namespace isc::cache;
@@ -26,21 +26,21 @@ using namespace std;
 
 namespace {
 
-class RecursorCacheTest: public testing::Test {
+class ResolverCacheTest: public testing::Test {
 public:
-    RecursorCacheTest() {
+    ResolverCacheTest() {
         vector<CacheSizeInfo> vec;
         CacheSizeInfo class_in(1, 100, 200);
         CacheSizeInfo class_ch(3, 100, 200);
         vec.push_back(class_in);
         vec.push_back(class_ch);
-        cache = RecursorCache(vec);
+        cache = ResolverCache(vec);
     }
 
-    RecursorCache cache;
+    ResolverCache cache;
 };
 
-TEST_F(RecursorCacheTest, testUpdateMessage) {
+TEST_F(ResolverCacheTest, testUpdateMessage) {
     Message msg(Message::PARSE);
     messageFromFile(msg, "message_fromWire3");
     cache.update(msg);
@@ -63,7 +63,7 @@ TEST_F(RecursorCacheTest, testUpdateMessage) {
     EXPECT_FALSE(new_msg.getHeaderFlag(Message::HEADERFLAG_AA));
 }
 
-TEST_F(RecursorCacheTest, testUpdateRRset) {
+TEST_F(ResolverCacheTest, testUpdateRRset) {
     Message msg(Message::PARSE);
     messageFromFile(msg, "message_fromWire3");
     cache.update(msg);
@@ -94,7 +94,7 @@ TEST_F(RecursorCacheTest, testUpdateRRset) {
     EXPECT_EQ(0, section_rrset_count(new_msg, Message::SECTION_ADDITIONAL));
 }
 
-TEST_F(RecursorCacheTest, testLookupUnsupportedClass) {
+TEST_F(ResolverCacheTest, testLookupUnsupportedClass) {
     Message msg(Message::PARSE);
     messageFromFile(msg, "message_fromWire3");
     cache.update(msg);
@@ -107,7 +107,7 @@ TEST_F(RecursorCacheTest, testLookupUnsupportedClass) {
     EXPECT_FALSE(cache.lookup(qname, qtype, RRClass(2)));
 }
 
-TEST_F(RecursorCacheTest, testLookupClosestRRset) {
+TEST_F(ResolverCacheTest, testLookupClosestRRset) {
     Message msg(Message::PARSE);
     messageFromFile(msg, "message_fromWire3");
     cache.update(msg);
@@ -128,7 +128,7 @@ TEST_F(RecursorCacheTest, testLookupClosestRRset) {
     EXPECT_FALSE(rrset_ptr);
 }
 
-TEST_F(RecursorCacheTest, testClassIsSupported) {
+TEST_F(ResolverCacheTest, testClassIsSupported) {
     EXPECT_TRUE(cache.classIsSupported(1));
     EXPECT_TRUE(cache.classIsSupported(3));
     EXPECT_FALSE(cache.classIsSupported(2));

src/lib/cache/tests/rrset_cache_unittest.cc

@@ -16,7 +16,7 @@
 #include <config.h>
 #include <string>
 #include <gtest/gtest.h>
-#include <cache/recursor_cache.h>
+#include <cache/resolver_cache.h>
 #include <cache/cache_entry_key.h>
 #include <cache/rrset_entry.h>
 #include <cache/rrset_cache.h>