SERVER-41717 Create KeyStringBuilder, KeyStringValue, and KeyStringTypeBits classes for generating KeyStrings.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mongo/db/catalog/index_consistency.h b/src/mongo/db/catalog/index_consistency.h
index e70c9a1a9ea..659de43aa72 100644
--- a/src/mongo/db/catalog/index_consistency.h
+++ b/src/mongo/db/catalog/index_consistency.h
@@ -57,7 +57,7 @@ struct IndexInfo {
     // More efficient representation of the ordering of the descriptor's key pattern.
     const Ordering ord;
     // For conveniently building KeyStrings in a preallocated buffer.
-    std::unique_ptr<KeyString> ks;
+    std::unique_ptr<KeyString::Builder> ks;
     // The number of index entries belonging to the index.
     int64_t numKeys = 0;
     // The number of records that have a key in their document that referenced back to the this
@@ -85,7 +85,7 @@ public:
      * For the second phase of validation, keep track of the document keys that hashed to
      * inconsistent hash buckets during the first phase of validation.
      */
-    void addDocKey(const KeyString& ks,
+    void addDocKey(const KeyString::Builder& ks,
                    IndexInfo* indexInfo,
                    RecordId recordId,
                    const BSONObj& indexKey);
@@ -96,7 +96,7 @@ public:
      * For the second phase of validation, try to match the index entry keys that hashed to
      * inconsistent hash buckets during the first phase of validation to document keys.
      */
-    void addIndexKey(const KeyString& ks,
+    void addIndexKey(const KeyString::Builder& ks,
                      IndexInfo* indexInfo,
                      RecordId recordId,
                      const BSONObj& indexKey);
@@ -107,8 +107,8 @@ public:
      * entries and remove any path encountered. As we expect the index to contain a super-set of
      * the collection paths, a non-empty set represents an invalid index.
      */
-    void addMultikeyMetadataPath(const KeyString& ks, IndexInfo* indexInfo);
-    void removeMultikeyMetadataPath(const KeyString& ks, IndexInfo* indexInfo);
+    void addMultikeyMetadataPath(const KeyString::Builder& ks, IndexInfo* indexInfo);
+    void removeMultikeyMetadataPath(const KeyString::Builder& ks, IndexInfo* indexInfo);
     size_t getMultikeyMetadataPathCount(IndexInfo* indexInfo);
 
     /**
@@ -199,7 +199,7 @@ private:
     /**
      * Returns a hashed value from the given KeyString and index namespace.
      */
-    uint32_t _hashKeyString(const KeyString& ks, uint32_t indexNameHash) const;
+    uint32_t _hashKeyString(const KeyString::Builder& ks, uint32_t indexNameHash) const;
 
 };  // IndexConsistency
 }  // namespace mongo