os/bluestore,kstore: combine kv helpers in header

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index f751f97ed038e14ecc3b0519756f2547c70d16dd..3ade0295a79007d75dfc2b57de56a9f89964d719 100644 (file)
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -21,7 +21,6 @@ set(libos_srcs
   filestore/WBThrottle.cc
   filestore/ZFSFileStoreBackend.cc
   memstore/MemStore.cc
-  kstore/kv.cc
   kstore/KStore.cc
   kstore/kstore_types.cc
   fs/FS.cc

diff --git a/src/os/bluestore/BitmapFreelistManager.cc b/src/os/bluestore/BitmapFreelistManager.cc
index 1a1f9af85944b078ea0b6140ca8bbf6167ed03f7..f5914011eccf41ff8e5fe58ed6881a6da25c22ad 100644 (file)
--- a/src/os/bluestore/BitmapFreelistManager.cc
+++ b/src/os/bluestore/BitmapFreelistManager.cc
@@ -3,7 +3,7 @@
 
 #include "BitmapFreelistManager.h"
 #include "kv/KeyValueDB.h"
-#include "kv.h"
+#include "os/kv.h"
 
 #include "common/debug.h"
 

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 4fec89b79329e0f90adb271461a8efc59e90a2f0..a5f406f06dc44d2f6612ceb14f46dd9a7c35dea0 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -18,7 +18,7 @@
 #include <fcntl.h>
 
 #include "BlueStore.h"
-#include "kv.h"
+#include "os/kv.h"
 #include "include/compat.h"
 #include "include/intarith.h"
 #include "include/stringify.h"

diff --git a/src/os/bluestore/ExtentFreelistManager.cc b/src/os/bluestore/ExtentFreelistManager.cc
index 85174e1834f3e6de13d43ef85ac569ae493a1da9..f211e5b8da48ade63f2cb8c257a6b23a7a1b7ae9 100644 (file)
--- a/src/os/bluestore/ExtentFreelistManager.cc
+++ b/src/os/bluestore/ExtentFreelistManager.cc
@@ -3,7 +3,7 @@
 
 #include "ExtentFreelistManager.h"
 #include "kv/KeyValueDB.h"
-#include "kv.h"
+#include "os/kv.h"
 
 #include "common/debug.h"
 

diff --git a/src/os/bluestore/kv.cc b/src/os/bluestore/kv.cc
deleted file mode 100644 (file)
index 8004e12..0000000
--- a/src/os/bluestore/kv.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#include "kv.h"
-
-#include "include/byteorder.h"
-#include <string.h>
-
-void _key_encode_u32(uint32_t u, std::string *key)
-{
-  uint32_t bu;
-#ifdef CEPH_BIG_ENDIAN
-  bu = u;
-#elif defined(CEPH_LITTLE_ENDIAN)
-  bu = swab32(u);
-#else
-# error wtf
-#endif
-  key->append((char*)&bu, 4);
-}
-
-const char *_key_decode_u32(const char *key, uint32_t *pu)
-{
-  uint32_t bu;
-  memcpy(&bu, key, 4);
-#ifdef CEPH_BIG_ENDIAN
-  *pu = bu;
-#elif defined(CEPH_LITTLE_ENDIAN)
-  *pu = swab32(bu);
-#else
-# error wtf
-#endif
-  return key + 4;
-}
-
-void _key_encode_u64(uint64_t u, std::string *key)
-{
-  uint64_t bu;
-#ifdef CEPH_BIG_ENDIAN
-  bu = u;
-#elif defined(CEPH_LITTLE_ENDIAN)
-  bu = swab64(u);
-#else
-# error wtf
-#endif
-  key->append((char*)&bu, 8);
-}
-
-const char *_key_decode_u64(const char *key, uint64_t *pu)
-{
-  uint64_t bu;
-  memcpy(&bu, key, 8);
-#ifdef CEPH_BIG_ENDIAN
-  *pu = bu;
-#elif defined(CEPH_LITTLE_ENDIAN)
-  *pu = swab64(bu);
-#else
-# error wtf
-#endif
-  return key + 8;
-}

diff --git a/src/os/bluestore/kv.h b/src/os/bluestore/kv.h
deleted file mode 100644 (file)
index 7a52d4f..0000000
--- a/src/os/bluestore/kv.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#ifndef CEPH_OS_BLUESTORE_KV_H
-#define CEPH_OS_BLUESTORE_KV_H
-
-#include <string>
-
-// some key encoding helpers
-void _key_encode_u32(uint32_t u, std::string *key);
-const char *_key_decode_u32(const char *key, uint32_t *pu);
-void _key_encode_u64(uint64_t u, std::string *key);
-const char *_key_decode_u64(const char *key, uint64_t *pu);
-
-#endif

diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index 025fff8fd95909bf00c0fed1a89478a38258acf1..2319050423e19f3c4a5d3adfebd11e6849fc8a1f 100755 (executable)
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -21,7 +21,7 @@
 
 #include "KStore.h"
 #include "osd/osd_types.h"
-#include "kv.h"
+#include "os/kv.h"
 #include "include/compat.h"
 #include "include/stringify.h"
 #include "common/errno.h"

diff --git a/src/os/kstore/kv.cc b/src/os/kstore/kv.cc
deleted file mode 100644 (file)
index 8004e12..0000000
--- a/src/os/kstore/kv.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#include "kv.h"
-
-#include "include/byteorder.h"
-#include <string.h>
-
-void _key_encode_u32(uint32_t u, std::string *key)
-{
-  uint32_t bu;
-#ifdef CEPH_BIG_ENDIAN
-  bu = u;
-#elif defined(CEPH_LITTLE_ENDIAN)
-  bu = swab32(u);
-#else
-# error wtf
-#endif
-  key->append((char*)&bu, 4);
-}
-
-const char *_key_decode_u32(const char *key, uint32_t *pu)
-{
-  uint32_t bu;
-  memcpy(&bu, key, 4);
-#ifdef CEPH_BIG_ENDIAN
-  *pu = bu;
-#elif defined(CEPH_LITTLE_ENDIAN)
-  *pu = swab32(bu);
-#else
-# error wtf
-#endif
-  return key + 4;
-}
-
-void _key_encode_u64(uint64_t u, std::string *key)
-{
-  uint64_t bu;
-#ifdef CEPH_BIG_ENDIAN
-  bu = u;
-#elif defined(CEPH_LITTLE_ENDIAN)
-  bu = swab64(u);
-#else
-# error wtf
-#endif
-  key->append((char*)&bu, 8);
-}
-
-const char *_key_decode_u64(const char *key, uint64_t *pu)
-{
-  uint64_t bu;
-  memcpy(&bu, key, 8);
-#ifdef CEPH_BIG_ENDIAN
-  *pu = bu;
-#elif defined(CEPH_LITTLE_ENDIAN)
-  *pu = swab64(bu);
-#else
-# error wtf
-#endif
-  return key + 8;
-}

diff --git a/src/os/kstore/kv.h b/src/os/kstore/kv.h
deleted file mode 100644 (file)
index 51fc7ed..0000000
--- a/src/os/kstore/kv.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#ifndef CEPH_OS_NEWSTORE_KV_H
-#define CEPH_OS_NEWSTORE_KV_H
-
-#include <string>
-
-// some key encoding helpers
-void _key_encode_u32(uint32_t u, std::string *key);
-const char *_key_decode_u32(const char *key, uint32_t *pu);
-void _key_encode_u64(uint64_t u, std::string *key);
-const char *_key_decode_u64(const char *key, uint64_t *pu);
-
-#endif

diff --git a/src/os/kv.h b/src/os/kv.h
new file mode 100644 (file)
index 0000000..433526c
--- /dev/null
+++ b/src/os/kv.h
@@ -0,0 +1,63 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#ifndef CEPH_OS_KV_H
+#define CEPH_OS_KV_H
+
+#include <string>
+#include "include/byteorder.h"
+
+// some key encoding helpers
+template<typename T>
+inline static void _key_encode_u32(uint32_t u, T *key) {
+  uint32_t bu;
+#ifdef CEPH_BIG_ENDIAN
+  bu = u;
+#elif defined(CEPH_LITTLE_ENDIAN)
+  bu = swab32(u);
+#else
+# error wtf
+#endif
+  key->append((char*)&bu, 4);
+}
+
+inline static const char *_key_decode_u32(const char *key, uint32_t *pu) {
+  uint32_t bu;
+  memcpy(&bu, key, 4);
+#ifdef CEPH_BIG_ENDIAN
+  *pu = bu;
+#elif defined(CEPH_LITTLE_ENDIAN)
+  *pu = swab32(bu);
+#else
+# error wtf
+#endif
+  return key + 4;
+}
+
+template<typename T>
+inline static void _key_encode_u64(uint64_t u, T *key) {
+  uint64_t bu;
+#ifdef CEPH_BIG_ENDIAN
+  bu = u;
+#elif defined(CEPH_LITTLE_ENDIAN)
+  bu = swab64(u);
+#else
+# error wtf
+#endif
+  key->append((char*)&bu, 8);
+}
+
+inline static const char *_key_decode_u64(const char *key, uint64_t *pu) {
+  uint64_t bu;
+  memcpy(&bu, key, 8);
+#ifdef CEPH_BIG_ENDIAN
+  *pu = bu;
+#elif defined(CEPH_LITTLE_ENDIAN)
+  *pu = swab64(bu);
+#else
+# error wtf
+#endif
+  return key + 8;
+}
+
+#endif