Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON Compact output #3

Merged
merged 1 commit into from
Oct 14, 2024
Merged

JSON Compact output #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions src/httpserver_extension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,15 @@
#define CPPHTTPLIB_OPENSSL_SUPPORT
#include "httplib.hpp"

// Include yyjson for JSON handling
#include "yyjson.hpp"

#include <thread>
#include <memory>
#include <cstdlib>

using namespace duckdb_yyjson; // NOLINT

namespace duckdb {

struct HttpServerState {
Expand All @@ -30,6 +35,54 @@ struct HttpServerState {

static HttpServerState global_state;

// Convert the query result to JSON format
static std::string ConvertResultToJSON(MaterializedQueryResult &result) {
auto doc = yyjson_mut_doc_new(nullptr);
auto root = yyjson_mut_obj(doc);
yyjson_mut_doc_set_root(doc, root);

// Add meta information
auto meta_array = yyjson_mut_arr(doc);
for (idx_t col = 0; col < result.ColumnCount(); ++col) {
auto column_obj = yyjson_mut_obj(doc);
yyjson_mut_obj_add_str(doc, column_obj, "name", result.ColumnName(col).c_str());
yyjson_mut_arr_append(meta_array, column_obj);
}
yyjson_mut_obj_add_val(doc, root, "meta", meta_array);

// Add data
auto data_array = yyjson_mut_arr(doc);
for (idx_t row = 0; row < result.RowCount(); ++row) {
auto row_array = yyjson_mut_arr(doc);
for (idx_t col = 0; col < result.ColumnCount(); ++col) {
Value value = result.GetValue(col, row);
if (value.IsNull()) {
yyjson_mut_arr_append(row_array, yyjson_mut_null(doc));
} else {
std::string value_str = value.ToString();
yyjson_mut_arr_append(row_array, yyjson_mut_strncpy(doc, value_str.c_str(), value_str.length()));
}
}
yyjson_mut_arr_append(data_array, row_array);
}
yyjson_mut_obj_add_val(doc, root, "data", data_array);

// Add row count
yyjson_mut_obj_add_int(doc, root, "rows", result.RowCount());

// Write to string
auto data = yyjson_mut_write(doc, 0, nullptr);
if (!data) {
yyjson_mut_doc_free(doc);
throw InternalException("Failed to render the result as JSON, yyjson failed");
}

std::string json_output(data);
free(data);
yyjson_mut_doc_free(doc);
return json_output;
}

static void HandleQuery(const string& query, duckdb_httplib_openssl::Response& res) {
try {
if (!global_state.db_instance) {
Expand All @@ -45,13 +98,16 @@ static void HandleQuery(const string& query, duckdb_httplib_openssl::Response& r
return;
}

res.set_content(result->ToString(), "text/plain");
// Convert result to JSON
std::string json_output = ConvertResultToJSON(*result);
res.set_content(json_output, "application/json");
} catch (const Exception& ex) {
res.status = 400;
res.set_content(ex.what(), "text/plain");
}
}


void HttpServerStart(DatabaseInstance& db, string_t host, int32_t port) {
if (global_state.is_running) {
throw IOException("HTTP server is already running");
Expand Down Expand Up @@ -150,7 +206,6 @@ static void LoadInternal(DatabaseInstance &instance) {

// Register the cleanup function to be called at exit
std::atexit(HttpServerCleanup);

}

void HttpserverExtension::Load(DuckDB &db) {
Expand Down
Loading