Move MATCH and MERGE label matching to LTree

JoshInnis · JoshInnis · commit 135f20f20a87 · 2025-05-21T02:37:54.000-05:00
In the label redesign, we are going to need to completely change the
logic to resolve which tables to use for a label. This is the first
step to moving MATCH and MERGE to the new system.
diff --git a/Makefile b/Makefile
@@ -118,7 +118,7 @@ REGRESS = new_cypher \
 
 srcdir=`pwd`
 POSTGIS_DIR ?= postgis_dir
-
+PG_LIBS += -ltree
 .PHONY:all
 
 all: postgraph--0.1.0.sql
@@ -135,7 +135,7 @@ GEN_KEYWORDLIST = $(PERL) -I ./tools/ ./tools/gen_keywordlist.pl
 GEN_KEYWORDLIST_DEPS = ./tools/gen_keywordlist.pl tools/PerfectHash.pm
 
 ag_include_dir = $(srcdir)/src/include
-PG_CPPFLAGS = -w -I$(ag_include_dir) -I$(ag_include_dir)/parser -I$(POSTGIS_DIR) -I$(POSTGIS_DIR)/liblwgeom
+PG_CPPFLAGS = -w -I$(ag_include_dir) -I$(ag_include_dir)/parser -I$(POSTGIS_DIR) -I$(POSTGIS_DIR)/liblwgeom -I/home/josh/postgres/contrib/ltree
 PG_LDFLAGS = -lgeos_c
 SHLIB_LINK=  $(POSTGIS_DIR)/liblwgeom/.libs/liblwgeom.a -Wl,--no-as-needed -Wl,-l:postgis-3.so -Wl,-l:ltree.so
 
diff --git a/sql/postgraph.sql.in b/sql/postgraph.sql.in
@@ -65,7 +65,7 @@ CREATE TABLE ag_label (
     id label_id, 
     kind label_kind, 
     relation regclass NOT NULL, 
-    label_path public.ltree NOT NULL,
+    label_path public.ltree NULL,
     CONSTRAINT fk_graph_oid FOREIGN KEY(graph) REFERENCES ag_graph(graphid)
 );
 
@@ -85,6 +85,10 @@ CREATE UNIQUE INDEX ag_label_path_graph_index
 ON ag_label
 USING btree (label_path, graph);
 
