[svn] commit: r3593 - in /branches/trac410: ./ src/bin/auth/ src/bin/bind10/ src/bin/stats/tests/isc/util/ src/lib/bench/ src/lib/datasrc/ src/lib/datasrc/tests/ src/lib/exceptions/ src/lib/python/isc/notify/ src/lib/python/isc/notify/tests/ src/lib/python/isc/util/

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Nov 22 12:38:58 UTC 2010 

Author: jinmei
Date: Mon Nov 22 12:38:57 2010
New Revision: 3593

Log:
sync with trunk

Added:
    branches/trac410/src/lib/datasrc/tests/zonetable_unittest.cc
      - copied unchanged from r3591, trunk/src/lib/datasrc/tests/zonetable_unittest.cc
    branches/trac410/src/lib/datasrc/zonetable.cc
      - copied unchanged from r3591, trunk/src/lib/datasrc/zonetable.cc
    branches/trac410/src/lib/datasrc/zonetable.h
      - copied unchanged from r3591, trunk/src/lib/datasrc/zonetable.h
Modified:
    branches/trac410/   (props changed)
    branches/trac410/ChangeLog
    branches/trac410/src/bin/auth/asio_link.h
    branches/trac410/src/bin/auth/auth_srv.h
    branches/trac410/src/bin/bind10/bind10.py.in   (props changed)
    branches/trac410/src/bin/stats/tests/isc/util/   (props changed)
    branches/trac410/src/lib/bench/benchmark.h
    branches/trac410/src/lib/datasrc/Makefile.am
    branches/trac410/src/lib/datasrc/cache.h
    branches/trac410/src/lib/datasrc/tests/Makefile.am
    branches/trac410/src/lib/exceptions/exceptions.h
    branches/trac410/src/lib/python/isc/notify/notify_out.py
    branches/trac410/src/lib/python/isc/notify/tests/notify_out_test.py
    branches/trac410/src/lib/python/isc/util/   (props changed)

Modified: branches/trac410/ChangeLog
==============================================================================
--- branches/trac410/ChangeLog (original)
+++ branches/trac410/ChangeLog Mon Nov 22 12:38:57 2010
@@ -1,3 +1,9 @@
+  117.  [func]		jinmei
+	src/lib/datasrc: added new zone and zone table classes for the
+	support of in memory data source.  This is an intermediate step to
+	the bigger feature, and is not yet actually usable in practice.
+	(Trac #399, svn r3590)
+
   116.	[bug]		jerry
 	src/bin/xfrout: Xfrout and Auth will communicate by long tcp
 	connection, Auth needs to make a new connection only on the first

Modified: branches/trac410/src/bin/auth/asio_link.h
==============================================================================
--- branches/trac410/src/bin/auth/asio_link.h (original)
+++ branches/trac410/src/bin/auth/asio_link.h Mon Nov 22 12:38:57 2010
@@ -132,7 +132,7 @@
     /// This constructor never throws an exception.
     ///
     /// \param asio_address The ASIO \c ip::address to be converted.
-    IOAddress(const asio::ip::address& asio_adress);
+    IOAddress(const asio::ip::address& asio_address);
     //@}
 
     /// \brief Convert the address to a string.

Modified: branches/trac410/src/bin/auth/auth_srv.h
==============================================================================
--- branches/trac410/src/bin/auth/auth_srv.h (original)
+++ branches/trac410/src/bin/auth/auth_srv.h Mon Nov 22 12:38:57 2010
@@ -84,7 +84,7 @@
             isc::xfr::AbstractXfroutClient& xfrout_client);
     ~AuthSrv();
     //@}
-    /// \return \c true if the \message contains a response to be returned;
+    /// \return \c true if the \a message contains a response to be returned;
     /// otherwise \c false.
     bool processMessage(const asio_link::IOMessage& io_message,
                         isc::dns::Message& message,
@@ -138,7 +138,7 @@
     /// containing the result of the update operation.
     isc::data::ConstElementPtr updateConfig(isc::data::ConstElementPtr config);
 
-    /// \param Returns the command and configuration session for the
+    /// \brief Returns the command and configuration session for the
     /// \c AuthSrv.
     ///
     /// This method never throws an exception.

Modified: branches/trac410/src/lib/bench/benchmark.h
==============================================================================
--- branches/trac410/src/lib/bench/benchmark.h (original)
+++ branches/trac410/src/lib/bench/benchmark.h Mon Nov 22 12:38:57 2010
@@ -200,7 +200,7 @@
     BenchMark(const BenchMark& source);
     BenchMark& operator=(const BenchMark& source);
 public:
-    /// \bench Constructor for immediate run.
+    /// \brief Constructor for immediate run.
     ///
     /// This is the constructor that is expected to be used normally.
     /// It runs the benchmark within the constructor and prints the result,
@@ -217,7 +217,7 @@
         initialize(true);
     }
 
