Merge pull request #14 from quackscience/revert-10-feature/duck_flock

Revert "Duck Flock for HTTP Server"
quackscience · Nov 15, 2024 · 6008ce1 · 6008ce1
2 parents a127955 + 4668a2e
commit 6008ce1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 84 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
 project(${TARGET_NAME})
 include_directories(src/include duckdb/third_party/httplib duckdb/parquet/include)
 
-set(EXTENSION_SOURCES src/httpserver_extension.cpp src/duck_flock.cpp)
+set(EXTENSION_SOURCES src/httpserver_extension.cpp)
 
 if(MINGW)
   set(OPENSSL_USE_STATIC_LIBS TRUE)

diff --git a/src/duck_flock.cpp b/src/duck_flock.cpp
diff --git a/src/httpserver_extension.cpp b/src/httpserver_extension.cpp
@@ -77,8 +77,6 @@ static HttpServerState global_state;
         int64_t read_rows;
     };
 
-
-
 // Convert the query result to JSON format
 static std::string ConvertResultToJSON(MaterializedQueryResult &result, ReqStats &req_stats) {
     auto doc = yyjson_mut_doc_new(nullptr);
@@ -471,7 +469,7 @@ static void LoadInternal(DatabaseInstance &instance) {
 
     ExtensionUtil::RegisterFunction(instance, httpserve_start);
     ExtensionUtil::RegisterFunction(instance, httpserve_stop);
-    ExtensionUtil::RegisterFunction(instance, DuckFlockTableFunction());
+
     // Register the cleanup function to be called at exit
     std::atexit(HttpServerCleanup);
 }

diff --git a/src/include/httpserver_extension.hpp b/src/include/httpserver_extension.hpp
@@ -17,6 +17,4 @@ struct HttpServerState;
 void HttpServerStart(DatabaseInstance& db, string_t host, int32_t port);
 void HttpServerStop();
 
-	TableFunction DuckFlockTableFunction();
-
 } // namespace duckdb