Update

Author: JoshInnis

Makefile

@@ -55,6 +55,7 @@ OBJS = src/backend/postgraph.o \
        src/backend/utils/adt/gtype_funcs.o \
        src/backend/utils/adt/gtype_typecasting.o \
        src/backend/utils/adt/gtype_util.o \
+       src/backend/utils/adt/hashset.o \
        src/backend/utils/adt/cypher_funcs.o \
        src/backend/utils/adt/edge.o \
        src/backend/utils/adt/graphid.o \

postgraph--0.1.0.sql

@@ -6818,10 +6818,71 @@ CREATE AGGREGATE regr_r2(gtype, gtype) (
     parallel = SAFE
 );
 
+CREATE TYPE hashset;
 
+CREATE FUNCTION hashset_in(cstring) 
+RETURNS hashset 
+LANGUAGE c 
+IMMUTABLE 
+RETURNS NULL ON NULL INPUT 
+PARALLEL SAFE 
+AS 'MODULE_PATHNAME';
+
+CREATE FUNCTION hashset_out(hashset) 
+RETURNS cstring 
+LANGUAGE c 
+IMMUTABLE 
+RETURNS NULL ON NULL INPUT 
+PARALLEL SAFE 
+AS 'MODULE_PATHNAME';
+
+-- binary I/O functions
+CREATE FUNCTION hashset_send(hashset) 
+RETURNS bytea 
+LANGUAGE c 
+IMMUTABLE 
+RETURNS NULL ON NULL INPUT 
+PARALLEL SAFE 
+AS 'MODULE_PATHNAME';
+
+CREATE FUNCTION hashset_recv(internal) 
+RETURNS hashset 
+LANGUAGE c 
+IMMUTABLE 
+RETURNS NULL ON NULL INPUT 
+PARALLEL SAFE 
+AS 'MODULE_PATHNAME';
+
+CREATE TYPE hashset (
+    INPUT = hashset_in, 
+    OUTPUT = hashset_out, 
+    SEND = hashset_send, 
+    RECEIVE = hashset_recv, 
+    LIKE = jsonb,
+    STORAGE = extended
+);
+
+
+CREATE FUNCTION hashset_contains(hashset, graphid) 
+RETURNS boolean
+LANGUAGE c 
+IMMUTABLE 
+RETURNS NULL ON NULL INPUT 
+PARALLEL SAFE 
+AS 'MODULE_PATHNAME';
+
+CREATE OPERATOR @> (
+    FUNCTION = hashset_contains,
+    LEFTARG = hashset,
+    RIGHTARG = graphid--,
+    --COMMUTATOR = <@,
+    --NEGATOR = <> ,
+    --RESTRICT = edge_contains_restrict,
+    --JOIN = neqjoinsel
+);
 
 CREATE FUNCTION variable_edge_search(graph_oid gtype, id graphid, min gtype, max gtype)
-RETURNS TABLE  (edges variable_edge, endid graphid)
+RETURNS TABLE  (edges variable_edge, endid graphid, hset hashset)
 CALLED ON NULL INPUT
 STABLE
 PARALLEL SAFE

regress/sql/cypher_create.sql

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 PostGraphDB
+ * Copyright (C) 2023-2025 PostGraphDB
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -76,9 +76,50 @@ CREATE ();
 
 CREATE () RETURN 1 as a;
 
+CREATE ()-[]->()-[]->();
 CREATE ()-[]->()-[]->();
 MATCH  ()<-[]-()<-[]-() RETURN 1;
 MATCH  ()-[]->()-[]->() RETURN 1;
+
+
+EXPLAIN ANALYZE MATCH  (q)-[]->(q)-[]->() RETURN 1;
+MATCH  (q)-[]->(q)-[]->() RETURN 1;
+
+
+
+EXPLAIN ANALYZE
+MATCH (q)
+MATCH (q)-[]->()
+RETURN q;
+
+MATCH (q)
+MATCH (q)-[]->()
+RETURN q;
+
+EXPLAIN ANALYZE
+MATCH (q)
+MATCH ()-[]->(q)
+RETURN q;
+
+MATCH (q)
+MATCH ()-[]->(q)
+RETURN q;
+
+EXPLAIN ANALYZE
+MATCH (q)
+MATCH (b)-[]->()
+RETURN q;
+
+MATCH (q)
+MATCH (b)-[]->()
+RETURN q;
+
+EXPLAIN MATCH  (q)-[]->()<-[]-(q) RETURN 1;
+MATCH  (q)-[]->()<-[]-(q) RETURN 1;
+
+EXPLAIN ANALYZE MATCH  (q)<-[]-(q) RETURN 1;
+MATCH  (q)<-[]-(q) RETURN 1;
+
 EXPLAIN MATCH  ()-[]->()<-[]-() RETURN 1;
 EXPLAIN ANALYZE MATCH  ()-[]->()<-[]-() RETURN 1;
 MATCH  ()-[]->()<-[]-() RETURN 1;
@@ -87,6 +128,10 @@ EXPLAIN MATCH  (:test)-[]->()<-[]-(:test) RETURN 1;
 EXPLAIN ANALYZE MATCH  (:test)-[]->()<-[]-(:test) RETURN 1;
 MATCH  (:test)-[]->()<-[]-(:test) RETURN 1;
 
+
+MATCH  ()-[*1]->()-[]->() RETURN 1;
+EXPLAIN ANALYZE MATCH  ()-[*1]->()-[]->() RETURN 1;
+
 SELECT * FROM cypher_create._adj__ag_label_vertex;
 MATCH (a) RETURN a;
 --SELECT * FROM cypher_create.idx_hash__adj__ag_label_vertex;

src/backend/parser/cypher_analyze.c

@@ -1340,7 +1340,6 @@ analyze_cypher(List *stmt, ParseState *parent_pstate, const char *query_str, int
     // we don't want functions that go up the pstate parent chain to access the * original SQL query pstate.
     pstate->parentParseState = NULL;
 
-    // override p_sourcetext with query_str to make parser_errposition() work correctly with errpos_ecb()
     pstate->p_sourcetext = query_str;
 
     cpstate->graph_name = graph_name;