fix merge and refactor smallstr function

Author: dranikpg

src/core/compact_object.cc

@@ -1466,8 +1466,7 @@ bool CompactObj::CmpEncoded(string_view sv) const {
     //    has only 9-10 bytes in its inline prefix storage.
     DCHECK_GT(sv.size(), 16u);  // we would not be in SMALL_TAG, otherwise.
 
-    string_view slice[2];
-    u_.small_str.Get(slice);
+    auto slice = u_.small_str.Get();
     DCHECK_LT(slice[0].size(), 14u);
 
     uint8_t tmpbuf[14];
@@ -1600,12 +1599,7 @@ std::array<std::string_view, 2> CompactObj::GetRawString() const {
   }
 
   if (taglen_ == SMALL_TAG) {
-    std::string_view arr[2];
-    u_.small_str.GetV(arr);
-    std::array<std::string_view, 2> out;  // TODO: use c++ 20 to_array
-    out[0] = arr[0];
-    out[1] = arr[1];
-    return out;
+    return u_.small_str.Get();
   }
 
   LOG(FATAL) << "Unsupported tag for GetRawString(): " << int(taglen_);

src/core/small_string.cc

@@ -107,16 +107,11 @@ bool SmallString::Equal(const SmallString& os) const {
   if (size_ != os.size_)
     return false;
 
-  string_view me[2], other[2];
-  Get(me);
-  os.Get(other);
-
-  return me[0] == other[0] && me[1] == other[1];
+  return Get() == os.Get();
 }
 
 uint64_t SmallString::HashCode() const {
-  string_view slice[2];
-  Get(slice);
+  array<string_view, 2> slice = Get();
 
   XXH3_state_t* state = tl.xxh_state.get();
   XXH3_64bits_reset_withSeed(state, kHashSeed);
@@ -126,17 +121,18 @@ uint64_t SmallString::HashCode() const {
   return XXH3_64bits_digest(state);
 }
 
-void SmallString::Get(string_view dest[2]) const {
+array<string_view, 2> SmallString::Get() const {
   DCHECK(size_);
 
+  array<string_view, 2> dest;
   dest[0] = string_view{prefix_, kPrefLen};
   uint8_t* ptr = tl.seg_alloc->Translate(small_ptr_);
   dest[1] = string_view{reinterpret_cast<char*>(ptr), size_ - kPrefLen};
+  return dest;
 }
 
 void SmallString::Get(char* out) const {
-  string_view strs[2];
-  Get(strs);
+  auto strs = Get();
   memcpy(out, strs[0].data(), strs[0].size());
   memcpy(out + strs[0].size(), strs[1].data(), strs[1].size());
 }

src/core/small_string.h

@@ -31,7 +31,7 @@ class SmallString {
   uint64_t HashCode() const;
   uint16_t MallocUsed() const;
 
-  void Get(std::string_view dest[2]) const;
+  std::array<std::string_view, 2> Get() const;
   void Get(char* out) const;
   void Get(std::string* dest) const;