(astar) using the process and driver

cvvergara · cvvergara · commit 02a8c9cc1890 · 2026-02-07T16:32:59.000-06:00
diff --git a/include/c_common/enums.h b/include/c_common/enums.h
@@ -36,7 +36,9 @@ enum Which {
     /** allpairs **/
     FLOYD = 31, JOHNSON,
     /** metrics **/
-    BANDWIDTH
+    BANDWIDTH,
+    /* with edges that have x y*/
+    ASTAR= 400, BDASTAR
 };
 
 #endif  // INCLUDE_C_COMMON_ENUMS_H_
diff --git a/include/cpp_common/utilities.hpp b/include/cpp_common/utilities.hpp
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 namespace pgrouting {
 
 std::string get_name(Which);
+std::string get_name(Which, bool, bool);
 std::string get_name(Which, bool, bool, bool);
 char estimate_drivingSide(char, Which);
 void get_new_queries(const std::string&, const std::string&, std::string&, std::string&);
diff --git a/pgtap/astar/aStarCostMatrix/no_crash_test.pg b/pgtap/astar/aStarCostMatrix/no_crash_test.pg
@@ -6,7 +6,7 @@
 BEGIN;
 
 UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
-SELECT plan(15);
+SELECT plan(16);
 
 PREPARE edges_q AS
 SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2  FROM edges;
@@ -49,6 +49,7 @@ LANGUAGE plpgsql VOLATILE;
 
 
 SELECT * FROM test_function();
+SELECT throw_on_empty_edges_sql('pgr_astarCostMatrix', ',ARRAY[5,6]');
 
 SELECT finish();
 ROLLBACK;
diff --git a/pgtap/astar/astar/no_crash_test.pg b/pgtap/astar/astar/no_crash_test.pg
@@ -7,8 +7,11 @@ BEGIN;
 
 
 UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
-SELECT CASE WHEN min_version('3.2.0') THEN plan(97) ELSE plan(84) END;
+SELECT CASE WHEN min_version('3.2.0') THEN plan(98) ELSE plan(85) END;
 
 SELECT general_no_crash('pgr_aStar');
+SELECT throw_on_empty_edges_sql('pgr_aStar', ',1,2');
+
 SELECT finish();
+
 ROLLBACK;
diff --git a/pgtap/astar/astarCost/no_crash_test.pg b/pgtap/astar/astarCost/no_crash_test.pg
@@ -7,10 +7,11 @@ BEGIN;
 
 
 UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
-SELECT CASE WHEN min_version('3.2.0') THEN plan(97) ELSE plan(84) END;
+SELECT CASE WHEN min_version('3.2.0') THEN plan(98) ELSE plan(85) END;
 
 
-SELECT general_no_crash('pgr_aStar');
+SELECT general_no_crash('pgr_aStarCost');
+SELECT throw_on_empty_edges_sql('pgr_aStarCost', ',1,2');
+
 SELECT finish();
 ROLLBACK;
-
diff --git a/sql/astar/astarCostMatrix.sql b/sql/astar/astarCostMatrix.sql
@@ -49,7 +49,7 @@ CREATE FUNCTION pgr_aStarCostMatrix(
 RETURNS SETOF RECORD AS
 $BODY$
     SELECT a.start_vid, a.end_vid, a.agg_cost
-    FROM _pgr_astar(_pgr_get_statement($1), $2, $2, $3, $4, $5::FLOAT, $6::FLOAT, true) a;
+    FROM _pgr_astar(_pgr_get_statement($1), $2::BIGINT[], '{}'::BIGINT[], $3, $4, $5::FLOAT, $6::FLOAT, true) a;
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
 COST ${COST_HIGH} ROWS ${ROWS_HIGH};
diff --git a/src/astar/CMakeLists.txt b/src/astar/CMakeLists.txt
@@ -1,8 +1,10 @@
 # This file is part of the pgRouting project.
 # Copyright (c) 2007-2026 pgRouting developers
 # License: GPL-2 See https://github.com/pgRouting/pgrouting/blob/main/LICENSE
+
 ADD_LIBRARY(astar OBJECT
     astar.c
 
     astar_driver.cpp
-    )
+    astar_process.cpp
+)
diff --git a/src/astar/astar.c b/src/astar/astar.c
@@ -31,75 +31,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_common/postgres_connection.h"
 
 #include "c_types/path_rt.h"
-#include "c_common/debug_macro.h"
-#include "c_common/e_report.h"
-#include "c_common/time_msg.h"
-#include "c_common/check_parameters.h"
-#include "drivers/astar/astar_driver.h"
+#include "process/astar_process.h"
 
 PGDLLEXPORT Datum _pgr_astar(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(_pgr_astar);
 
-static
-void
-process(char* edges_sql,
-        char* combinations_sql,
-        ArrayType *starts,
-        ArrayType *ends,
-        bool directed,
-        int heuristic,
-        double factor,
-        double epsilon,
-        bool only_cost,
-        bool normal,
-        Path_rt **result_tuples,
-        size_t *result_count) {
-    check_parameters(heuristic, factor, epsilon);
-
-    pgr_SPI_connect();
-    char* log_msg = NULL;
-    char* notice_msg = NULL;
-    char* err_msg = NULL;
-
-    clock_t start_t = clock();
-    pgr_do_astar(
-            edges_sql,
-            combinations_sql,
-            starts,
-            ends,
-
-            directed,
-            heuristic,
-            factor,
-            epsilon,
-            only_cost,
-            normal,
-            result_tuples, result_count,
-            &log_msg,
-            &notice_msg,
-            &err_msg);
-
-    if (only_cost) {
-        time_msg("processing pgr_astarCost", start_t, clock());
-    } else {
-        time_msg("processing pgr_astar", start_t, clock());
-    }
-
-    if (err_msg && (*result_tuples)) {
-        pfree(*result_tuples);
-        (*result_tuples) = NULL;
-        (*result_count) = 0;
-    }
 
-    pgr_global_report(&log_msg, &notice_msg, &err_msg);
-
-    pgr_SPI_finish();
-}
-
-PGDLLEXPORT Datum
-_pgr_astar(PG_FUNCTION_ARGS) {
+PGDLLEXPORT Datum _pgr_astar(PG_FUNCTION_ARGS) {
     FuncCallContext     *funcctx;
-    TupleDesc           tuple_desc;
+    TupleDesc            tuple_desc;
 
     Path_rt  *result_tuples = NULL;
     size_t result_count = 0;
@@ -108,53 +48,59 @@ _pgr_astar(PG_FUNCTION_ARGS) {
         MemoryContext   oldcontext;
         funcctx = SRF_FIRSTCALL_INIT();
         oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-
-
         if (PG_NARGS() == 9) {
             /*
              * many to many
              */
-            process(
+            pgr_process_astar(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
                 NULL,
                 PG_GETARG_ARRAYTYPE_P(1),
                 PG_GETARG_ARRAYTYPE_P(2),
+
                 PG_GETARG_BOOL(3),
+                PG_GETARG_BOOL(7),
+                PG_GETARG_BOOL(8),
+
                 PG_GETARG_INT32(4),
                 PG_GETARG_FLOAT8(5),
                 PG_GETARG_FLOAT8(6),
-                PG_GETARG_BOOL(7),
-                PG_GETARG_BOOL(8),
+
+                ASTAR,
                 &result_tuples,
                 &result_count);
         } else if (PG_NARGS() == 7) {
             /*
              * Combinations
              */
-            process(
+            pgr_process_astar(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
                 text_to_cstring(PG_GETARG_TEXT_P(1)),
-                NULL,
-                NULL,
+
+                NULL, NULL,
+
                 PG_GETARG_BOOL(2),
+                PG_GETARG_BOOL(6),
+                true,
+
                 PG_GETARG_INT32(3),
                 PG_GETARG_FLOAT8(4),
                 PG_GETARG_FLOAT8(5),
-                PG_GETARG_BOOL(6),
-                true,
+
+                ASTAR,
                 &result_tuples,
                 &result_count);
         }
 
-
         funcctx->max_calls = result_count;
         funcctx->user_fctx = result_tuples;
         if (get_call_result_type(fcinfo, NULL, &tuple_desc)
-                != TYPEFUNC_COMPOSITE)
+                != TYPEFUNC_COMPOSITE) {
             ereport(ERROR,
                     (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                      errmsg("function returning record called in context "
                          "that cannot accept type record")));
+        }
 
         funcctx->tuple_desc = tuple_desc;
         MemoryContextSwitchTo(oldcontext);
@@ -171,7 +117,6 @@ _pgr_astar(PG_FUNCTION_ARGS) {
         bool*        nulls;
         size_t       call_cntr = funcctx->call_cntr;
 
-
         size_t numb = 8;
         values = palloc(numb * sizeof(Datum));
         nulls = palloc(numb * sizeof(bool));
diff --git a/src/cpp_common/combinations.cpp b/src/cpp_common/combinations.cpp
@@ -158,17 +158,17 @@ get_combinations(
     using pgrouting::pgget::get_combinations;
     std::map<int64_t, std::set<int64_t>> result;
 
-    auto starts = normal? get_intSet(startsArr) : get_intSet(endsArr);
-    auto ends = endsArr? (normal? get_intSet(endsArr) : get_intSet(startsArr)) : std::set<int64_t>();
+    auto starts = startsArr? (normal? get_intSet(startsArr) : get_intSet(endsArr))   : std::set<int64_t>();
+    auto ends =     endsArr? (normal? get_intSet(endsArr)   : get_intSet(startsArr)) : std::set<int64_t>();
 
     /* TODO Read query storing like std::map<int64_t , std::set<int64_t>> */
     /* queries are stored in vectors */
     auto combinations = !combinations_sql.empty()? get_combinations(combinations_sql) : std::vector<II_t_rt>();
 
-    ends = (!starts.empty() && ends.empty()) ?  starts : ends;
-
     /* data comes from CostMatrix */
-    is_matrix = combinations.empty() && starts == ends;
+    is_matrix = combinations.empty() && !starts.empty() && ends.empty();
+
+    ends = is_matrix? starts : ends;
 
     /* data comes from a combinations */
     for (const auto &row : combinations) {
diff --git a/src/cpp_common/utilities.cpp b/src/cpp_common/utilities.cpp
@@ -69,7 +69,7 @@ get_name(Which which, bool is_only_cost, bool is_near, bool is_matrix) {
     switch  (which) {
         case DIJKSTRA :
             base = "pgr_dijkstra";
-            suffix = std::string(is_near? "Near" : "") + (is_only_cost? "Cost" : "") + (is_matrix? "Matrix" : "");
+            suffix = std::string(is_near? "Near" : "") + (is_only_cost? "Cost" : "") + (is_only_cost && is_matrix? "Matrix" : "");
             break;
         case BDDIJKSTRA :
             base = "pgr_bdDijkstra";
@@ -92,13 +92,35 @@ get_name(Which which, bool is_only_cost, bool is_near, bool is_matrix) {
     return base + suffix;
 }
 
+std::string
+get_name(Which which, bool is_only_cost, bool is_matrix) {
+    std::string base = "";
+    std::string suffix = "";
+
+    switch (which) {
+        case ASTAR :
+            base = "pgr_astar";
+            suffix = std::string(is_only_cost? "Cost" : "") + (is_only_cost && is_matrix? "Matrix" : "");
+            break;
+        case BDASTAR :
+            base = "pgr_bdAstar";
+            suffix = std::string(is_only_cost? "Cost" : "") + (is_matrix? "Matrix" : "");
+            break;
+        default : base = "unknown";
+    }
+
+    return base + suffix;
+}
+
 char
 estimate_drivingSide(char driving_side, Which which) {
     char d_side = static_cast<char>(tolower(driving_side));
     if (!((d_side == 'r') || (d_side == 'l') || (d_side == 'b'))) {
         d_side = ' ';
     }
     switch (which) {
+        case ASTAR :
+        case BDASTAR :
         case DAGSP :
         case EDWARDMOORE:
         case BDDIJKSTRA:
