Fix HTTP API: list databases

Signed-off-by: Jin Hai <haijin.chn@gmail.com>
infiniflow · Mar 13, 2024 · 4dadb46 · 4dadb46
1 parent cbc865a
commit 4dadb46
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/docs/http_api_reference.md b/docs/http_api_reference.md
@@ -6,7 +6,7 @@ create a new database.
 
 #### Request
 ```http request
-curl --request GET \
+curl --request POST \
      --url localhost:23820/databases/{database_name} \
      --header 'accept: application/json' \
      --header 'content-type: application/json' \
@@ -360,8 +360,6 @@ curl --request POST \
 ```
 
 ---
-
-
 ## Drop index
 
 Drop index
@@ -392,8 +390,6 @@ curl --request DELETE \
 
 ---
 
-
-
 ## Insert
 
 Insert data into table
@@ -516,7 +512,6 @@ curl --request PUT \
 
 ---
 
-
 ## Select
 
 select data from table
@@ -583,7 +578,7 @@ Get variables
 ```http request
 curl --request GET \
      --url localhost:23820/variables/{variable_name} \
-     --header 'accept: application/json' \
+     --header 'accept: application/json'
 ```
 
 #### Response

diff --git a/src/common/third_party.cppm b/src/common/third_party.cppm
@@ -228,5 +228,6 @@ export using HttpConnectionProvider = oatpp::network::tcp::server::ConnectionPro
 export using WebServer = oatpp::network::Server;
 export using WebEnvironment = oatpp::base::Environment;
 export using WebAddress = oatpp::network::Address;
+export using HTTPStatus = oatpp::web::protocol::http::Status;
 
 } // namespace infinity
diff --git a/src/network/http_server.cpp b/src/network/http_server.cpp
@@ -40,8 +40,10 @@ class ListDatabaseHandler final : public HttpRequestHandler {
         DeferFn defer_fn([&]() { infinity->RemoteDisconnect(); });
 
         auto result = infinity->ListDatabases();
+        nlohmann::json json_response;
+        HTTPStatus http_status;
         if(result.IsOk()) {
-            nlohmann::json json_response;
+
             SharedPtr<DataBlock> data_block = result.result_table_->GetDataBlockById(0);
             auto row_count = data_block->row_count();
             for (int i = 0; i < row_count; ++i) {
@@ -50,10 +52,14 @@ class ListDatabaseHandler final : public HttpRequestHandler {
                 json_response["databases"].push_back(db_name);
             }
 
-            return ResponseFactory::createResponse(Status::CODE_200, json_response.dump());
+            json_response["error_code"] = 0;
+            http_status = HTTPStatus::CODE_200;
         } else {
-            return ResponseFactory::createResponse(Status::CODE_404, "No database found");
+            json_response["error_code"] = result.ErrorCode();
+            json_response["error_message"] = result.ErrorMsg();
+            http_status = HTTPStatus::CODE_500;
         }
+        return ResponseFactory::createResponse(HTTPStatus::CODE_500, json_response.dump());
     }
 };