use endian.h for expires too

Snapchat · Oct 6, 2023 · 0449579 · 0449579
1 parent 1f976f8
commit 0449579
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/storage/rocksdb.cpp b/src/storage/rocksdb.cpp
@@ -3,7 +3,6 @@
 #include <sstream>
 #include <mutex>
 #include <unistd.h>
-#include <arpa/inet.h>
 #include "../server.h"
 #include "../cluster.h"
 #include "rocksdbfactor_internal.h"
@@ -231,7 +230,7 @@ void RocksDBStorageProvider::setExpire(const char *key, size_t cchKey, long long
 {
     rocksdb::Status status;
     std::unique_lock<fastlock> l(m_lock);
-    long long beExpire = htonll(expire);
+    long long beExpire = htobe64(expire);
     std::string prefix((const char *)&beExpire,sizeof(long long));
     std::string strKey(key, cchKey);
     if (m_spbatch != nullptr)
@@ -246,7 +245,7 @@ void RocksDBStorageProvider::removeExpire(const char *key, size_t cchKey, long l
 {
     rocksdb::Status status;
     std::unique_lock<fastlock> l(m_lock);
-    long long beExpire = htonll(expire);
+    long long beExpire = htobe64(expire);
     std::string prefix((const char *)&beExpire,sizeof(long long));
     std::string strKey(key, cchKey);
     std::string fullKey = prefix + strKey;

diff --git a/src/storage/rocksdb.h b/src/storage/rocksdb.h
@@ -6,8 +6,9 @@
 #include <rocksdb/utilities/write_batch_with_index.h>
 #ifdef __APPLE__
 #include <libkern/OSByteOrder.h>
-#define htole16(x) OSSwapHostToLittleInt16(x)
-#define le16toh(x) OSSwapLittleToHostInt16(x)
+#define htole16 OSSwapHostToLittleInt16
+#define le16toh OSSwapLittleToHostInt16
+#define htobe64 OSSwapHostToBigInt64
 #else
 #include <endian.h>
 #endif