DEBUG: Add HashTable::operator<<, expand StoredValue::operator<<

Also fix some formatting on the existing output. Example from dump():

  HashTable[0x104cd4010] with numInMemory:3 numDeleted:2 values:
    OSV @0x104cd1e30 ... WDN.. temp:    seq:5 rev:2 key:"ns:0 1" exp:0 vallen:0
    OSV @0x104cd1de0 ... WDN.. temp:    seq:4 rev:2 key:"ns:0 0" exp:0 vallen:0
    OSV @0x104cd1e80 ... W.N.. temp:    seq:3 rev:1 key:"ns:0 2" exp:0 vallen:2 val:"2"

Change-Id: I8794f0565bf8280d6019443329b5c04730722cb6
Reviewed-on: http://review.couchbase.org/76187
Reviewed-by: Jim Walker <jim@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>

diff --git a/src/ephemeral_vb.cc b/src/ephemeral_vb.cc
index 28b1c45..d2ce3ec 100644 (file)
--- a/src/ephemeral_vb.cc
+++ b/src/ephemeral_vb.cc
@@ -146,10 +146,11 @@ void EphemeralVBucket::addStats(bool details,
 
 void EphemeralVBucket::dump() const {
     std::cerr << "EphemeralVBucket[" << this
-              << "] with state: " << toString(getState())
+              << "] with state:" << toString(getState())
               << " numItems:" << getNumItems()
               << std::endl;
     seqList->dump();
+    std::cerr << ht << std::endl;
 }
 
 ENGINE_ERROR_CODE EphemeralVBucket::completeBGFetchForSingleItem(

diff --git a/src/hash_table.cc b/src/hash_table.cc
index aa7c141..9acd61a 100644 (file)
--- a/src/hash_table.cc
+++ b/src/hash_table.cc
@@ -742,3 +742,19 @@ void HashTable::unlocked_restoreMeta(const std::unique_lock<std::mutex>& htLock,
         ++datatypeCounts[v.getDatatype()];
     }
 }
+
+std::ostream& operator<<(std::ostream& os, const HashTable& ht) {
+    os << "HashTable[" << &ht << "] with"
+       << " numInMemory:" << ht.getNumInMemoryItems()
+       << " numDeleted:" << ht.getNumDeletedItems()
+       << " values: " << std::endl;
+    for (const auto& chain : ht.values) {
+        if (chain) {
+            for (StoredValue* sv = chain.get(); sv != nullptr;
+                 sv = sv->next.get()) {
+                os << "    " << *sv << std::endl;
+            }
+        }
+    }
+    return os;
+}

diff --git a/src/hash_table.h b/src/hash_table.h
index 11a6214..ee73118 100644 (file)
--- a/src/hash_table.h
+++ b/src/hash_table.h
@@ -600,6 +600,7 @@ private:
     using table_type = std::vector<StoredValue::UniquePtr>;
 
     friend class StoredValue;
+    friend std::ostream& operator<<(std::ostream& os, const HashTable& ht);
 
     inline bool isActive() const { return activeState; }
     inline void setActiveState(bool newv) { activeState = newv; }
@@ -672,6 +673,8 @@ private:
     DISALLOW_COPY_AND_ASSIGN(HashTable);
 };
 
+std::ostream& operator<<(std::ostream& os, const HashTable& ht);
+
 /**
  * Base class for visiting a hash table.
  */

diff --git a/src/linked_list.cc b/src/linked_list.cc
index da0acfe..3bff91c 100644 (file)
--- a/src/linked_list.cc
+++ b/src/linked_list.cc
@@ -351,7 +351,7 @@ std::ostream& operator <<(std::ostream& os, const BasicLinkedList& ll) {
     for (const auto& val : ll.seqList) {
         os << "    " << val << std::endl;
     }
-    os << "]" << std::endl;
+    os << "]";
     return os;
 }
 

diff --git a/src/stored-value.cc b/src/stored-value.cc
index d6d937b..b1a70f8 100644 (file)
--- a/src/stored-value.cc
+++ b/src/stored-value.cc
@@ -255,11 +255,21 @@ std::ostream& operator<<(std::ostream& os, const StoredValue& sv) {
     os << (sv.isNewCacheItem() ? 'N' : '.');
     os << ' ';
 
-    // seqno, revid
+    // Temporary states
+    os << "temp:"
+       << (sv.isTempInitialItem() ? 'I' : ' ')
+       << (sv.isTempDeletedItem() ? 'D' : ' ')
+       << (sv.isTempNonExistentItem() ? 'N' : ' ')
+       << ' ';
+
+    // seqno, revid, expiry
     os << "seq:" << sv.getBySeqno() << " rev:" << sv.getRevSeqno();
-    os << " key:\"" << sv.getKey();
-    os << "\" val:[";
+    os << " key:\"" << sv.getKey() << "\"";
+    os << " exp:" << sv.getExptime();
+
+    os << " vallen:" << sv.valuelen();
     if (sv.getValue().get()) {
+        os << " val:\"";
         const char* data = sv.getValue()->getData();
         // print up to first 40 bytes of value.
         const size_t limit = std::min(size_t(40), sv.getValue()->vlength());
@@ -269,10 +279,8 @@ std::ostream& operator<<(std::ostream& os, const StoredValue& sv) {
         if (limit < sv.getValue()->vlength()) {
             os << " <cut>";
         }
-    } else {
-        os << "<null>";
+        os << "\"";
     }
-    os << "]";
     return os;
 }
 

diff --git a/src/stored-value.h b/src/stored-value.h
index e8515bf..39ff590 100644 (file)
--- a/src/stored-value.h
+++ b/src/stored-value.h
@@ -729,6 +729,7 @@ protected:
 
     friend class HashTable;
     friend class StoredValueFactory;
+    friend std::ostream& operator<<(std::ostream& os, const HashTable& ht);
 
     value_t            value;          // 8 bytes
     // Used to implement HashTable chaining (for elements hashing to the same

diff --git a/src/vbucket.cc b/src/vbucket.cc
index cdac653..cef8e07 100644 (file)
--- a/src/vbucket.cc
+++ b/src/vbucket.cc
@@ -1825,7 +1825,9 @@ void VBucket::postProcessRollback(const RollbackResult& rollbackResult,
 void VBucket::dump() const {
     std::cerr << "VBucket[" << this << "] with state: " << toString(getState())
               << " numItems:" << getNumItems()
-              << " numNonResident:" << getNumNonResidentItems() << std::endl;
+              << " numNonResident:" << getNumNonResidentItems()
+              << " ht: " << std::endl << "  " << ht << std::endl
+              << "]" << std::endl;
 }
 
 void VBucket::_addStats(bool details, ADD_STAT add_stat, const void* c) {