Merge pull request #42535 from miretskiy/backport19.2-42529

release-19.2: libroach: Fix memory leak in row_counter
cockroachdb · Nov 18, 2019 · 53eef08 · 53eef08
2 parents c2b2cd1 + 2fc0740
commit 53eef08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/c-deps/libroach/row_counter.cc b/c-deps/libroach/row_counter.cc
@@ -88,10 +88,12 @@ bool RowCounter::Count(const rocksdb::Slice& key, cockroach::roachpb::BulkOpSumm
   }
 
   // no change key prefix => no new row.
-  if (decoded_key.data() == prev_key.data) {
+  if (decoded_key == prev_key) {
     return true;
   }
-  prev_key = ToDBString(decoded_key);
+
+
+  prev_key.assign(decoded_key.data(), decoded_key.size());
 
   uint64_t tbl;
   if (!DecodeTablePrefix(&decoded_key, &tbl)) {

diff --git a/c-deps/libroach/row_counter.h b/c-deps/libroach/row_counter.h
@@ -29,6 +29,6 @@ struct RowCounter {
  private:
   void EnsureSafeSplitKey(rocksdb::Slice* key);
   int GetRowPrefixLength(rocksdb::Slice* key);
-  DBString prev_key;
+  std::string prev_key;
   rocksdb::Slice prev;
 };