Support MATCH Variables in endpoint

Inefficient, to be redone, but it works

Author: JoshInnis

postgraph--0.1.0.sql

@@ -313,7 +313,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION build_vertex(graphid, oid, gtype) 
 RETURNS vertex 
 LANGUAGE c 
-IMMUTABLE 
+STABLE
 CALLED ON NULL INPUT 
 PARALLEL SAFE 
 COST 50
@@ -442,7 +442,7 @@ AS 'MODULE_PATHNAME';
 
 
 CREATE FUNCTION retrieve_vertex(graph_oid gtype, id graphid)
-RETURNS gtype
+RETURNS TABLE (properties gtype)
 RETURNS NULL ON NULL INPUT
 STABLE
 PARALLEL SAFE
@@ -590,9 +590,9 @@ CREATE OPERATOR = (
     COMMUTATOR = =, 
     NEGATOR = <>, 
     RESTRICT = eqsel, 
-    JOIN = eqjoinsel--, 
-    --HASHES, 
-    --MERGES
+    JOIN = eqjoinsel, 
+    HASHES, 
+    MERGES
 );
 
 CREATE FUNCTION graphid_ne(graphid, graphid) 

regress/sql/cypher_create.sql

@@ -64,11 +64,6 @@ MATCH ()<-[]-() RETURN 1;
 MATCH ()<-[q]-() RETURN 1;
 
 
-MATCH ()<-[q]-() RETURN q;
-
-MATCH (e)<-[q]-() RETURN q, e;
-
-/*
 MATCH (a)-[]->() RETURN a;
 
 MATCH (a)<-[]-() RETURN a;
@@ -77,7 +72,7 @@ MATCH (a)<-[]-() RETURN a;
 MATCH ()-[]->(a) RETURN a;
 
 MATCH ()<-[]-(a) RETURN a;
-*/
+
 SELECT * FROM cypher_create._ag_label_vertex;
 
 SELECT * FROM cypher_create._adj__adj__ag_label_vertex;

src/backend/utils/adt/vertex.c

@@ -102,13 +102,13 @@ build_vertex(PG_FUNCTION_ARGS) {
     graphid id = AG_GETARG_GRAPHID(0);
     Oid graph_oid = PG_GETARG_OID(1);
     gtype *properties = NULL;
-    if (!PG_ARGISNULL(2)) {
+  /*  if (!PG_ARGISNULL(2)) {
         properties = AG_GET_ARG_GTYPE_P(2);
 
         if (!AGT_ROOT_IS_OBJECT(properties))
             PG_RETURN_NULL();
     }
-
+*/
     AG_RETURN_VERTEX(create_vertex(id, graph_oid, properties));
 }
 

src/backend/utils/edge_searching.c

@@ -87,10 +87,57 @@ static Datum get_vertex(Oid graph_oid, int64 graphid)
 
 PG_FUNCTION_INFO_V1(retrieve_vertex);
 Datum retrieve_vertex(PG_FUNCTION_ARGS) {
-    gtype *graph_oid = GT_ARG_TO_INT4_DATUM(0);
-    graphid id = AG_GETARG_GRAPHID(1);
+    
+	//PG_RETURN_POINTER(get_vertex(graph_oid, id));
+
+ 	//gtype *graph_oid = GT_ARG_TO_INT4_DATUM(0);
+    //graphid id = AG_GETARG_GRAPHID(1);
 
-	PG_RETURN_POINTER(get_vertex(graph_oid, id));
+    //lquery *label = PG_GETARG_LQUERY_P(1);
+    //bool include_props = PG_GETARG_BOOL(2);
+	FuncCallContext *funcctx;
+	if (SRF_IS_FIRSTCALL())
+	{
+		MemoryContext oldcontext;
+		TupleDesc	tupdesc;
+
+		funcctx = SRF_FIRSTCALL_INIT();
+		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+
+		tupdesc = CreateTemplateTupleDesc(1);
+
+		tupdesc->tdtypeid = RECORDOID;	/* not right, but we don't care */
+		tupdesc->tdtypmod = -1;
+		TupleDescInitEntry(tupdesc, (AttrNumber) 1, "properties",
+						   GTYPEOID, -1, 0);
+
+		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
+
+		MemoryContextSwitchTo(oldcontext);
+
+		funcctx = SRF_PERCALL_SETUP();
+	
+
+		Datum values[1];
+		bool nulls[1];
+		HeapTuple tuple1;
+		gtype *graph_oid = GT_ARG_TO_INT4_DATUM(0);
+		graphid id = AG_GETARG_GRAPHID(1);
+   
+		bool isnull;
+		values[0] = get_vertex(graph_oid, id);
+		nulls[0] = true;
+		tuple1 = heap_form_tuple(funcctx->tuple_desc, values, nulls);
+		SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(tuple1));
+	}
+
+	SRF_RETURN_DONE(funcctx);
+	
+	
+	
+
+
+
 }
 
 
@@ -190,7 +237,7 @@ Datum edge_search(PG_FUNCTION_ARGS)
 	//ereport(WARNING, errmsg("value %lu", DatumGetInt64(values[2])));	
 	values[3] = heap_getattr(cxt->slot->tts_ops->get_heap_tuple(cxt->slot), 4, RelationGetDescr(vertex_desc->desc[0]->rs_rd), &isnull);
 	nulls[3] = isnull;
-	tuple1 = heap_form_tuple(funcctx->tuple_desc, &values, &nulls);
+	tuple1 = heap_form_tuple(funcctx->tuple_desc, values, nulls);
 	//cxt->slot->tts_ops->get_heap_tuple(cxt->slot);
 
 	//tuple1 = cxt->slot->tts_ops->copy_heap_tuple(cxt->slot);