Skip to content

Commit 4642aa3

Browse files
Revert "Implement list comprehension (apache#1610)"
This reverts commit 3b2b394.
1 parent 686512d commit 4642aa3

File tree

16 files changed

+29
-1325
lines changed

16 files changed

+29
-1325
lines changed

Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,7 @@ REGRESS = scan \
111111
graph_generation \
112112
name_validation \
113113
jsonb_operators \
114-
list_comprehension \
115-
map_projection
116-
117-
ifneq ($(EXTRA_TESTS),)
118-
REGRESS += $(EXTRA_TESTS)
119-
endif
120-
121-
REGRESS += drop
114+
drop
122115

123116
srcdir=`pwd`
124117

regress/expected/list_comprehension.out

Lines changed: 0 additions & 585 deletions
This file was deleted.

regress/sql/list_comprehension.sql

Lines changed: 0 additions & 148 deletions
This file was deleted.

sql/agtype_typecast.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ CREATE FUNCTION ag_catalog.age_range(variadic "any")
181181
PARALLEL SAFE
182182
AS 'MODULE_PATHNAME';
183183

184-
CREATE FUNCTION ag_catalog.age_unnest(agtype,
185-
list_comprehension boolean = false)
184+
CREATE FUNCTION ag_catalog.age_unnest(agtype)
186185
RETURNS SETOF agtype
187186
LANGUAGE c
188187
IMMUTABLE

src/backend/nodes/cypher_outfuncs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ void out_cypher_unwind(StringInfo str, const ExtensibleNode *node)
176176
DEFINE_AG_NODE(cypher_unwind);
177177

178178
WRITE_NODE_FIELD(target);
179-
WRITE_NODE_FIELD(collect);
180179
}
181180

182181
/* serialization function for the cypher_delete ExtensibleNode. */

src/backend/parser/cypher_analyze.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -932,13 +932,6 @@ bool expr_contains_node(cypher_expression_condition is_expr, Node *expr)
932932
}
933933
if (is_ag_node(expr, cypher_unwind))
934934
{
935-
cypher_unwind* lc = (cypher_unwind *)expr;
936-
937-
if (expr_contains_node(is_expr, lc->where) ||
938-
expr_contains_node(is_expr, lc->collect))
939-
{
940-
return true;
941-
}
942935
break;
943936
}
944937

0 commit comments

Comments
 (0)