update

Author: JoshInnis

postgraph--0.1.0.sql

@@ -83,6 +83,22 @@ CREATE INDEX ag_label_ltree_index
 ON ag_label 
 USING gist (label_path public.gist_ltree_ops);
 
+CREATE TABLE edge_metatable (
+    id label_id NOT NULL,
+    level int NOT NULL,
+    base_rel regclass NOT NULL,
+    sub_rel regclass NOT NULL--,
+    --CONSTRAINT fk_label_id FOREIGN KEY(id) REFERENCES ag_label(id)
+);
+
+CREATE INDEX edge_metatable_id 
+ON edge_metatable
+USING btree (id);
+
+CREATE INDEX edge_metatable_id_level 
+ON edge_metatable
+USING btree (id, level);
+
 CREATE TABLE session_graph_use (
    pid oid not null,
    graph_oid oid not null

regress/sql/cypher_create.sql

@@ -46,6 +46,10 @@ MATCH () RETURN 1;
 
 CREATE ()-[]->();
 
+SELECT * FROM cypher_create._ag_label_vertex;
+
+SELECT * FROM cypher_create._adj__adj__ag_label_vertex;
+SELECT * FROM cypher_create._adj__ag_label_vertex;
 MATCH () RETURN 1;
 
 CYPHER WITH 1 as a

regress/sql/vertex_am.sql

@@ -18,7 +18,7 @@
 
 LOAD 'postgraph';
 set search_path 'postgraph';
-
+/*
 CREATE TABLE vertex_am_tst (id postgraph.graphid not null, props postgraph.gtype not null) USING vertex_adjlist;
 
 
@@ -29,7 +29,7 @@ VALUES ('1'::postgraph.graphid, postgraph.gtype_build_map('id', 1));
 SELECT '1'::postgraph.graphid OPERATOR(postgraph.=) '1'::postgraph.graphid;
 EXPLAIN SELECT * FROM vertex_am_tst WHERE id OPERATOR(postgraph.=) '1'::postgraph.graphid;
 SELECT * FROM vertex_am_tst WHERE id OPERATOR(postgraph.=) '1'::postgraph.graphid;
-/*
+
 DELETE FROM vertex_am_tst;
 
 

src/backend/access/vertex_heap/vertex_heapam_handler.c

@@ -94,7 +94,7 @@ static void range_var_callback_for_remove_relation(const RangeVar *rel,
                                                    Oid odl_rel_oid,
                                                    void *arg);
 static char *make_vertex_adjlist_alias(char *var_name);
-
+static List *create_edge_table_elements_topmost(void);
 
 PG_FUNCTION_INFO_V1(create_vlabel);
 Datum create_vlabel(PG_FUNCTION_ARGS)
@@ -523,7 +523,7 @@ void create_vertex_adjlist(char *graph_name, char *label_name) {
     create_stmt->relation = makeRangeVar(graph_name, rel_name, -1);
 
 
-    create_stmt->tableElts = create_vertex_adjlist_table_elements();
+    create_stmt->tableElts = create_edge_table_elements_topmost();
 
 
     create_stmt->inhRelations = NIL;
@@ -625,6 +625,12 @@ void create_label(char *graph_name, char *label_name, char label_type,
     if (label_type == 'v') {
         create_vertex_adjlist(graph_name, label_name);
         Oid adj_oid = get_relname_relid(make_vertex_adjlist_alias(label_name), nsp_id);
+
+        // 08/2/25: TODO - this is incorrect, but it will allow me to get the first two edge table I need created.
+        //                 So do it for now, change in the very near future
+        create_label(graph_name, make_vertex_adjlist_alias(make_vertex_adjlist_alias(label_name)), 'e', NIL , NULL);  
+
+
         insert_label(label_name, graph_oid, label_id, label_type, relation_id, NULL, adj_oid);
 
     }else {
@@ -693,6 +699,43 @@ static void create_table_for_label(char *graph_name, char *label_name,
     // CommandCounterIncrement() is called in ProcessUtility()
 }
 
+
+// CREATE TABLE `schema_name`.`rel_name` (
+//   "id" graphid PRIMARY KEY DEFAULT CATALOG_SCHEMA."_graphid"(...),
+//   "start_id" graphid NOT NULL
+//   "end_id" graphid NOT NULL
+//   "properties" gtype NOT NULL DEFAULT CATALOG_SCHEMA."gtype_build_map"()
+// )
+static List *create_edge_table_elements_topmost(void)
+{
+    ColumnDef *id;
+    ColumnDef *start_id;
+    ColumnDef *end_id;
+    ColumnDef *props;
+
+    // "id" graphid PRIMARY KEY DEFAULT CATALOG_SCHEMA."_graphid"(...)
+    id = makeColumnDef(AG_EDGE_COLNAME_ID, GRAPHIDOID, -1, InvalidOid);
+    id->constraints = NIL;
+
+    // "start_id" graphid NOT NULL
+    start_id = makeColumnDef(AG_EDGE_COLNAME_START_ID, GRAPHIDOID, -1,
+                             InvalidOid);
+    start_id->constraints = list_make1(build_not_null_constraint());
+
+    // "end_id" graphid NOT NULL
+    end_id = makeColumnDef(AG_EDGE_COLNAME_END_ID, GRAPHIDOID, -1, InvalidOid);
+    end_id->constraints = list_make1(build_not_null_constraint());
+
+    // "properties" gtype NOT NULL DEFAULT CATALOG_SCHEMA."gtype_build_map"()
+    props = makeColumnDef(AG_EDGE_COLNAME_PROPERTIES, GTYPEOID, -1,
+                          InvalidOid);
+    props->constraints = list_make2(build_null_constraint(),
+                                    build_properties_default());
+
+    return list_make4(id, start_id, end_id, props);
+}
+
+
 // CREATE TABLE `schema_name`.`rel_name` (
 //   "id" graphid PRIMARY KEY DEFAULT CATALOG_SCHEMA."_graphid"(...),
 //   "start_id" graphid NOT NULL

src/backend/commands/label_commands.c

@@ -194,7 +194,6 @@ static void begin_cypher_create(CustomScanState *node, EState *estate, int eflag
         // Open all indexes for the relation
         ExecOpenIndices(cypher_node->resultRelInfo, false);
 
-
         // Setup the relation's tuple slot
         cypher_node->elemTupleSlot = table_slot_create(rel, &estate->es_tupleTable); 
 
@@ -290,9 +289,6 @@ static TupleTableSlot *exec_cypher_create(CustomScanState *csnode)
 
     }
 
-    
-    //TODO: the edges aren't setup to use this. I gotta get the correct relid in cypher_target_node.
-    // Then I gotta get any existing tuple, and update it if it exists, and insert if it doesn't
     for (int i = 0; i < list_length(path->target_nodes)/2 + 1; i++) {
         cypher_target_node *node = (cypher_target_node *)list_nth(path->target_nodes, i * 2);
 
@@ -330,9 +326,15 @@ static TupleTableSlot *exec_cypher_create(CustomScanState *csnode)
             elemTupleSlot->tts_values[0] = css->edge_ids[0][i];
             elemTupleSlot->tts_isnull[0] = false;
 
+            elemTupleSlot->tts_values[1] = css->vertex_ids[0][i];
+            elemTupleSlot->tts_isnull[1] = false;
+            
+            elemTupleSlot->tts_values[2] = css->vertex_ids[0][i+1];
+            elemTupleSlot->tts_isnull[2] = false;
             // get the properties for this vertex
-            elemTupleSlot->tts_values[1] = NULL;
-            elemTupleSlot->tts_isnull[1] = true;
+            elemTupleSlot->tts_values[3] = NULL;
+            elemTupleSlot->tts_isnull[3] = true;
+
             // Insert the new vertex
             insert_entity_tuple(resultRelInfo, elemTupleSlot, estate);
         }
@@ -364,8 +366,12 @@ static void end_cypher_create(CustomScanState *node)
                 continue;
 
             ExecCloseIndices(cypher_node->resultRelInfo);
+            table_close(cypher_node->resultRelInfo->ri_RelationDesc, RowExclusiveLock);
             ExecCloseIndices(cypher_node->adj_resultRelInfo);
             table_close(cypher_node->adj_resultRelInfo->ri_RelationDesc, RowExclusiveLock);
+
+
+
         }
     }
 }
@@ -454,8 +460,6 @@ static void insert_vertex(cypher_create_custom_scan_state *css,
 /*
  * Insert the edge/vertex tuple into the table and indices. Check that the
  * table's constraints have not been violated.
- *
- * This function uses the passed cid for updates.
  */
 HeapTuple insert_entity_tuple(ResultRelInfo *resultRelInfo,
                                   TupleTableSlot *elemTupleSlot,
@@ -464,14 +468,14 @@ HeapTuple insert_entity_tuple(ResultRelInfo *resultRelInfo,
     HeapTuple tuple = NULL;
 
     ExecStoreVirtualTuple(elemTupleSlot);
-    tuple = ExecFetchSlotHeapTuple(elemTupleSlot, true, NULL);
+   // tuple = ExecFetchSlotHeapTuple(elemTupleSlot, true, NULL);
 
     /* Check the constraints of the tuple */
-    tuple->t_tableOid = RelationGetRelid(resultRelInfo->ri_RelationDesc);
-    if (resultRelInfo->ri_RelationDesc->rd_att->constr != NULL)
+    //tuple->t_tableOid = resultRelInfo->ri_RelationDesc->rd_id;
+   /* if (resultRelInfo->ri_RelationDesc->rd_att->constr != NULL)
     {
         ExecConstraints(resultRelInfo, elemTupleSlot, estate);
-    }
+    }*/
 
     // Insert the tuple normally
     table_tuple_insert(resultRelInfo->ri_RelationDesc, elemTupleSlot, estate->es_output_cid, 0, NULL);
@@ -482,7 +486,7 @@ HeapTuple insert_entity_tuple(ResultRelInfo *resultRelInfo,
         ExecInsertIndexTuples(resultRelInfo, elemTupleSlot, estate, false, false, NULL, NIL);
     }
 
-    return tuple;
+    return NULL;
 }
 
 

src/backend/executor/cypher_create.c

@@ -27,6 +27,7 @@
 #include "optimizer/cypher_paths.h"
 #include "parser/cypher_analyze.h"
 #include "access/vertex.h"
+#include "executor/nodeSeqscan.h"
 
 PG_MODULE_MAGIC;
 

src/backend/postgraph.c

@@ -88,6 +88,7 @@ typedef struct label_relation_cache_entry
     label_cache_data data;
 } label_relation_cache_entry;
 
+
 // ag_graph.name
 static HTAB *graph_name_cache_hash = NULL;
 static ScanKeyData graph_name_scan_keys[1];

src/backend/utils/cache/ag_cache.c

@@ -21,6 +21,10 @@ typedef struct VertexScanDescData
 
 	TableScanDescData rs_base;	/* AM independent part of the descriptor */
 
+	int ndesc;
+	TableScanDesc **desc;
+	
+
 	/* Hash value of the scan key, ie, the hash key we seek */
 	uint32		hashso_sk_hash;
 

src/include/access/vertex.h

@@ -63,6 +63,11 @@
 #define ag_label_label_index_id() \
     ag_relation_id("ag_label_ltree_index", "index")
 
+#define edge_metatable_id() \
+    ag_relation_id("edge_metatable_id", "index")
+#define edge_metatable_id_level() \
+    ag_relation_id("edge_metatable_id_level", "index")
+    
 #define LABEL_ID_SEQ_NAME "_label_id_seq"
 
 #define LABEL_KIND_VERTEX 'v'