Merge db/slice.cc into util/slice.cc

Summary: It confuses some compilers to have slice.cc under multiple directories. Merge them. Test Plan: Run existing tests Reviewers: andrewkr, yhchiang, IslamAbdelRahman Reviewed By: IslamAbdelRahman Subscribers: leveldb, andrewkr, dhruba Differential Revision: https://reviews.facebook.net/D59409
Maciuch · Jun 10, 2016 · 6faddd7 · 6faddd7
1 parent 5009b53
commit 6faddd7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -133,7 +133,6 @@ set(SOURCES
         db/merge_helper.cc
         db/merge_operator.cc
         db/repair.cc
-        db/slice.cc
         db/snapshot_impl.cc
         db/table_cache.cc
         db/table_properties_collector.cc

diff --git a/db/slice.cc b/db/slice.cc
diff --git a/src.mk b/src.mk
@@ -35,7 +35,6 @@ LIB_SOURCES =                                                   \
   db/merge_helper.cc                                            \
   db/merge_operator.cc                                          \
   db/repair.cc                                                  \
-  db/slice.cc                                                   \
   db/snapshot_impl.cc                                           \
   db/table_cache.cc                                             \
   db/table_properties_collector.cc                              \

diff --git a/util/slice.cc b/util/slice.cc
@@ -129,6 +129,20 @@ int fromHex(char c) {
   return c - 'A' + 10;
 }
 
+Slice::Slice(const SliceParts& parts, std::string* buf) {
+  size_t length = 0;
+  for (int i = 0; i < parts.num_parts; ++i) {
+    length += parts.parts[i].size();
+  }
+  buf->reserve(length);
+
+  for (int i = 0; i < parts.num_parts; ++i) {
+    buf->append(parts.parts[i].data(), parts.parts[i].size());
+  }
+  data_ = buf->data();
+  size_ = buf->size();
+}
+
 // Return a string that contains the copy of the referenced data.
 std::string Slice::ToString(bool hex) const {
   std::string result;  // RVO/NRVO/move