refactor(interactive): Reorganize the http handler of interactive

flex/engines/graph_db/database/graph_db_session.h

@@ -37,21 +37,17 @@ class GraphDBSession {
  public:
   enum class InputFormat : uint8_t {
     kCppEncoder = 0,
-#ifdef BUILD_HQPS
-    kCypherJson = 1,               // External usage format
-    kCypherInternalAdhoc = 2,      // Internal format for adhoc query
-    kCypherInternalProcedure = 3,  // Internal format for procedure
-#endif                             // BUILD_HQPS
+    kCypherJson = 1,            // Json format for cypher query
+    kCypherProtoAdhoc = 2,      // Protobuf format for adhoc query
+    kCypherProtoProcedure = 3,  // Protobuf format for procedure query
   };
 
   static constexpr int32_t MAX_RETRY = 3;
   static constexpr int32_t MAX_PLUGIN_NUM = 256;  // 2^(sizeof(uint8_t)*8)
-#ifdef BUILD_HQPS
-  static constexpr const char* kCppEncoder = "\x00";
-  static constexpr const char* kCypherJson = "\x01";
-  static constexpr const char* kCypherInternalAdhoc = "\x02";
-  static constexpr const char* kCypherInternalProcedure = "\x03";
-#endif  // BUILD_HQPS
+  static constexpr const char* kCppEncoderStr = "\x00";
+  static constexpr const char* kCypherJsonStr = "\x01";
+  static constexpr const char* kCypherProtoAdhocStr = "\x02";
+  static constexpr const char* kCypherProtoProcedureStr = "\x03";
   GraphDBSession(GraphDB& db, Allocator& alloc, WalWriter& logger,
                  const std::string& work_dir, int thread_id)
       : db_(db),
@@ -157,7 +153,7 @@ class GraphDBSession {
     }
 #ifdef BUILD_HQPS
     else if (input_tag ==
-             static_cast<uint8_t>(InputFormat::kCypherInternalAdhoc)) {
+             static_cast<uint8_t>(InputFormat::kCypherProtoAdhoc)) {
       // For cypher internal adhoc, the query id is the
       // second last byte,which is fixed to 255, and other bytes are a string
       // representing the path to generated dynamic lib.
@@ -169,7 +165,7 @@ class GraphDBSession {
       std::string_view str_view(input.data(), len - 1);
       return parse_query_type_from_cypher_json(str_view);
     } else if (input_tag ==
-               static_cast<uint8_t>(InputFormat::kCypherInternalProcedure)) {
+               static_cast<uint8_t>(InputFormat::kCypherProtoProcedure)) {
       // For cypher internal procedure, the query_name is
       // provided in the protobuf message.
       std::string_view str_view(input.data(), len - 1);

flex/engines/http_server/actor/admin_actor.act.cc

@@ -1068,12 +1068,6 @@ seastar::future<admin_query_result> admin_actor::start_service(
     // now start the compiler
     auto schema_path =
         server::WorkDirManipulator::GetGraphSchemaPath(graph_name);
-    if (!hqps_service.start_compiler_subprocess(schema_path)) {
-      LOG(ERROR) << "Fail to start compiler";
-      return seastar::make_ready_future<admin_query_result>(
-          gs::Result<seastar::sstring>(gs::Status(gs::StatusCode::InternalError,
-                                                  "Fail to start compiler")));
-    }
     LOG(INFO) << "Successfully started service with graph: " << graph_name;
     hqps_service.reset_start_time();
     return seastar::make_ready_future<admin_query_result>(
@@ -1112,18 +1106,9 @@ seastar::future<admin_query_result> admin_actor::stop_service(
                              "Fail to clear running graph")));
         }
       }
-
-      if (hqps_service.stop_compiler_subprocess()) {
-        LOG(INFO) << "Successfully stop compiler";
-        return seastar::make_ready_future<admin_query_result>(
-            gs::Result<seastar::sstring>(
-                to_message_json("Successfully stop service")));
-      } else {
-        LOG(ERROR) << "Fail to stop compiler";
-        return seastar::make_ready_future<admin_query_result>(
-            gs::Result<seastar::sstring>(gs::Status(
-                gs::StatusCode::InternalError, "Fail to stop compiler")));
-      }
+      return seastar::make_ready_future<admin_query_result>(
+          gs::Result<seastar::sstring>(
+              to_message_json("Successfully stop service")));
     }
   });
 }

flex/engines/http_server/handler/admin_http_handler.cc

