Skip to content

Commit 6008ce1

Browse files
authored
Merge pull request #14 from quackscience/revert-10-feature/duck_flock
Revert "Duck Flock for HTTP Server"
2 parents a127955 + 4668a2e commit 6008ce1

File tree

4 files changed

+2
-84
lines changed

4 files changed

+2
-84
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
88
project(${TARGET_NAME})
99
include_directories(src/include duckdb/third_party/httplib duckdb/parquet/include)
1010

11-
set(EXTENSION_SOURCES src/httpserver_extension.cpp src/duck_flock.cpp)
11+
set(EXTENSION_SOURCES src/httpserver_extension.cpp)
1212

1313
if(MINGW)
1414
set(OPENSSL_USE_STATIC_LIBS TRUE)

src/duck_flock.cpp

-78
This file was deleted.

src/httpserver_extension.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ static HttpServerState global_state;
7777
int64_t read_rows;
7878
};
7979

80-
81-
8280
// Convert the query result to JSON format
8381
static std::string ConvertResultToJSON(MaterializedQueryResult &result, ReqStats &req_stats) {
8482
auto doc = yyjson_mut_doc_new(nullptr);
@@ -471,7 +469,7 @@ static void LoadInternal(DatabaseInstance &instance) {
471469

472470
ExtensionUtil::RegisterFunction(instance, httpserve_start);
473471
ExtensionUtil::RegisterFunction(instance, httpserve_stop);
474-
ExtensionUtil::RegisterFunction(instance, DuckFlockTableFunction());
472+
475473
// Register the cleanup function to be called at exit
476474
std::atexit(HttpServerCleanup);
477475
}

src/include/httpserver_extension.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ struct HttpServerState;
1717
void HttpServerStart(DatabaseInstance& db, string_t host, int32_t port);
1818
void HttpServerStop();
1919

20-
TableFunction DuckFlockTableFunction();
21-
2220
} // namespace duckdb

0 commit comments

Comments
 (0)