From 6faddd7c55a4603f9e7b12eb86600bf223238031 Mon Sep 17 00:00:00 2001
From: sdong <siying.d@fb.com>
Date: Thu, 9 Jun 2016 15:30:19 -0700
Subject: [PATCH] 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
---
 CMakeLists.txt |  1 -
 db/slice.cc    | 24 ------------------------
 src.mk         |  1 -
 util/slice.cc  | 14 ++++++++++++++
 4 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 db/slice.cc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97268b3ef..3d283c29c 100644
--- 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
deleted file mode 100644
index 10b0ca592..000000000
--- a/db/slice.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-//  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-
-#include "rocksdb/slice.h"
-
-namespace rocksdb {
-
-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();
-}
-
-}  // namespace rocksdb
diff --git a/src.mk b/src.mk
index 5e8cab4ba..da61cc17d 100644
--- 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
index 0dedaeabb..d60ec1877 100644
--- 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
-- 
GitLab