@@ -691,7 +691,7 @@ seastar::future<> admin_http_handler::set_routes() {
     {
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_procedure_handler_impl(
-              interactive_admin_group_id, shard_admin_procedure_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph")
           .add_param("graph_id")
           .add_str("/procedure");
@@ -701,7 +701,7 @@ seastar::future<> admin_http_handler::set_routes() {
     {
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_procedure_handler_impl(
-              interactive_admin_group_id, shard_admin_procedure_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph")
           .add_param("graph_id")
           .add_str("/procedure");
@@ -712,7 +712,7 @@ seastar::future<> admin_http_handler::set_routes() {
       // Each procedure's handling
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_procedure_handler_impl(
-              interactive_admin_group_id, shard_admin_procedure_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph")
           .add_param("graph_id")
           .add_str("/procedure")
@@ -725,7 +725,7 @@ seastar::future<> admin_http_handler::set_routes() {
       // Each procedure's handling
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_procedure_handler_impl(
-              interactive_admin_group_id, shard_admin_procedure_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph")
           .add_param("graph_id")
           .add_str("/procedure")
@@ -737,7 +737,7 @@ seastar::future<> admin_http_handler::set_routes() {
       // Each procedure's handling
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_procedure_handler_impl(
-              interactive_admin_group_id, shard_admin_procedure_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph")
           .add_param("graph_id")
           .add_str("/procedure")
@@ -750,24 +750,24 @@ seastar::future<> admin_http_handler::set_routes() {
     // List all graphs.
     r.add(seastar::httpd::operation_type::GET, seastar::httpd::url("/v1/graph"),
           new admin_http_graph_handler_impl(interactive_admin_group_id,
-                                            shard_admin_graph_concurrency));
+                                            shard_admin_concurrency));
     // Create a new Graph
     r.add(seastar::httpd::operation_type::POST,
           seastar::httpd::url("/v1/graph"),
           new admin_http_graph_handler_impl(interactive_admin_group_id,
-                                            shard_admin_graph_concurrency));
+                                            shard_admin_concurrency));
 
     // Delete a graph
     r.add(SEASTAR_DELETE,
           seastar::httpd::url("/v1/graph").remainder("graph_id"),
           new admin_http_graph_handler_impl(interactive_admin_group_id,
-                                            shard_admin_graph_concurrency));
+                                            shard_admin_concurrency));
     {
       // uploading file to server
       r.add(seastar::httpd::operation_type::POST,
             seastar::httpd::url("/v1/file/upload"),
             new admin_file_upload_handler_impl(interactive_admin_group_id,
-                                               shard_admin_graph_concurrency));
+                                               shard_admin_concurrency));
     }
 
     // Get graph metadata
@@ -776,7 +776,7 @@ seastar::future<> admin_http_handler::set_routes() {
       // /v1/graph/{graph_id}/schema
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_graph_handler_impl(
-              interactive_admin_group_id, shard_admin_graph_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph").add_param("graph_id", false);
       // Get graph schema
       r.add(match_rule, seastar::httpd::operation_type::GET);
@@ -785,7 +785,7 @@ seastar::future<> admin_http_handler::set_routes() {
     {  // load data to graph
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_graph_handler_impl(
-              interactive_admin_group_id, shard_admin_graph_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph")
           .add_param("graph_id")
           .add_str("/dataloading");
@@ -794,15 +794,15 @@ seastar::future<> admin_http_handler::set_routes() {
     {  // Get Graph Schema
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_graph_handler_impl(
-              interactive_admin_group_id, shard_admin_graph_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph").add_param("graph_id").add_str("/schema");
       r.add(match_rule, seastar::httpd::operation_type::GET);
     }
     {
       // Get running graph statistics
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_graph_handler_impl(
-              interactive_admin_group_id, shard_admin_graph_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/graph")
           .add_param("graph_id")
           .add_str("/statistics");
@@ -814,18 +814,18 @@ seastar::future<> admin_http_handler::set_routes() {
       r.add(seastar::httpd::operation_type::GET,
             seastar::httpd::url("/v1/node/status"),
             new admin_http_node_handler_impl(interactive_admin_group_id,
-                                             shard_admin_node_concurrency));
+                                             shard_admin_concurrency));
 
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_service_handler_impl(
-              interactive_admin_group_id, shard_admin_service_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
       match_rule->add_str("/v1/service").add_param("action");
       r.add(match_rule, seastar::httpd::operation_type::POST);
 
       r.add(seastar::httpd::operation_type::GET,
             seastar::httpd::url("/v1/service/status"),
-            new admin_http_service_handler_impl(
-                interactive_admin_group_id, shard_admin_service_concurrency));
+            new admin_http_service_handler_impl(interactive_admin_group_id,
+                                                shard_admin_concurrency));
     }
 
     {
@@ -897,17 +897,17 @@ seastar::future<> admin_http_handler::set_routes() {
       // job request handling.
       r.add(seastar::httpd::operation_type::GET, seastar::httpd::url("/v1/job"),
             new admin_http_job_handler_impl(interactive_admin_group_id,
-                                            shard_admin_job_concurrency));
+                                            shard_admin_concurrency));
       auto match_rule =
           new seastar::httpd::match_rule(new admin_http_job_handler_impl(
-              interactive_admin_group_id, shard_admin_job_concurrency));
+              interactive_admin_group_id, shard_admin_concurrency));
 
       match_rule->add_str("/v1/job").add_param("job_id");
       r.add(match_rule, seastar::httpd::operation_type::GET);
 
       r.add(SEASTAR_DELETE, seastar::httpd::url("/v1/job").remainder("job_id"),
             new admin_http_job_handler_impl(interactive_admin_group_id,
-                                            shard_admin_job_concurrency));
+                                            shard_admin_concurrency));
     }
 
     return seastar::make_ready_future<>();