test pkv.

acl-dev · Aug 13, 2023 · d75199b · d75199b
1 parent 1faee05
commit d75199b
Show file tree

Hide file tree

Showing 19 changed files with 113 additions and 87 deletions.
diff --git a/app/wizard_demo/pkv/CMakeLists.txt b/app/wizard_demo/pkv/CMakeLists.txt
@@ -46,12 +46,13 @@ include_directories(
 set(base_path ${CMAKE_CURRENT_SOURCE_DIR})
 set(src_paths
     ${base_path}
+    ${base_path}/test
+    ${base_path}/coder
     ${base_path}/action
     ${base_path}/dao
     ${base_path}/db
     ${base_path}/db/rocksdb
     ${base_path}/db/wt
-    ${base_path}/proto
 )
 
 foreach(iter ${src_paths})
@@ -134,7 +135,7 @@ set(output_path ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${output_path})
 link_directories(${output_path})
 
-add_executable(pkv ${src_files})
+add_executable(pkv ${src_files} test/test_coder.cpp test/test_coder.h)
 target_link_libraries(pkv ${lib_all})
 
 ###############################################################################
diff --git a/app/wizard_demo/pkv/action/redis_handler.cpp b/app/wizard_demo/pkv/action/redis_handler.cpp
@@ -3,8 +3,8 @@
 //
 
 #include "stdafx.h"
-#include "proto/redis_object.h"
-#include "proto/redis_coder.h"
+#include "coder/redis_object.h"
+#include "coder/redis_coder.h"
 #include "redis_key.h"
 #include "redis_string.h"
 #include "redis_hash.h"

diff --git a/app/wizard_demo/pkv/action/redis_handler.h b/app/wizard_demo/pkv/action/redis_handler.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <vector>
-#include "proto/redis_coder.h"
+#include "coder/redis_coder.h"
 #include "db/db.h"
 
 namespace pkv {

diff --git a/app/wizard_demo/pkv/action/redis_hash.cpp b/app/wizard_demo/pkv/action/redis_hash.cpp
@@ -3,8 +3,8 @@
 //
 
 #include "stdafx.h"
-#include "proto/redis_coder.h"
-#include "proto/redis_object.h"
+#include "coder/redis_coder.h"
+#include "coder/redis_object.h"
 #include "dao/hash.h"
 
 #include "redis_handler.h"

diff --git a/app/wizard_demo/pkv/action/redis_key.cpp b/app/wizard_demo/pkv/action/redis_key.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "stdafx.h"
-#include "proto/redis_coder.h"
+#include "coder/redis_coder.h"
 #include "dao/key.h"
 
 #include "redis_handler.h"

diff --git a/app/wizard_demo/pkv/action/redis_server.cpp b/app/wizard_demo/pkv/action/redis_server.cpp
@@ -3,8 +3,8 @@
 //
 
 #include "stdafx.h"
-#include "proto/redis_coder.h"
-#include "proto/redis_object.h"
+#include "coder/redis_coder.h"
+#include "coder/redis_object.h"
 
 #include "redis_handler.h"
 #include "redis_server.h"

diff --git a/app/wizard_demo/pkv/action/redis_string.cpp b/app/wizard_demo/pkv/action/redis_string.cpp
@@ -3,8 +3,8 @@
 //
 
 #include "stdafx.h"
-#include "proto/redis_coder.h"
-#include "proto/redis_object.h"
+#include "coder/redis_coder.h"
+#include "coder/redis_object.h"
 #include "dao/string.h"
 
 #include "redis_handler.h"

diff --git a/app/wizard_demo/pkv/coder/redis_coder.cpp b/app/wizard_demo/pkv/coder/redis_coder.cpp
@@ -0,0 +1,75 @@
+//
+// Created by shuxin ¡¡¡¡zheng on 2023/7/19.
+//
+
+#include "stdafx.h"
+#include "redis_ocache.h"
+#include "redis_coder.h"
+#include "dao/string.h"
+
+namespace pkv {
+
+#if 1
+#define EMPTY(x) ((x).size() == 0)
+#else
+#define EMPTY(x) ((x).empty())
+#endif
+
+#if 0
+#define LIKELY(x)   __builtin_expect(!!(x), 1)
+#define UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+#define LIKELY(x)       (x)
+#define UNLIKELY(x)     (x)
+#endif
+
+redis_coder::redis_coder(redis_ocache& cache)
+: cache_(cache)
+{
+    curr_ = cache_.get();
+}
+
+redis_coder::~redis_coder() {
+    clear();
+    cache_.put(curr_);
+}
+
+void redis_coder::clear() {
+    for (auto obj : objs_) {
+        cache_.put(obj);
+    }
+    objs_.clear();
+}
+
+const char* redis_coder::update(const char* data, size_t& len) {
+    while (len > 0) {
+        data = curr_->update(data, len);
+        if (curr_->finish()) {
+            objs_.push_back(curr_);
+            curr_ = cache_.get();
+        } else if (curr_->failed()) {
+            break;
+        }
+    }
+
+    return data;
+}
+
+redis_object& redis_coder::create_object() {
+    redis_object* obj = cache_.get();
+    assert(obj);
+    objs_.push_back(obj);
+    return *obj;
+}
+
+bool redis_coder::to_string(std::string& out) const {
+    for (const auto& obj : objs_) {
+        if (!obj->to_string(out)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+} // namespace pkv
diff --git a/app/wizard_demo/pkv/proto/redis_coder.h → app/wizard_demo/pkv/coder/redis_coder.h b/app/wizard_demo/pkv/proto/redis_coder.h → app/wizard_demo/pkv/coder/redis_coder.h
diff --git a/app/wizard_demo/pkv/proto/redis_object.cpp → app/wizard_demo/pkv/coder/redis_object.cpp b/app/wizard_demo/pkv/proto/redis_object.cpp → app/wizard_demo/pkv/coder/redis_object.cpp
diff --git a/app/wizard_demo/pkv/proto/redis_object.h → app/wizard_demo/pkv/coder/redis_object.h b/app/wizard_demo/pkv/proto/redis_object.h → app/wizard_demo/pkv/coder/redis_object.h
diff --git a/app/wizard_demo/pkv/proto/redis_ocache.cpp → app/wizard_demo/pkv/coder/redis_ocache.cpp b/app/wizard_demo/pkv/proto/redis_ocache.cpp → app/wizard_demo/pkv/coder/redis_ocache.cpp
diff --git a/app/wizard_demo/pkv/proto/redis_ocache.h → app/wizard_demo/pkv/coder/redis_ocache.h b/app/wizard_demo/pkv/proto/redis_ocache.h → app/wizard_demo/pkv/coder/redis_ocache.h
diff --git a/app/wizard_demo/pkv/proto/redis_type.h → app/wizard_demo/pkv/coder/redis_type.h b/app/wizard_demo/pkv/proto/redis_type.h → app/wizard_demo/pkv/coder/redis_type.h
diff --git a/app/wizard_demo/pkv/main.cpp b/app/wizard_demo/pkv/main.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include <signal.h>
-#include "proto/redis_coder.h"
+#include "test/test_coder.h"
 #include "master_service.h"
 
 static void on_sigint(int) {

diff --git a/app/wizard_demo/pkv/master_service.cpp b/app/wizard_demo/pkv/master_service.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "proto/redis_ocache.h"
-#include "proto/redis_coder.h"
+#include "coder/redis_ocache.h"
+#include "coder/redis_coder.h"
 #include "action/redis_handler.h"
 #include "master_service.h"
 

diff --git a/app/wizard_demo/pkv/proto/redis_coder.cpp → app/wizard_demo/pkv/test/test_coder.cpp b/app/wizard_demo/pkv/proto/redis_coder.cpp → app/wizard_demo/pkv/test/test_coder.cpp
@@ -3,77 +3,12 @@
 //
 
 #include "stdafx.h"
-#include "redis_ocache.h"
-#include "redis_coder.h"
-#include "dao/string.h"
+#include "coder/redis_ocache.h"
+#include "coder/redis_coder.h"
 
-namespace pkv {
-
-#if 1
-#define EMPTY(x) ((x).size() == 0)
-#else
-#define EMPTY(x) ((x).empty())
-#endif
-
-#if 0
-#define LIKELY(x)   __builtin_expect(!!(x), 1)
-#define UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-#define LIKELY(x)       (x)
-#define UNLIKELY(x)     (x)
-#endif
-
-redis_coder::redis_coder(redis_ocache& cache)
-: cache_(cache)
-{
-    curr_ = cache_.get();
-}
-
-redis_coder::~redis_coder() {
-    clear();
-    cache_.put(curr_);
-}
+#include "test_coder.h"
 
-void redis_coder::clear() {
-    for (auto obj : objs_) {
-        cache_.put(obj);
-    }
-    objs_.clear();
-}
-
-const char* redis_coder::update(const char* data, size_t& len) {
-    while (len > 0) {
-        data = curr_->update(data, len);
-        if (curr_->finish()) {
-            objs_.push_back(curr_);
-            curr_ = cache_.get();
-        } else if (curr_->failed()) {
-            break;
-        }
-    }
-
-    return data;
-}
-
-redis_object& redis_coder::create_object() {
-    redis_object* obj = cache_.get();
-    assert(obj);
-    objs_.push_back(obj);
-    return *obj;
-}
-
-bool redis_coder::to_string(std::string& out) const {
-    for (const auto& obj : objs_) {
-        if (!obj->to_string(out)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
+namespace pkv {
 
 bool test_redis_parse(const char* filepath) {
     if (!test_redis_parse_once(filepath)) {
@@ -299,6 +234,4 @@ size_t redis_parse_bench(const char* filepath, size_t max) {
     return i;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
 } // namespace pkv
diff --git a/app/wizard_demo/pkv/test/test_coder.h b/app/wizard_demo/pkv/test/test_coder.h
@@ -0,0 +1,17 @@
+//
+// Created by shuxin ¡¡¡¡zheng on 2023/7/19.
+//
+
+#pragma once
+
+namespace pkv {
+
+bool test_redis_parse(const char* filepath);
+bool test_redis_parse_once(const char* filepath);
+bool test_redis_parse_stream(const char* filepath);
+
+bool test_redis_build();
+size_t redis_build_bench(size_t max);
+size_t redis_parse_bench(const char* filepath, size_t max);
+
+} // namespace pkv
diff --git a/app/wizard_demo/pkv/wdb.cf b/app/wizard_demo/pkv/wdb.cf
@@ -88,7 +88,7 @@ service pkv
 #	每个进程实例的空闲超时时间，超过此值后进程实例主动退出
 	fiber_idle_limit = 0
 #	每个进程启动的线程数
-	fiber_threads = 4
+	fiber_threads = 1
 #	进程运行时所在的路径
 	fiber_queue_dir = {install_path}/var
 #	读写超时时间, 单位为秒