+CREATE INDEX ag_label_ltree_index 
+ON ag_label 
+USING gist (label_path public.gist_ltree_ops);
+
 CREATE TABLE session_graph_use (
    pid oid not null,
    graph_oid oid not null
diff --git a/src/backend/catalog/ag_label.c b/src/backend/catalog/ag_label.c
@@ -37,6 +37,8 @@
 #include "utils/rel.h"
 #include "utils/relcache.h"
 
+#include "ltree.h"
+
 #include "catalog/ag_graph.h"
 #include "catalog/ag_label.h"
 #include "commands/label_commands.h"
@@ -50,7 +52,7 @@ PG_FUNCTION_INFO_V1(ltree_addltree);
 // INSERT INTO CATALOG_SCHEMA.ag_label
 // VALUES (label_name, label_graph, label_id, label_kind, label_relation)
 void insert_label(const char *label_name, Oid graph_oid, int32 label_id,
-                  char label_kind, Oid label_relation)
+                  char label_kind, Oid label_relation, const char *ltree)
 {
     NameData label_name_data;
     Datum values[Natts_ag_label + 1];
@@ -85,7 +87,15 @@ void insert_label(const char *label_name, Oid graph_oid, int32 label_id,
 
     values[Anum_ag_label_relation - 1] = ObjectIdGetDatum(label_relation);
     nulls[Anum_ag_label_relation - 1] = false;
-
+/*
+    if (ltree == NULL) {
+        values[Anum_ag_label_label_path - 1] = NULL;
+        nulls[Anum_ag_label_label_path - 1] = false;
+    } else {
+        values[Anum_ag_label_label_path - 1] = DirectFunctionCall1(ltree_in, CStringGetDatum(ltree));
+        nulls[Anum_ag_label_label_path - 1] = true;
+    }*/
+    
     if (strcmp(label_name, "_ag_label_vertex") == 0 || strcmp(label_name, "_ag_label_edge") == 0) {
         values[5] = DirectFunctionCall1(ltree_in, CStringGetDatum(label_name));
         nulls[5] = false;
@@ -100,7 +110,6 @@ void insert_label(const char *label_name, Oid graph_oid, int32 label_id,
                         DirectFunctionCall1(ltree_in, CStringGetDatum("_ag_label_edge")),
                         DirectFunctionCall1(ltree_in, CStringGetDatum(label_name)));
         nulls[5] = false;
-
     }
 
 
diff --git a/src/backend/commands/graph_commands.c b/src/backend/commands/graph_commands.c
@@ -87,8 +87,8 @@ Datum create_graph_if_not_exists(PG_FUNCTION_ARGS)
 
     //Create the default label tables
     graph = graph_name->data;
-    create_label(graph, AG_DEFAULT_LABEL_VERTEX, LABEL_TYPE_VERTEX, NIL);
-    create_label(graph, AG_DEFAULT_LABEL_EDGE, LABEL_TYPE_EDGE, NIL);
+    create_label(graph, AG_DEFAULT_LABEL_VERTEX, LABEL_TYPE_VERTEX, NIL, NULL);
+    create_label(graph, AG_DEFAULT_LABEL_EDGE, LABEL_TYPE_EDGE, NIL, NULL);
 
     ereport(NOTICE,
             (errmsg("graph \"%s\" has been created", NameStr(*graph_name))));
@@ -208,8 +208,8 @@ Datum create_graph(PG_FUNCTION_ARGS)
 
     //Create the default label tables
     graph = graph_name_str;//graph_name->data;
-    create_label(graph, AG_DEFAULT_LABEL_VERTEX, LABEL_TYPE_VERTEX, NIL);
-    create_label(graph, AG_DEFAULT_LABEL_EDGE, LABEL_TYPE_EDGE, NIL);
+    create_label(graph, AG_DEFAULT_LABEL_VERTEX, LABEL_TYPE_VERTEX, NIL, NULL);
+    create_label(graph, AG_DEFAULT_LABEL_EDGE, LABEL_TYPE_EDGE, NIL, NULL);
 
     ereport(NOTICE,
             (errmsg("graph \"%s\" has been created", graph_name_str)));
diff --git a/src/backend/commands/label_commands.c b/src/backend/commands/label_commands.c
@@ -167,7 +167,7 @@ Datum create_vlabel(PG_FUNCTION_ARGS)
 
     parent = list_make1(rv);
 
-    create_label(graph, label, LABEL_TYPE_VERTEX, parent);
+    create_label(graph, label, LABEL_TYPE_VERTEX, parent, NULL);
 
     ereport(NOTICE,
             (errmsg("VLabel \"%s\" has been created", NameStr(*label_name))));
@@ -246,7 +246,7 @@ Datum create_elabel(PG_FUNCTION_ARGS)
     rv = get_label_range_var(graph, graph_oid, AG_DEFAULT_LABEL_EDGE);
 
     parent = list_make1(rv);
-    create_label(graph, label, LABEL_TYPE_EDGE, parent);
+    create_label(graph, label, LABEL_TYPE_EDGE, parent, NULL);
 
     ereport(NOTICE,
             (errmsg("ELabel \"%s\" has been created", NameStr(*label_name))));
@@ -539,7 +539,7 @@ Datum create_property_index(PG_FUNCTION_ARGS)
  * CATALOG_SCHEMA.ag_label.
  */
 void create_label(char *graph_name, char *label_name, char label_type,
-                  List *parents)
+                  List *parents, char *ltree)
 {
     graph_cache_data *cache_data;
     Oid graph_oid;
@@ -585,7 +585,7 @@ void create_label(char *graph_name, char *label_name, char label_type,
     // get a new "id" for the new label
     label_id = get_new_label_id(graph_oid, nsp_id);
 
-    insert_label(label_name, graph_oid, label_id, label_type, relation_id);
+    insert_label(label_name, graph_oid, label_id, label_type, relation_id, NULL);
 
     CommandCounterIncrement();
 }
diff --git a/src/backend/parser/cypher_clause.c b/src/backend/parser/cypher_clause.c
@@ -1,27 +1,3 @@
-/*
- * For PostgreSQL Database Management System:
- * (formerly known as Postgres, then as Postgres95)
- *
- * Portions Copyright (c) 1996-2010, The PostgreSQL Global Development Group
- *
- * Portions Copyright (c) 1994, The Regents of the University of California
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for any purpose,
- * without fee, and without a written agreement is hereby granted, provided that the above copyright notice
- * and this paragraph and the following two paragraphs appear in all copies.
- *
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY
- * OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA
- * HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-
 #include "postgraph.h"
 
 #include "access/nbtree.h"
@@ -3906,6 +3882,38 @@ static char *make_endid_alias(char *var_name) {
     return str;
 }
 
+
+static char *make_lquery_string(char *var_name) {
+    return var_name;
+    char *str = palloc0(strlen(var_name) + 8);
+
+    str[0] = '.';
+    str[0] = '*';
+    str[1] = '\0';
+
+    return str;
+/*
+    str[1] = '.';
+    str[0] = '*';
+
+    int i = 0;
+    for (; i < strlen(var_name); i++)
+        str[i + 2] = var_name[i];
+
+    str[i + 3] = '.';
+    str[i + 4] = '*';
+    str[i + 5] = '\0';
+
+    return str;
+*/
+}
+
+//ltree
+#include "ltree.h"
+
+
+PG_FUNCTION_INFO_V1(lquery_in);
+
 static Expr *transform_cypher_node(cypher_parsestate *cpstate, cypher_node *node, List **target_list, bool output_node) {
     ParseState *pstate = (ParseState *)cpstate;
     char *schema_name;
@@ -3916,9 +3924,11 @@ static Expr *transform_cypher_node(cypher_parsestate *cpstate, cypher_node *node
     TargetEntry *te;
     Expr *expr;
     ParseNamespaceItem *pnsi;
+    bool is_default_label = false;
 
-    if (!node->label) {
+    if (!node->label || !strcmp(node->label, AG_DEFAULT_LABEL_VERTEX)) {
         node->label = AG_DEFAULT_LABEL_VERTEX;
+        is_default_label = true;
     } else {
         label_cache_data *lcd = search_label_name_graph_cache(node->label, cpstate->graph_oid);
 
@@ -3927,7 +3937,7 @@ static Expr *transform_cypher_node(cypher_parsestate *cpstate, cypher_node *node
                             errmsg("label %s does not exists", node->label),
                             parser_errposition(pstate, node->location)));
 
-    if (lcd->kind != LABEL_KIND_VERTEX)
+        if (lcd->kind != LABEL_KIND_VERTEX)
             ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                             errmsg("label %s is for edges, not vertices", node->label),
                             parser_errposition(pstate, node->location)));
@@ -3948,30 +3958,65 @@ static Expr *transform_cypher_node(cypher_parsestate *cpstate, cypher_node *node
           transform_entity *entity = find_transform_entity(cpstate, node->name, ENT_VERTEX);
             if (entity)
                 return entity->expr;
-        }
-        else {
-        te = findTarget(*target_list, node->name);
-        expr = colNameToVar(pstate, node->name, false, node->location);
+        } else {
+            te = findTarget(*target_list, node->name);
+            expr = colNameToVar(pstate, node->name, false, node->location);
 
-        if (expr)
-            return (Expr*)expr;
+            if (expr)
+                return (Expr*)expr;
 
-        if (te != NULL) {
-            transform_entity *entity = find_variable(cpstate, node->name);
-            if (entity != NULL && (entity->type != ENT_VERTEX || !IS_DEFAULT_LABEL_VERTEX(node->label) || node->props))
-                ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                         errmsg("variable %s already exists", node->name),
-                         parser_errposition(pstate, node->location)));
+            if (te != NULL) {
+                transform_entity *entity = find_variable(cpstate, node->name);
+                if (entity != NULL && (entity->type != ENT_VERTEX || !IS_DEFAULT_LABEL_VERTEX(node->label) || node->props))
+                    ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                            errmsg("variable %s already exists", node->name),
+                            parser_errposition(pstate, node->location)));
 
-            return te->expr;
-        }
+                return te->expr;
+            }
         }
     } else {
         node->name = get_next_default_alias(cpstate);
     }
 
     schema_name = get_graph_namespace_name(cpstate->graph_name);
