[spannTree] Reading data on C++ code

Author: cvvergara

include/drivers/spanningTree/kruskal_driver.h

@@ -31,40 +31,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_DRIVERS_SPANNINGTREE_KRUSKAL_DRIVER_H_
 #pragma once
 
-/* for size-t */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <postgres.h>
+#include <utils/array.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "cpp_common/undefPostgresDefine.hpp"
+
 #ifdef __cplusplus
 #   include <cstddef>
 #   include <cstdint>
-using Edge_t = struct Edge_t;
 using MST_rt = struct MST_rt;
 #else
 #   include <stddef.h>
 #   include <stdint.h>
-typedef struct Edge_t Edge_t;
 typedef struct MST_rt MST_rt;
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-    void
-        do_pgr_kruskal(
-                Edge_t  *data_edges,
-                size_t total_edges,
-
-                int64_t *root,
-                size_t total_roots,
 
-                char* fn_suffix,
+void pgr_do_kruskal(
+        char*,
+        ArrayType*,
 
-                int64_t max_depth,
-                double distance,
+        char*, int64_t, double,
 
-                MST_rt **return_tuples,
-                size_t *return_count,
-                char ** log_msg,
-                char ** notice_msg,
-                char ** err_msg);
+        MST_rt**, size_t*,
+        char**, char**, char**);
 
 #ifdef __cplusplus
 }

include/drivers/spanningTree/prim_driver.h

@@ -31,40 +31,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_DRIVERS_SPANNINGTREE_PRIM_DRIVER_H_
 #pragma once
 
-/* for size-t */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <postgres.h>
+#include <utils/array.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "cpp_common/undefPostgresDefine.hpp"
+
 #ifdef __cplusplus
 #   include <cstddef>
 #   include <cstdint>
+using MST_rt = struct MST_rt;
 #else
 #   include <stddef.h>
 #   include <stdint.h>
+typedef struct MST_rt MST_rt;
 #endif
 
-typedef struct Edge_t Edge_t;
-typedef struct MST_rt MST_rt;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void do_pgr_prim(
-        Edge_t  *data_edges,
-        size_t total_edges,
-
-        int64_t *rootsArr,
-        size_t size_rootsArr,
-
-        char* fn_suffix,
-
-        int64_t max_depth,
-        double distance,
+void pgr_do_prim(
+        char*,
+        ArrayType*,
 
-        MST_rt **return_tuples,
-        size_t *return_count,
+        char*, int64_t, double,
 
-        char ** log_msg,
-        char ** notice_msg,
-        char ** err_msg);
+        MST_rt**, size_t*,
+        char**, char**, char**);
 
 #ifdef __cplusplus
 }

include/drivers/spanningTree/randomSpanningTree_driver.h

@@ -31,31 +31,40 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_DRIVERS_SPANNINGTREE_RANDOMSPANNINGTREE_DRIVER_H_
 #pragma once
 
-/* for size-t */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <postgres.h>
+#include <utils/array.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "cpp_common/undefPostgresDefine.hpp"
+
 #ifdef __cplusplus
 #   include <cstddef>
+using  SpanTree_rt = struct SpanTree_rt;
 #else
 #   include <stddef.h>
+typedef SpanTree_rt SpanTree_rt;
 #endif
 
-typedef struct Edge_t Edge_t;
-typedef SpanTree_rt SpanTree_rt;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-    void
-        do_pgr_randomSpanningTree(
-                Edge_t  *data_edges,
-                size_t total_edges,
-                int64_t root_vertex,
-                bool directed,
-                SpanTree_rt **return_tuples,
-                size_t *return_count,
-                char ** log_msg,
-                char ** notice_msg,
-                char ** err_msg);
+void pgr_do_randomSpanningTree(
+        char*,
+        ArrayType*,
+
+        int64_t, double,
+
+        SpanTree_rt**, size_t*,
+        char**, char**, char**);
 
 #ifdef __cplusplus
 }

src/spanningTree/kruskal.c

@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_common/debug_macro.h"
 #include "c_common/e_report.h"
 #include "c_common/time_msg.h"
-#include "c_common/trsp_pgget.h"
 #include "c_types/mst_rt.h"
 
 #include "drivers/spanningTree/mst_common.h"
@@ -59,6 +58,8 @@ process(
     char* log_msg = NULL;
     char* notice_msg = NULL;
     char* err_msg = NULL;
+    (*result_tuples) = NULL;
+    (*result_count) = 0;
 
 
     char * fn_name = get_name(0, fn_suffix, &err_msg);
@@ -67,30 +68,10 @@ process(
         return;
     }
 
-    /* checks previously done on sql now done here */
-    if (strcmp(fn_suffix, "DD") == 0 && distance < 0) {
-        throw_error("Negative value found on 'distance'", "Must be positive");
-    } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) {
-        throw_error("Negative value found on 'max_depth'", "Must be positive");
-    }
-
-    size_t size_rootsArr = 0;
-    int64_t* rootsArr = pgr_get_bigIntArray(&size_rootsArr, roots, false, &err_msg);
-    throw_error(err_msg, "While getting start vids");
-
-    (*result_tuples) = NULL;
-    (*result_count) = 0;
-
-    Edge_t *edges = NULL;
-    size_t total_edges = 0;
-
-    pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg);
-    throw_error(err_msg, edges_sql);
-
     clock_t start_t = clock();
