Revert "fix: Supports VERTICES, EDGES on cypher list predicate functi…

…ons. (#603)"

This reverts commit 68c2725.

src/backend/executor/execExpr.c

@@ -47,9 +47,6 @@
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"
-#include "parser/parse_type.h"
-#include "utils/fmgroids.h"
-#include "utils/syscache.h"
 
 
 typedef struct LastAttnumInfo
@@ -3748,16 +3745,8 @@ ExecInitCypherListComp(ExprEvalStep *scratch, CypherListCompExpr *listcompexpr,
 	ExprEvalStep elem_step;
 	ExprEvalStep loop_step;
 	int			end_stepno;
-	bool		is_array_type;
 
-	Type		targetType;
-	Form_pg_type typeForm;
-
-	targetType = typeidType(exprType((const Node *) listcompexpr->list));
-	typeForm = (Form_pg_type) GETSTRUCT(targetType);
-
-	is_array_type = IsTrueArrayType(typeForm);
-	ReleaseSysCache(targetType);
+	Assert(exprType((Node *) listcompexpr->list) == JSONBOID);
 
 	ExecInitExprRec(listcompexpr->list, state, scratch->resvalue,
 					scratch->resnull);
@@ -3779,24 +3768,8 @@ ExecInitCypherListComp(ExprEvalStep *scratch, CypherListCompExpr *listcompexpr,
 	init_step.opcode = EEOP_CYPHERLISTCOMP_ITER_INIT;
 	init_step.d.cypherlistcomp_iter.listvalue = scratch->resvalue;
 	init_step.d.cypherlistcomp_iter.listnull = scratch->resnull;
-
-	init_step.d.cypherlistcomp_iter.is_null_list_or_array =
-		(bool *) palloc(sizeof(bool));
-	*init_step.d.cypherlistcomp_iter.is_null_list_or_array = false;
-
-	if (is_array_type)
-	{
-		init_step.d.cypherlistcomp_iter.jsonb_list_iterator = NULL;
-		init_step.d.cypherlistcomp_iter.array_iterator =
-			(CypherListCompArrayIterator *) palloc(sizeof(CypherListCompArrayIterator));
-	}
-	else
-	{
-		init_step.d.cypherlistcomp_iter.jsonb_list_iterator =
-			(JsonbIterator **) palloc(sizeof(JsonbIterator *));
-		init_step.d.cypherlistcomp_iter.array_iterator = NULL;
-	}
-
+	init_step.d.cypherlistcomp_iter.listiter =
+		(JsonbIterator **) palloc(sizeof(JsonbIterator *));
 	ExprEvalPushStep(state, &init_step);
 
 	elem_resvalue = (Datum *) palloc(sizeof(Datum));
@@ -3805,13 +3778,8 @@ ExecInitCypherListComp(ExprEvalStep *scratch, CypherListCompExpr *listcompexpr,
 	next_step.opcode = EEOP_CYPHERLISTCOMP_ITER_NEXT;
 	next_step.resvalue = elem_resvalue;
 	next_step.resnull = elem_resnull;
-	next_step.d.cypherlistcomp_iter.is_null_list_or_array =
-		init_step.d.cypherlistcomp_iter.is_null_list_or_array;
-	next_step.d.cypherlistcomp_iter.jsonb_list_iterator =
-		init_step.d.cypherlistcomp_iter.jsonb_list_iterator;
-	next_step.d.cypherlistcomp_iter.array_iterator =
-		init_step.d.cypherlistcomp_iter.array_iterator;
-
+	next_step.d.cypherlistcomp_iter.listiter =
+		init_step.d.cypherlistcomp_iter.listiter;
 	ExprEvalPushStep(state, &next_step);
 	next_stepno = state->steps_len - 1;
 

src/backend/executor/execExprInterp.c

@@ -5254,100 +5254,42 @@ void ExecEvalCypherListCompEnd(ExprState *state, ExprEvalStep *op)
 
 void ExecEvalCypherListCompIterInit(ExprState *state, ExprEvalStep *op)
 {
-	if (op->d.cypherlistcomp_iter.jsonb_list_iterator != NULL)
-	{
-		Jsonb	   *listjb;
-		JsonbIterator **ji;
-		JsonbValue	jv;
-
-		Assert(!*op->d.cypherlistcomp_iter.listnull);
+	Jsonb	   *listjb;
+	JsonbIterator **ji;
+	JsonbValue	jv;
 
-		listjb = DatumGetJsonbP(*op->d.cypherlistcomp_iter.listvalue);
-		*op->d.cypherlistcomp_iter.is_null_list_or_array = !JB_ROOT_IS_ARRAY(listjb) || JB_ROOT_IS_SCALAR(listjb);
+	Assert(!*op->d.cypherlistcomp_iter.listnull);
 
-		ji = op->d.cypherlistcomp_iter.jsonb_list_iterator;
-		*ji = JsonbIteratorInit(&listjb->root);
-		JsonbIteratorNext(ji, &jv, false);
-	}
-	else
-	{
-		CypherListCompArrayIterator *cypher_array_iter = op->d.cypherlistcomp_iter.array_iterator;
-		array_iter *it = &cypher_array_iter->array_iter;
-		AnyArrayType *array = DatumGetAnyArrayP(*op->d.cypherlistcomp_iter.listvalue);
-
-		cypher_array_iter->array_size = ArrayGetNItems(AARR_NDIM(array),
-													   AARR_DIMS(array));
-		cypher_array_iter->array_position = 0;
-		cypher_array_iter->array_typid = AARR_ELEMTYPE(array);
-
-		get_typlenbyvalalign(cypher_array_iter->array_typid,
-							 &cypher_array_iter->typlen,
-							 &cypher_array_iter->typbyval,
-							 &cypher_array_iter->typalign);
-		array_iter_setup(it, array);
-	}
+	listjb = DatumGetJsonbP(*op->d.cypherlistcomp_iter.listvalue);
+	if (!JB_ROOT_IS_ARRAY(listjb) || JB_ROOT_IS_SCALAR(listjb))
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+						errmsg("list is expected but %s",
+							   JsonbToCString(NULL, &listjb->root,
+											  VARSIZE(listjb)))));
+
+	ji = op->d.cypherlistcomp_iter.listiter;
+	*ji = JsonbIteratorInit(&listjb->root);
+	JsonbIteratorNext(ji, &jv, false);
 }
 
 void ExecEvalCypherListCompIterInitNext(ExprState *state, ExprEvalStep *op)
 {
-	if (op->d.cypherlistcomp_iter.jsonb_list_iterator != NULL)
-	{
-		JsonbIterator **ji;
-		JsonbValue	jv;
-		JsonbIteratorToken jt;
-
-		if (*op->d.cypherlistcomp_iter.is_null_list_or_array)
-		{
-			*op->resvalue = (Datum) 0;
-			*op->resnull = true;
-			return;
-		}
+	JsonbIterator **ji;
+	JsonbValue	jv;
+	JsonbIteratorToken jt;
 
-		ji = op->d.cypherlistcomp_iter.jsonb_list_iterator;
-		jt = JsonbIteratorNext(ji, &jv, true);
-		if (jt == WJB_ELEM)
-		{
-			*op->resvalue = JsonbPGetDatum(JsonbValueToJsonb(&jv));
-			*op->resnull = false;
-		}
-		else
-		{
-			*op->resvalue = (Datum) 0;
-			*op->resnull = true;
-		}
+	ji = op->d.cypherlistcomp_iter.listiter;
+	jt = JsonbIteratorNext(ji, &jv, true);
+	if (jt == WJB_ELEM)
+	{
+		*op->resvalue = JsonbPGetDatum(JsonbValueToJsonb(&jv));
+		*op->resnull = false;
 	}
 	else
 	{
-		CypherListCompArrayIterator *array_iter = op->d.cypherlistcomp_iter.array_iterator;
-		Datum		vertex_or_edge_datum;
-
-		if (array_iter->array_position >= array_iter->array_size)
-		{
-			*op->resvalue = (Datum) 0;
-			*op->resnull = true;
-			return;
-		}
-
-		vertex_or_edge_datum = array_iter_next(&array_iter->array_iter,
-											   op->resnull,
-											   array_iter->array_position++,
-											   array_iter->typlen,
-											   array_iter->typbyval,
-											   array_iter->typalign);
-
-		if (*op->resnull)
-		{
-			return;
-		}
-
-		if (array_iter->array_typid == VERTEXOID)
-		{
-			*op->resvalue = getVertexPropDatum(vertex_or_edge_datum);
-		}
-		else
-		{
-			*op->resvalue = getEdgePropDatum(vertex_or_edge_datum);
-		}
+		*op->resvalue = (Datum) 0;
+		*op->resnull = true;
 	}
 }
 

src/backend/parser/parse_cypher_expr.c

@@ -721,15 +721,9 @@ transformCypherListComp(ParseState *pstate, CypherListComp *clc)
 
 	list = transformCypherExprRecurse(pstate, (Node *) clc->list);
 	type = exprType(list);
-
-	switch (type) {
-		case JSONBOID:
-		case VERTEXARRAYOID:
-		case EDGEARRAYOID:
-			break;
-		default:
-			list = coerce_all_to_jsonb(pstate, list);
-			break;
+	if (type != JSONBOID)
+	{
+		list = coerce_all_to_jsonb(pstate, list);
 	}
 
 	save_varname = pstate->p_lc_varname;

src/backend/utils/adt/cypher_empty_funcs.c

@@ -11,36 +11,9 @@
 
 #include "utils/cypher_empty_funcs.h"
 #include "utils/fmgrprotos.h"
-#include "utils/jsonb.h"
 
 Datum
 cypher_to_jsonb(PG_FUNCTION_ARGS)
 {
 	return to_jsonb(fcinfo);
-}
-
-Datum
-cypher_isempty_jsonb(PG_FUNCTION_ARGS)
-{
-	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
-
-	if (JB_ROOT_IS_SCALAR(jb))
-	{
-		JsonbValue *sjv;
-
-		sjv = getIthJsonbValueFromContainer(&jb->root, 0);
-		if (sjv->type == jbvString)
-		{
-			PG_RETURN_BOOL(sjv->val.string.len <= 0);
-		}
-	}
-	else if (JB_ROOT_IS_ARRAY(jb) || JB_ROOT_IS_OBJECT(jb))
-	{
-		PG_RETURN_BOOL(JB_ROOT_COUNT(jb) <= 0);
-	}
-
-	ereport(ERROR,
-			(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			 errmsg("isEmpty(): list or object or string is expected but %s",
-					JsonbToCString(NULL, &jb->root, VARSIZE(jb)))));
-}
+}

src/include/catalog/pg_proc.dat

@@ -11333,9 +11333,6 @@
 { oid => '7247', descr => 'map input to jsonb (cypher)',
   proname => 'cypher_to_jsonb', prorettype => 'jsonb',
   proargtypes => 'anyelement', prosrc => 'cypher_to_jsonb' },
-{ oid => '7248', descr => 'is jsonb empty?',
-  proname => 'isempty', prorettype => 'bool',
-  proargtypes => 'jsonb', prosrc => 'cypher_isempty_jsonb' },
 
 # agensgraph array functions
 { oid => '7300', descr => 'the first element in a array',

src/include/executor/execExpr.h

@@ -17,13 +17,11 @@
 #include "executor/nodeAgg.h"
 #include "nodes/execnodes.h"
 #include "utils/jsonb.h"
-#include "utils/arrayaccess.h"
 
 /* forward references to avoid circularity */
 struct ExprEvalStep;
 struct SubscriptingRefState;
 struct CypherAccessPathElem;
-struct CypherListCompArrayIterator;
 
 /* Bits in ExprState->flags (see also execnodes.h for public flag bits): */
 /* expression's interpreter has been initialized */
@@ -701,9 +699,7 @@ typedef struct ExprEvalStep
 		{
 			Datum	   *listvalue;
 			bool	   *listnull;
-			JsonbIterator **jsonb_list_iterator;
-			struct CypherListCompArrayIterator *array_iterator;
-			bool	   *is_null_list_or_array;
+			JsonbIterator **listiter;
 		}			cypherlistcomp_iter;
 
 		struct
@@ -780,17 +776,6 @@ typedef struct CypherAccessPathElem
 	CypherIndexResult uidx;
 } CypherAccessPathElem;
 
-typedef struct CypherListCompArrayIterator
-{
-	array_iter array_iter;
-	int			array_size;
-	int			array_position;
-	Oid			array_typid;
-	int16		typlen;
-	bool		typbyval;
-	char		typalign;
-} CypherListCompArrayIterator;
-
 
 /* functions in execExpr.c */
 extern void ExprEvalPushStep(ExprState *es, const ExprEvalStep *s);

src/include/utils/cypher_empty_funcs.h

@@ -13,6 +13,4 @@
 #include "fmgr.h"
 
 extern Datum cypher_to_jsonb(PG_FUNCTION_ARGS);
-extern Datum cypher_isempty_jsonb(PG_FUNCTION_ARGS);
-
 #endif