-    rel_name = get_label_relation_name(node->label, cpstate->graph_oid);
+
+
+    Datum label_lquery;
+    if (is_default_label)
+        label_lquery = DirectFunctionCall1(ltree_in, CStringGetDatum(node->label));
+    else
+        label_lquery = DirectFunctionCall2(ltree_addltree, 
+                            DirectFunctionCall1(ltree_in, CStringGetDatum(AG_DEFAULT_LABEL_VERTEX)),
+                            DirectFunctionCall1(ltree_in, CStringGetDatum(node->label)));
+    
+    int ltq_query_args[2];
+    ltq_query_args[0] = LookupTypeNameOid(pstate, makeTypeNameFromNameList(list_make2(makeString("public"), makeString("ltree"))), false);
+    ltq_query_args[1] = LookupTypeNameOid(pstate, makeTypeNameFromNameList(list_make2(makeString("public"), makeString("ltree"))), false);
+	
+    Oid ltree_contains_oid = LookupFuncName(list_make2(makeString("public"), makeString("ltree_risparent")), 2, &ltq_query_args, false);
+    
+    ScanKeyData scan_keys[1];
+    ScanKeyInit(&scan_keys[0], Anum_ag_label_label_path, BTEqualStrategyNumber, ltree_contains_oid, label_lquery);
+    
+    Relation label_catalog = table_open(ag_label_relation_id(), AccessShareLock);
+    SysScanDesc scan_desc = systable_beginscan(label_catalog, ag_label_label_index_id(), true, NULL, 1, scan_keys);
+
+    HeapTuple tuple = systable_getnext(scan_desc);
+
+    if (!HeapTupleIsValid(tuple))
+        ereport(ERROR,
+                (errcode(ERRCODE_UNDEFINED_SCHEMA),
+                 errmsg("not found %s", node->label)));
+    
+    bool is_null;
+    rel_name = heap_getattr(tuple, Anum_ag_label_name, RelationGetDescr(label_catalog), &is_null);
+
+
+    systable_endscan(scan_desc);
+    table_close(label_catalog, AccessShareLock);
+
+    //rel_name = get_label_relation_name(node->label, cpstate->graph_oid);
     label_range_var = makeRangeVar(schema_name, rel_name, -1);
     alias = makeAlias(node->name, NIL);
 
