fix v2 procedure (#412)

* v2 procedure * cpplint * cpplint * it * it * it * it * node_buffer_ * node_buffer_ * add algo in it * add algo in it * add algo in it * add algo in it * disable it * upload multiple cpp files * rpc client * cpplint * asan * comments * comments * comments * procedure * procedure * procedure * procedure --------- Co-authored-by: Shipeng Qi <[email protected]>
TuGraph-family · Apr 2, 2024 · 28405ef · 28405ef
1 parent 7fadaad
commit 28405ef
Show file tree

Hide file tree

Showing 67 changed files with 2,467 additions and 752 deletions.
diff --git a/ci/github_ci.sh b/ci/github_ci.sh
@@ -76,7 +76,7 @@ else
   cp -r ../../learn/examples/* ./
   cp -r ../../demo/movie .
   if [[ "$WITH_PROCEDURE" == "OFF" ]]; then
-      rm -rf test_algo.py test_sampling.py test_train.py
+      rm -rf test_algo.py test_sampling.py test_train.py test_algo_v2.py
   fi
   pytest ./
   # codecov

diff --git a/cpplint/check_all.sh b/cpplint/check_all.sh
@@ -2,4 +2,4 @@
 set -e
 dir=$(dirname "$(readlink -f "$0")")
 cd $dir/../
-find src test include toolkits procedures -name "*.cpp" -o -name "*.h" | grep -v "/lmdb/" | xargs python3 ./cpplint/cpplint.py --quiet
+find src test include toolkits procedures -name "*.cpp" -o -name "*.h" | grep -v "/lmdb/" | grep -v "test/test_procedures/" | xargs python3 ./cpplint/cpplint.py --quiet
diff --git a/deps/tugraph-db-client-java b/deps/tugraph-db-client-java
diff --git a/deps/tugraph-web b/deps/tugraph-web
diff --git a/docs/en-US/source/5.developer-manual/6.interface/1.query/1.cypher.md b/docs/en-US/source/5.developer-manual/6.interface/1.query/1.cypher.md
diff --git a/docs/en-US/source/5.developer-manual/6.interface/3.procedure/1.procedure.md b/docs/en-US/source/5.developer-manual/6.interface/3.procedure/1.procedure.md
@@ -213,26 +213,31 @@ extern "C" LGAPI bool GetSignature(SigSpec &sig_spec) {
 
 extern "C" LGAPI bool ProcessInTxn(Transaction &txn,
                                    const std::string &request,
-                                   std::string &response) {
+                                   Result &response) {
     int64_t limit;
     try {
         json input = json::parse(request);
         limit = input["limit"].get<int64_t>();
     } catch (std::exception &e) {
-        response = std::string("error parsing json: ") + e.what();
+        response.ResetHeader({
+            {"errMsg", LGraphType::STRING}
+        });
+        response.MutableRecord()->Insert(
+            "errMsg",
+            FieldData::String(std::string("error parsing json: ") + e.what()));
         return false;
     }
 
-    Result result({{"node", LGraphType::NODE},
-                   {"salt", LGraphType::FLOAT},
-                   });
+    response.ResetHeader({
+        {"node", LGraphType::NODE},
+        {"salt", LGraphType::FLOAT}
+    });
     for (size_t i = 0; i < limit; i++) {
-        auto r = result.MutableRecord();
+        auto r = response.MutableRecord();
         auto vit = txn.GetVertexIterator(i);
         r->Insert("node", vit);
         r->Insert("salt", FieldData::Float(20.23*float(i)));
     }
-    response = result.Dump();
     return true;
 }
 ```

diff --git a/docs/zh-CN/source/5.developer-manual/6.interface/1.query/1.cypher.md b/docs/zh-CN/source/5.developer-manual/6.interface/1.query/1.cypher.md
diff --git a/docs/zh-CN/source/5.developer-manual/6.interface/3.procedure/1.procedure.md b/docs/zh-CN/source/5.developer-manual/6.interface/3.procedure/1.procedure.md
@@ -217,26 +217,31 @@ extern "C" LGAPI bool GetSignature(SigSpec &sig_spec) {
 
 extern "C" LGAPI bool ProcessInTxn(Transaction &txn,
                                    const std::string &request,
-                                   std::string &response) {
+                                   Result &response) {
     int64_t limit;
     try {
         json input = json::parse(request);
         limit = input["limit"].get<int64_t>();
     } catch (std::exception &e) {
-        response = std::string("error parsing json: ") + e.what();
+        response.ResetHeader({
+            {"errMsg", LGraphType::STRING}
+        });
+        response.MutableRecord()->Insert(
+            "errMsg",
+            FieldData::String(std::string("error parsing json: ") + e.what()));
         return false;
     }
 
-    Result result({{"node", LGraphType::NODE},
-                   {"salt", LGraphType::FLOAT},
-                   });
+    response.ResetHeader({
+        {"node", LGraphType::NODE},
+        {"salt", LGraphType::FLOAT}
+    });
     for (size_t i = 0; i < limit; i++) {
-        auto r = result.MutableRecord();
+        auto r = response.MutableRecord();
         auto vit = txn.GetVertexIterator(i);
         r->Insert("node", vit);
         r->Insert("salt", FieldData::Float(20.23*float(i)));
     }
-    response = result.Dump();
     return true;
 }
 ```

diff --git a/include/lgraph/lgraph.h b/include/lgraph/lgraph.h
@@ -33,12 +33,16 @@
 #undef BOOL
 #endif
 
+namespace lgraph_api {
+class Result;
+}
+
 namespace lgraph_api {
 typedef bool GetSignature(SigSpec &sig_spec);
 typedef bool Process(lgraph_api::GraphDB &db, const std::string &input, std::string &output);
 typedef bool ProcessInTxn(lgraph_api::Transaction& txn,
                           const std::string &input,
-                          std::string &output);
+                          lgraph_api::Result &output);
 }
 
 /*

diff --git a/include/lgraph/lgraph_result.h b/include/lgraph/lgraph_result.h
@@ -235,6 +235,25 @@ class Result {
      */
     Record *MutableRecord();
 
+    /**
+     * @brief   This function attempts to reserve enough memory for the result vector to hold
+     *          the specified number of elements.
+     *
+     */
+    void Reserve(size_t n);
+
+    /**
+     * @brief   This function will resize the vector to the specified number of elements
+     *
+     */
+    void Resize(size_t n);
+
+    /**
+     * @brief   Provides access to the data contained in the vector.
+     *
+     */
+    Record* At(size_t n);
+
     /**
      * @brief   return header of the table.
      *

diff --git a/include/lgraph/lgraph_rpc_client.h b/include/lgraph/lgraph_rpc_client.h
@@ -73,7 +73,8 @@ class RpcClient {
          * @brief   Load a user-defined procedure
          *
          * @param [out] result                  The result.
-         * @param [in]  source_file             the source_file contain procedure code.
+         * @param [in]  source_files            the source_file list contain procedure code(only
+         *                                      for code_type cpp)
          * @param [in]  procedure_type          the procedure type, currently supported CPP and PY.
          * @param [in]  procedure_name          procedure name.
          * @param [in]  code_type               code type, currently supported PY, SO, CPP, ZIP.
@@ -84,7 +85,7 @@ class RpcClient {
          *
          * @returns True if it succeeds, false if it fails.
          */
-        bool LoadProcedure(std::string& result, const std::string& source_file,
+        bool LoadProcedure(std::string& result, const std::vector<std::string>& source_files,
                            const std::string& procedure_type, const std::string& procedure_name,
                            const std::string& code_type, const std::string& procedure_description,
                            bool read_only, const std::string& version = "v1",
@@ -441,6 +442,27 @@ class RpcClient {
                        bool read_only, const std::string& version = "v1",
                        const std::string& graph = "default");
 
+    /**
+     * @brief   Load a built-in procedure
+     *
+     * @param [out] result                  The result.
+     * @param [in]  source_files            the source_file list contain procedure code(only
+*                                           for code_type cpp)
+     * @param [in]  procedure_type          the procedure type, currently supported CPP and PY.
+     * @param [in]  procedure_name          procedure name.
+     * @param [in]  code_type               code type, currently supported PY, SO, CPP, ZIP.
+     * @param [in]  procedure_description   procedure description.
+     * @param [in]  read_only               procedure is read only or not.
+     * @param [in]  version                 (Optional) the version of procedure.
+     * @param [in]  graph                   (Optional) the graph to query.
+     * @returns True if it succeeds, false if it fails.
+     */
+    bool LoadProcedure(std::string& result, const std::vector<std::string>& source_files,
+                       const std::string& procedure_type, const std::string& procedure_name,
+                       const std::string& code_type, const std::string& procedure_description,
+                       bool read_only, const std::string& version = "v1",
+                       const std::string& graph = "default");
+
     /**
      * @brief   List user-defined procedures
      *

diff --git a/include/lgraph/lgraph_utils.h b/include/lgraph/lgraph_utils.h
@@ -142,4 +142,12 @@ void parse_from_json(std::vector<DataType>& value, const char* key, json& input)
     }
 }
 
+/**
+ * \brief   Parse vid from the node passed in by cypher. For V2 procedure.
+ *
+ * \param[in]   node_string  node
+ * \return      vid
+ */
+size_t GetVidFromNodeString(const std::string& node_string);
+
 }  // namespace lgraph_api
diff --git a/include/lgraph/olap_base.h b/include/lgraph/olap_base.h
@@ -978,7 +978,6 @@ class OlapBase {
      * @param   vertices     The vertex id (in the Graph) to lock/unlock.
      *
      */
-
     void set_num_vertices(size_t vertices) {
         if (this->num_vertices_ == 0) {
             this->num_vertices_ = vertices;
@@ -1041,6 +1040,7 @@ class OlapBase {
                 num_threads = omp_get_num_threads();
             }
         };
+        // TODO(niyan.zy): move ThreadState to Construct
         ThreadState **thread_state;
         thread_state = new ThreadState *[num_threads];
         for (int t_i = 0; t_i < num_threads; t_i++) {
@@ -1166,6 +1166,7 @@ class OlapBase {
                 num_threads = omp_get_num_threads();
             }
         };
+        // TODO(niyan.zy): move ThreadState to Construct
         ThreadState **thread_state;
         thread_state = new ThreadState *[num_threads];
         for (int t_i = 0; t_i < num_threads; t_i++) {
+12 −1		rpc-client-test/src/main/java/com/antgroup/tugraph/TuGraphDbRpcClientTest.java
+36 −2		rpc-client/src/main/java/com/antgroup/tugraph/TuGraphDbRpcClient.java
+2 −1		rpc-client/src/main/proto/lgraph.proto
+12 −12		src/service/plugin/plugin.ts
+2 −2		src/store/plugin/plugin.ts
+2 −2		src/views/workbench/plugin/plugin.vue