[2098] supported toText().

diff --git a/src/lib/datasrc/memory/tests/treenode_rrset_unittest.cc b/src/lib/datasrc/memory/tests/treenode_rrset_unittest.cc
index 6e1d5442b2a8107b11f5db50912800c78f12edea..93a35623af3be60ec47db4767710bc63632286c7 100644 (file)
--- a/src/lib/datasrc/memory/tests/treenode_rrset_unittest.cc
+++ b/src/lib/datasrc/memory/tests/treenode_rrset_unittest.cc
@@ -318,4 +318,30 @@ TEST_F(TreeNodeRRsetTest, getRdataIterator) {
                        TreeNodeRRset(rrclass_, origin_node_, ns_rdataset_,
                                      false).getRdataIterator());
 }
+
+void
+checkToText(const AbstractRRset& actual_rrset,
+            ConstRRsetPtr expected_rrset, ConstRRsetPtr expected_sig_rrset)
+{
+    const string actual_text = actual_rrset.toText();
+    const string expected_text =
+        (expected_rrset ? expected_rrset->toText() : "") +
+        (expected_sig_rrset ? expected_sig_rrset->toText() : "");
+    EXPECT_EQ(expected_text, actual_text);
+}
+
+TEST_F(TreeNodeRRsetTest, toText) {
+    // Constructed with RRSIG, and it should be visible.
+    checkToText(TreeNodeRRset(rrclass_, www_node_, a_rdataset_, true),
+                a_rrset_, a_rrsig_rrset_);
+    // Constructed with RRSIG, and it should be invisible.
+    checkToText(TreeNodeRRset(rrclass_, www_node_, a_rdataset_, false),
+                a_rrset_, ConstRRsetPtr());
+    // Constructed without RRSIG, and it would be visible (but of course won't)
+    checkToText(TreeNodeRRset(rrclass_, origin_node_, ns_rdataset_, true),
+                ns_rrset_, ConstRRsetPtr());
+    // Constructed without RRSIG, and it should be visible
+    checkToText(TreeNodeRRset(rrclass_, origin_node_, ns_rdataset_, false),
+                ns_rrset_, ConstRRsetPtr());
+}
 }

diff --git a/src/lib/datasrc/memory/treenode_rrset.cc b/src/lib/datasrc/memory/treenode_rrset.cc
index 26c7551c2d99cf65056029c189dc046a83bb385b..2c8b5e29e8fe8841eac5d4f5ca44de40bd6d899d 100644 (file)
--- a/src/lib/datasrc/memory/treenode_rrset.cc
+++ b/src/lib/datasrc/memory/treenode_rrset.cc
@@ -68,10 +68,46 @@ TreeNodeRRset::setTTL(const RRTTL&) {
     isc_throw(Unexpected, "unexpected method called on TreeNodeRRset");
 }
 
-// needed
 std::string
 TreeNodeRRset::toText() const {
-    isc_throw(Unexpected, "unexpected method called on TreeNodeRRset");
+    // Create TTL from internal data
+    util::InputBuffer ttl_buffer(rdataset_->getTTLData(), sizeof(uint32_t));
+    const RRTTL ttl(ttl_buffer);
+
+    // Dump the main RRset, if not empty
+    std::string ret;
+    RRsetPtr tmp_rrset;
+    for (RdataIteratorPtr rit = getRdataIterator();
+         !rit->isLast();
+         rit->next())
+    {
+        if (!tmp_rrset) {
+            tmp_rrset = RRsetPtr(new RRset(getName(), rrclass_, getType(),
+                                           ttl));
+        }
+        tmp_rrset->addRdata(rit->getCurrent());
+    }
+    if (tmp_rrset) {
+        ret = tmp_rrset->toText();
+    }
+
+    // Dump any RRSIGs
+    tmp_rrset.reset();
+    for (RdataIteratorPtr rit = getSigRdataIterator();
+         !rit->isLast();
+         rit->next())
+    {
+        if (!tmp_rrset) {
+            tmp_rrset = RRsetPtr(new RRset(getName(), rrclass_,
+                                           RRType::RRSIG(), ttl));
+        }
+        tmp_rrset->addRdata(rit->getCurrent());
+    }
+    if (tmp_rrset) {
+        ret += tmp_rrset->toText();
+    }
+
+    return (ret);
 }
 
 namespace {
@@ -214,7 +250,7 @@ renderDataToBuffer(const void* data, size_t data_len,
 }
 
 RdataIteratorPtr
-TreeNodeRRset::getRdataIterator() const {
+TreeNodeRRset::getRdataIteratorInternal(bool is_rrsig, size_t count) const {
     util::OutputBuffer buffer(0);
     RdataReader reader(rrclass_, rdataset_->type, rdataset_->getDataBuf(),
                        rdataset_->getRdataCount(), rrsig_count_,
@@ -222,17 +258,29 @@ TreeNodeRRset::getRdataIterator() const {
                        boost::bind(renderDataToBuffer, _1, _2, &buffer));
 
     std::vector<ConstRdataPtr> rdata_list;
-    for (size_t i = 0; i < rdataset_->getRdataCount(); ++i) {
+    for (size_t i = 0; i < count; ++i) {
         buffer.clear();
-        const bool rendered = reader.iterateRdata();
+        const bool rendered = is_rrsig ? reader.iterateSingleSig() :
+            reader.iterateRdata();
         assert(rendered == true);
         util::InputBuffer ib(buffer.getData(), buffer.getLength());
-        rdata_list.push_back(createRdata(rdataset_->type, rrclass_,
-                                         ib, ib.getLength()));
+        rdata_list.push_back(
+            createRdata(is_rrsig ? RRType::RRSIG() : rdataset_->type, rrclass_,
+                        ib, ib.getLength()));
     }
     return (RdataIteratorPtr(new TreeNodeRdataIterator(rdata_list)));
 }
 
+RdataIteratorPtr
+TreeNodeRRset::getRdataIterator() const {
+    return (getRdataIteratorInternal(false, rdataset_->getRdataCount()));
+}
+
+RdataIteratorPtr
+TreeNodeRRset::getSigRdataIterator() const {
+    return (getRdataIteratorInternal(true, dnssec_ok_ ? rrsig_count_ : 0));
+}
+
 RRsetPtr
 TreeNodeRRset::getRRsig() const {
     isc_throw(Unexpected, "unexpected method called on TreeNodeRRset");

diff --git a/src/lib/datasrc/memory/treenode_rrset.h b/src/lib/datasrc/memory/treenode_rrset.h
index 9228c4c996ec5d4207b76d3306b83d64ca75f85e..c15e935bfe6f1487f4f18e76e5e2003b043f2cb5 100644 (file)
--- a/src/lib/datasrc/memory/treenode_rrset.h
+++ b/src/lib/datasrc/memory/treenode_rrset.h
@@ -113,6 +113,10 @@ public:
     virtual bool isSameKind(const dns::AbstractRRset& other) const;
 
 private:
+    dns::RdataIteratorPtr getSigRdataIterator() const;
+    dns::RdataIteratorPtr getRdataIteratorInternal(bool is_rrsig,
+                                                   size_t count) const;
+
     const ZoneNode* node_;
     const RdataSet* rdataset_;
     const size_t rrsig_count_;