@@ -3990,7 +4035,7 @@ static Expr *transform_cypher_node(cypher_parsestate *cpstate, cypher_node *node
 
     // id field
     Node *id = scanNSItemForColumn(pstate, pnsi, 0, AG_VERTEX_COLNAME_ID, -1);
-   resno = pstate->p_next_resno++;
+    resno = pstate->p_next_resno++;
 
     te = makeTargetEntry(id, resno, make_id_alias(node->name), false);
     *target_list = lappend(*target_list, te);
@@ -3999,7 +4044,7 @@ static Expr *transform_cypher_node(cypher_parsestate *cpstate, cypher_node *node
      * properties field
      */
     Node *props = scanNSItemForColumn(pstate, pnsi, 0, AG_VERTEX_COLNAME_PROPERTIES, -1);
-   resno = pstate->p_next_resno++;
+    resno = pstate->p_next_resno++;
 
     te = makeTargetEntry(props, resno, make_property_alias(node->name), false);
     *target_list = lappend(*target_list, te);
@@ -4271,7 +4316,7 @@ static cypher_target_node * transform_create_cypher_edge(cypher_parsestate *cpst
 
         parent = list_make1(rv);
 
-        create_label(cpstate->graph_name, edge->label, LABEL_TYPE_EDGE, parent);
+        create_label(cpstate->graph_name, edge->label, LABEL_TYPE_EDGE, parent, NULL);
     }
 
     // lock the relation of the label
@@ -4505,7 +4550,7 @@ static cypher_target_node *transform_create_cypher_new_node(cypher_parsestate *c
 
         parent = list_make1(rv);
 
-        create_label(cpstate->graph_name, node->label, LABEL_TYPE_VERTEX, parent);
+        create_label(cpstate->graph_name, node->label, LABEL_TYPE_VERTEX, parent, NULL);
     }
 
     rel->flags = CYPHER_TARGET_NODE_FLAG_INSERT;
@@ -5278,7 +5323,7 @@ static cypher_target_node * transform_merge_cypher_edge(cypher_parsestate *cpsta
         parent = list_make1(rv);
 
         // create the label
-        create_label(cpstate->graph_name, edge->label, LABEL_TYPE_EDGE, parent);
+        create_label(cpstate->graph_name, edge->label, LABEL_TYPE_EDGE, parent, NULL);
     }
 
     // lock the relation of the label
@@ -5355,7 +5400,7 @@ static cypher_target_node *transform_merge_cypher_node(cypher_parsestate *cpstat
         parent = list_make1(rv);
 
         // create the label
-        create_label(cpstate->graph_name, node->label, LABEL_TYPE_VERTEX, parent);
+        create_label(cpstate->graph_name, node->label, LABEL_TYPE_VERTEX, parent, NULL);
     }
 
     rel->flags |= CYPHER_TARGET_NODE_FLAG_INSERT;
diff --git a/src/include/catalog/ag_label.h b/src/include/catalog/ag_label.h
@@ -60,14 +60,16 @@
     ag_relation_id("ag_label_graph_oid_index", "index")
 #define ag_label_relation_index_id() \
     ag_relation_id("ag_label_relation_index", "index")
+#define ag_label_label_index_id() \
+    ag_relation_id("ag_label_ltree_index", "index")
 
 #define LABEL_ID_SEQ_NAME "_label_id_seq"
 
 #define LABEL_KIND_VERTEX 'v'
 #define LABEL_KIND_EDGE 'e'
 
 void insert_label(const char *label_name, Oid graph_oid, int32 label_id,
-                  char label_kind, Oid label_relation);
+                  char label_kind, Oid label_relation, const char *ltree);
 void delete_label(Oid relation);
 
 int32 get_label_id(const char *label_name, Oid graph_oid);
diff --git a/src/include/commands/label_commands.h b/src/include/commands/label_commands.h
@@ -55,6 +55,6 @@
     (IS_DEFAULT_LABEL_EDGE(x) || IS_DEFAULT_LABEL_VERTEX(x))
 
 void create_label(char *graph_name, char *label_name, char label_type,
-                  List *parents);
+                  List *parents, char *ltree);
 
 #endif
diff --git a/src/include/utils/ag_cache.h b/src/include/utils/ag_cache.h
@@ -41,7 +41,7 @@ typedef struct label_cache_data
     int32 id;
     char kind;
     Oid relation;
-//    ltree *label_tree;
+    ltree *label_tree;
 } label_cache_data;
 
 // callers of these functions must not modify the returned struct
diff --git a/src/include/utils/gtype.h b/src/include/utils/gtype.h
