diff --git a/CMakeLists.txt b/CMakeLists.txt index 97268b3ef81924a1ae3231d88fe4a54016362974..3d283c29c61f848be3946c59b53c7ca43172f2a5 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 10b0ca592ff77dbbdaba78ff8554e22b73456555..0000000000000000000000000000000000000000 --- 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 5e8cab4ba6d09eadba55a9e06e01ff6ee47939bf..da61cc17d24dac84bdb0a6fa1c67a5bfe191b79d 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 0dedaeabb419538c6e540d88e2348734215dbfa1..d60ec1877d5dc2c050ddcd49f47ee83ce9d53573 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