Fix Vertex creation of to vertices in MAtch

Author: JoshInnis

postgraph--0.1.0.sql

@@ -442,14 +442,24 @@ AS 'MODULE_PATHNAME';
 
 
 CREATE FUNCTION retrieve_vertex(graph_oid gtype, id graphid)
-RETURNS TABLE (properties gtype)
+RETURNS gtype
 RETURNS NULL ON NULL INPUT
 STABLE
 PARALLEL SAFE
 LANGUAGE C
 COST 5000
 AS 'MODULE_PATHNAME';
 
+
+--CREATE FUNCTION retrieve_vertex(graph_oid gtype, id graphid)
+--RETURNS TABLE (properties gtype)
+--RETURNS NULL ON NULL INPUT
+--STABLE
+--PARALLEL SAFE
+--LANGUAGE C
+--COST 5000
+--AS 'MODULE_PATHNAME';
+
 --
 -- There are times when the optimizer might eliminate
 -- functions we need. Wrap the function with this to

src/backend/parser/cypher_clause.c

@@ -1099,8 +1099,6 @@ add_vertex_retrieval_to_query(cypher_parsestate *cpstate, Query *query, cypher_n
 
         Var *var;
         if (var = colNameToVar(cpstate, make_id_alias(node->name), false, -1)) {
-//            ereport(WARNING,(errcode(ERRCODE_UNDEFINED_SCHEMA),
-//                errmsg("here")));
             node->declared_in_previous_clause = true;
 
             *quals = lappend(*quals,
@@ -1111,7 +1109,6 @@ add_vertex_retrieval_to_query(cypher_parsestate *cpstate, Query *query, cypher_n
             return refnameNamespaceItem(cpstate, NULL, PREV_CYPHER_CLAUSE_ALIAS, -1, NULL);
         }
 
-        int sublevels_up;
         ParseNamespaceItem *pnsi = refnameNamespaceItem(cpstate, NULL, node->name, -1, NULL);
         if (pnsi) {
             node->in_join_tree = false;

src/backend/utils/adt/vertex.c

@@ -127,7 +127,7 @@ create_vertex(graphid id, Oid graph_oid, gtype *properties) {
     append_to_buffer(&buffer, (char *)&graph_oid, sizeof(Oid));
 
     // properties
-    if (properties == NULL) {   
+    if (!properties) {   
         gtype_in_state result;
 
         memset(&result, 0, sizeof(gtype_in_state));

src/backend/utils/edge_searching.c

@@ -70,7 +70,7 @@ static Datum get_vertex(Oid graph_oid, int64 graphid, bool *isnull)
         ereport(ERROR, (errcode(ERRCODE_UNDEFINED_TABLE), errmsg("id %lu does not exist", graphid)));
 
 	Datum properties = heap_getattr(tuple, 2, RelationGetDescr(rel), isnull);
-
+	//*isnull = false;
     table_endscan(scan_desc);
     table_close(rel, ShareLock);
 
@@ -79,6 +79,38 @@ static Datum get_vertex(Oid graph_oid, int64 graphid, bool *isnull)
 
 
 
+PG_FUNCTION_INFO_V1(retrieve_vertex);
+Datum retrieve_vertex(PG_FUNCTION_ARGS) {
+	Oid graph_oid = GT_ARG_TO_INT4_DATUM(0);
+	int64 graphid = AG_GETARG_GRAPHID(1);
+	bool isnull;
+
+    label_cache_data *lcd = search_label_graph_oid_cache(graph_oid, (graphid >> ENTRY_ID_BITS));
+
+	ScanKeyData scan_keys[1];
+    ScanKeyInit(&scan_keys[0], 1, BTEqualStrategyNumber, F_OIDEQ, Int64GetDatum(graphid));
+
+    Relation rel = table_open(lcd->relation, ShareLock);
+
+    TableScanDesc scan_desc = table_beginscan(rel, GetActiveSnapshot(), 1, scan_keys);
+
+	HeapTuple tuple;
+    if (!HeapTupleIsValid(tuple = heap_getnext(scan_desc, ForwardScanDirection)))
+        ereport(ERROR, (errcode(ERRCODE_UNDEFINED_TABLE), errmsg("id %lu does not exist", graphid)));
+
+	Datum properties = heap_getattr(tuple, 2, RelationGetDescr(rel), &isnull);
+
+    table_endscan(scan_desc);
+    table_close(rel, ShareLock);
+
+	if (isnull) 
+		PG_RETURN_NULL();
+	
+	AG_RETURN_GTYPE_P(properties);
+
+}
+
+/*
 PG_FUNCTION_INFO_V1(retrieve_vertex);
 Datum retrieve_vertex(PG_FUNCTION_ARGS) {
     
@@ -100,7 +132,7 @@ Datum retrieve_vertex(PG_FUNCTION_ARGS) {
 
 	SRF_RETURN_DONE(funcctx);
 }
-
+*/
 
 typedef struct edge_search_cxt
 {