Strip out transform_entity logic

gone. was needed at one point, now it isn't should simplify everything
in the parser

Author: JoshInnis

Makefile

@@ -45,7 +45,6 @@ OBJS = src/backend/postgraph.o \
        src/backend/parser/cypher_parse_agg.o \
        src/backend/parser/cypher_parse_node.o \
        src/backend/parser/cypher_parser.o \
-       src/backend/parser/cypher_transform_entity.o \
        src/backend/utils/adt/gtype.o \
        src/backend/utils/adt/gtype_ext.o \
        src/backend/utils/adt/gtype_gin.o \

regress/sql/cypher_create.sql

@@ -86,7 +86,6 @@ EXPLAIN ANALYZE MATCH  (q)-[]->(q)-[]->() RETURN 1;
 MATCH  (q)-[]->(q)-[]->() RETURN 1;
 
 
-
 EXPLAIN ANALYZE
 MATCH (q)
 MATCH (q)-[]->()

src/backend/parser/cypher_analyze.c

@@ -1346,7 +1346,6 @@ analyze_cypher(List *stmt, ParseState *parent_pstate, const char *query_str, int
     cpstate->graph_oid = graph_oid;
     cpstate->params = params;
     cpstate->default_alias_num = 0;
-    cpstate->entities = NIL;
 
     Query *query = transform_cypher_clause(cpstate, clause);
 

src/backend/parser/cypher_expr.c

@@ -57,7 +57,6 @@
 #include "parser/cypher_expr.h"
 #include "parser/cypher_item.h"
 #include "parser/cypher_parse_node.h"
-#include "parser/cypher_transform_entity.h"
 #include "utils/ag_func.h"
 #include "utils/gtype.h"
 #include "utils/gtype_typecasting.h"
@@ -1953,7 +1952,7 @@ transform_column_ref(cypher_parsestate *cpstate, ColumnRef *cref) {
     ParseNamespaceItem *pnsi;
 
    if (list_length(cref->fields) == 1) {
-        transform_entity *te;
+        
         field1 = (Node*)linitial(cref->fields);
 
         Assert(IsA(field1, String));
@@ -1963,11 +1962,7 @@ transform_column_ref(cypher_parsestate *cpstate, ColumnRef *cref) {
         if (node != NULL)
             return node;
 
-        te = find_variable(cpstate, colname) ;
-        if (te != NULL && te->expr != NULL) {
-            node = (Node *)te->expr;
-            return node;
-        } else {
+     {
             ParseNamespaceItem *nsitem = refnameNamespaceItem(pstate, NULL, colname, cref->location, &levels_up);
 
             if (nsitem) {
@@ -1988,18 +1983,15 @@ transform_column_ref(cypher_parsestate *cpstate, ColumnRef *cref) {
    }
 
     Node *last_srf = pstate->p_last_srf;
-        transform_entity *te;
+       
         field1 = (Node*)linitial(cref->fields);
 
         Assert(IsA(field1, String));
         colname = strVal(field1);
 
         node = colNameToVar(pstate, colname, false, cref->location);
         if (node == NULL){
-            te = find_variable(cpstate, colname) ;
-            if (te != NULL && te->expr != NULL) {
-                node = (Node *)te->expr;
-            } else {
+
                 ParseNamespaceItem *nsitem = refnameNamespaceItem(pstate, NULL, colname, cref->location, &levels_up);
 
                 if (nsitem) {
@@ -2009,7 +2001,7 @@ transform_column_ref(cypher_parsestate *cpstate, ColumnRef *cref) {
                 ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN),
                                 errmsg("could not find rte for %s", colname),
                                 parser_errposition(pstate, cref->location)));
-            }
+            
 
         }
         if (!node)

src/backend/parser/cypher_grouping.c

@@ -41,7 +41,6 @@
 #include "parser/cypher_item.h"
 #include "parser/cypher_parse_agg.h"
 #include "parser/cypher_parse_node.h"
-#include "parser/cypher_transform_entity.h"
 #include "utils/ag_cache.h"
 #include "utils/ag_func.h"
 #include "utils/gtype.h"

src/backend/parser/cypher_item.c

@@ -38,7 +38,6 @@
 #include "parser/cypher_item.h"
 #include "parser/cypher_parse_node.h"
 
-static List *ExpandAllTables(ParseState *pstate, int location);
 static List *expand_rel_attrs(ParseState *pstate, RangeTblEntry *rte,
                               int rtindex, int sublevels_up, int location);
 
@@ -206,7 +205,7 @@ List *transform_cypher_item_list(cypher_parsestate *cpstate, List *item_list,
         /* clear the exprHasAgg flag to check transform for an aggregate */
         cpstate->exprHasAgg = false;
 
-       // if (item->name[0] == '_' && item->name[1] == '_')
+        //if (item->name[0] == '_' && item->name[1] == '_')
         //    continue;
         /* transform the item */
         te = transform_cypher_item(cpstate, item->val, NULL, expr_kind, item->name, false);
@@ -236,42 +235,6 @@ List *transform_cypher_item_list(cypher_parsestate *cpstate, List *item_list,
     return target_list;
 }
 
-/*
- * From PG's ExpandAllTables()
- *     Transforms '*' (in the target list) into a list of targetlist entries.
- */
-static List *ExpandAllTables(ParseState *pstate, int location)
-{
-    List *target = NIL;
-    bool found_table = false;
-    ListCell *l;
-
-    foreach(l, pstate->p_namespace)
-    {
-        ParseNamespaceItem *nsitem = (ParseNamespaceItem *) lfirst(l);
-
-        /* Ignore table-only items */
-        if (!nsitem->p_cols_visible)
-            continue;
-        /* Should not have any lateral-only items when parsing targetlist */
-        Assert(!nsitem->p_lateral_only);
-        /* Remember we found a p_cols_visible item */
-        found_table = true;
-
-        target = list_concat(target, expand_rel_attrs(pstate, nsitem->p_rte,
-                                                      nsitem->p_rtindex,
-                                                      0, location));
-    }
-
-    /* Check for "RETURN *;" */
-    if (!found_table)
-        ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR),
-                        errmsg("RETURN * without a pattern is not valid"),
-                        parser_errposition(pstate, location)));
-
-    return target;
-}
-
 /*
  * From PG's expandRelAttrs
  * Modified to exclude hidden variables and aliases in RETURN *

src/backend/parser/cypher_parse_node.c

@@ -78,18 +78,14 @@ char *get_next_default_alias(cypher_parsestate *cpstate)
     char *alias_name;
     int nlen = 0;
 
-    /* get the length of the combinded string */
     nlen = snprintf(NULL, 0, "%s%d", AGE_DEFAULT_ALIAS_PREFIX,
                     cpstate->default_alias_num);
 
-    /* allocate the space */
     alias_name = palloc0(nlen + 1);
 
-    /* create the name */
     snprintf(alias_name, nlen + 1, "%s%d", AGE_DEFAULT_ALIAS_PREFIX,
              cpstate->default_alias_num);
 
-    /* increment the default alias number */
     cpstate->default_alias_num++;
 
     return alias_name;

src/backend/parser/cypher_transform_entity.c

@@ -389,6 +389,4 @@ Datum variable_edge_search(PG_FUNCTION_ARGS)
 	}
 	//destroyHashSetValue(cxt->hashSet);
 	SRF_RETURN_DONE(funcctx);
-
-
 }