-    /// \bench Constructor for finer-grained control.
+    /// \brief Constructor for finer-grained control.
     ///
     /// This constructor takes the third parameter, \c immediate, to control
     /// whether to run the benchmark within the constructor.

Modified: branches/trac410/src/lib/datasrc/Makefile.am
==============================================================================
--- branches/trac410/src/lib/datasrc/Makefile.am (original)
+++ branches/trac410/src/lib/datasrc/Makefile.am Mon Nov 22 12:38:57 2010
@@ -15,3 +15,4 @@
 libdatasrc_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
 libdatasrc_la_SOURCES += query.h query.cc
 libdatasrc_la_SOURCES += cache.h cache.cc
+libdatasrc_la_SOURCES += zonetable.h zonetable.cc

Modified: branches/trac410/src/lib/datasrc/cache.h
==============================================================================
--- branches/trac410/src/lib/datasrc/cache.h (original)
+++ branches/trac410/src/lib/datasrc/cache.h Mon Nov 22 12:38:57 2010
@@ -170,9 +170,9 @@
     /// then promoted to the head of the LRU queue.  (NOTE: Because
     /// of this, "retrieve" cannot be implemented as a const method.)
     ///
-    /// \param name The query name
-    /// \param rrclass The query class
-    /// \param rrtype The query type
+    /// \param qname The query name
+    /// \param qclass The query class
+    /// \param qtype The query type
     /// \param rrset Returns the RRset found, if any, to the caller
     /// \param flags Returns the flags, if any, to the caller
     ///

Modified: branches/trac410/src/lib/datasrc/tests/Makefile.am
==============================================================================
--- branches/trac410/src/lib/datasrc/tests/Makefile.am (original)
+++ branches/trac410/src/lib/datasrc/tests/Makefile.am Mon Nov 22 12:38:57 2010
@@ -24,6 +24,7 @@
 run_unittests_SOURCES += query_unittest.cc
 run_unittests_SOURCES += cache_unittest.cc
 run_unittests_SOURCES += test_datasrc.h test_datasrc.cc
+run_unittests_SOURCES += zonetable_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(GTEST_LDADD)

Modified: branches/trac410/src/lib/exceptions/exceptions.h
==============================================================================
--- branches/trac410/src/lib/exceptions/exceptions.h (original)
+++ branches/trac410/src/lib/exceptions/exceptions.h Mon Nov 22 12:38:57 2010
@@ -40,7 +40,7 @@
     /// file line number.
     ///
     /// @param file the file name where the exception was thrown.
-    /// @param line the line in @ref file where the exception was thrown.
+    /// @param line the line in \a file where the exception was thrown.
     /// @param what a description (type) of the exception.
     Exception(const char* file, size_t line, const char* what) :
         file_(file), line_(line), what_(what) {}
@@ -49,7 +49,7 @@
     /// file line number.
     ///
     /// @param file the file name where the exception was thrown.
-    /// @param line the line in @ref file where the exception was thrown.
+    /// @param line the line in \a file where the exception was thrown.
     /// @param what a description (type) of the exception.
     Exception(const char* file, size_t line, const std::string& what) :
         file_(file), line_(line), what_(what) {}

Modified: branches/trac410/src/lib/python/isc/notify/notify_out.py
==============================================================================
--- branches/trac410/src/lib/python/isc/notify/notify_out.py (original)
+++ branches/trac410/src/lib/python/isc/notify/notify_out.py Mon Nov 22 12:38:57 2010
@@ -367,6 +367,7 @@
                     zone_id = self._waiting_zones.pop(0) 
                     self._notify_infos[zone_id].prepare_notify_out()
                     self.notify_num += 1 
+                    self._notifying_zones.append(zone_id)
 
     def _send_notify_message_udp(self, zone_notify_info, addrinfo):
         msg, qid = self._create_notify_message(zone_notify_info.zone_name, 

Modified: branches/trac410/src/lib/python/isc/notify/tests/notify_out_test.py
==============================================================================
--- branches/trac410/src/lib/python/isc/notify/tests/notify_out_test.py (original)
+++ branches/trac410/src/lib/python/isc/notify/tests/notify_out_test.py Mon Nov 22 12:38:57 2010
@@ -156,7 +156,7 @@
         com_info = self._notify._notify_infos[('com.', 'IN')]
         self._notify._notify_next_target(com_info)
         self.assertEqual(2, self._notify.notify_num)
-        self.assertEqual(0, len(self._notify._notifying_zones))
+        self.assertEqual(2, len(self._notify._notifying_zones))
     
     def test_handle_notify_reply(self):
         self.assertEqual(notify_out._BAD_REPLY_PACKET, self._notify._handle_notify_reply(None, b'badmsg'))

More information about the bind10-changes mailing list