-    do_pgr_kruskal(
-            edges, total_edges,
-            rootsArr, size_rootsArr,
+    pgr_do_kruskal(
+            edges_sql,
+            roots,
             fn_suffix,
             max_depth,
             distance,
@@ -100,15 +81,13 @@ process(
             &log_msg,
             &notice_msg,
             &err_msg);
-
     time_msg(fn_name, start_t, clock());
 
     if (err_msg) {
         if (*result_tuples) pfree(*result_tuples);
     }
     pgr_global_report(log_msg, notice_msg, err_msg);
 
-    if (edges) pfree(edges);
     if (log_msg) pfree(log_msg);
     if (notice_msg) pfree(notice_msg);
     if (err_msg) pfree(err_msg);
@@ -128,8 +107,6 @@ PGDLLEXPORT Datum _pgr_kruskalv4(PG_FUNCTION_ARGS) {
         funcctx = SRF_FIRSTCALL_INIT();
         oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 
-
-        /* Edge sql, tree roots, fn_suffix, max_depth, distance */
         process(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
                 PG_GETARG_ARRAYTYPE_P(1),
@@ -259,7 +236,6 @@ PGDLLEXPORT Datum _pgr_kruskal(PG_FUNCTION_ARGS) {
         values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge);
         values[5] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost);
         values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost);
-        /**********************************************************************/
 
         tuple = heap_form_tuple(tuple_desc, values, nulls);
         result = HeapTupleGetDatum(tuple);

src/spanningTree/kruskal_driver.cpp

@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <vector>
 #include <string>
 
+#include "cpp_common/pgdata_getters.hpp"
 #include "cpp_common/pgr_alloc.hpp"
 #include "cpp_common/pgr_assert.h"
 
@@ -41,12 +42,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 void
-do_pgr_kruskal(
-        Edge_t  *data_edges,
-        size_t total_edges,
-
-        int64_t *rootsArr,
-        size_t size_rootsArr,
+pgr_do_kruskal(
+        char *edges_sql,
+        ArrayType* starts,
 
         char* fn_suffix,
 
@@ -62,31 +60,39 @@ do_pgr_kruskal(
     using pgrouting::pgr_alloc;
     using pgrouting::pgr_msg;
     using pgrouting::pgr_free;
+    using pgrouting::pgget::get_intArray;
 
     std::ostringstream log;
     std::ostringstream err;
     std::ostringstream notice;
+    char *hint = nullptr;
+
     try {
         pgassert(!(*log_msg));
         pgassert(!(*notice_msg));
         pgassert(!(*err_msg));
         pgassert(!(*return_tuples));
         pgassert(*return_count == 0);
 
-        std::vector<int64_t> roots(rootsArr, rootsArr + size_rootsArr);
+        auto roots = get_intArray(starts, false);
+
+        hint = edges_sql;
+        auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false);
+        hint = nullptr;
+
         std::string suffix(fn_suffix);
 
         std::vector<MST_rt> results;
 
-        if (total_edges == 0) {
+        pgrouting::UndirectedGraph undigraph(UNDIRECTED);
+        undigraph.insert_edges(edges);
+        pgrouting::functions::Pgr_kruskal<pgrouting::UndirectedGraph> kruskal;
+
+        if (edges.empty()) {
             results = pgrouting::details::get_no_edge_graph_result(roots);
+            *notice_msg = pgr_msg("No edges found");
+            *log_msg = pgr_msg(edges_sql);
         } else {
-            pgrouting::UndirectedGraph undigraph(UNDIRECTED);
-            undigraph.insert_edges(data_edges, total_edges);
-
-            pgrouting::functions::Pgr_kruskal
-                <pgrouting::UndirectedGraph> kruskal;
-
             if (suffix == "") {
                 results = kruskal.kruskal(undigraph);
             } else if (suffix == "BFS") {
@@ -104,13 +110,6 @@ do_pgr_kruskal(
 
         auto count = results.size();
 
-        if (count == 0) {
-            (*return_tuples) = NULL;
-            (*return_count) = 0;
-            notice << "No spanning tree found";
-            return;
-        }
-
         (*return_tuples) = pgr_alloc(count, (*return_tuples));
         for (size_t i = 0; i < count; i++) {
             *((*return_tuples) + i) = results[i];
@@ -130,6 +129,9 @@ do_pgr_kruskal(
         err << except.what();
         *err_msg = pgr_msg(err.str().c_str());
         *log_msg = pgr_msg(log.str().c_str());
+    } catch (const std::string &ex) {
+        *err_msg = pgr_msg(ex.c_str());
+        *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str());
     } catch (std::exception &except) {
         (*return_tuples) = pgr_free(*return_tuples);
         (*return_count) = 0;