Added non existing entity runtime error (#919)

* Added non existing entity runtime error * fixed PR comments Co-authored-by: Roi Lipman <swilly22@users.noreply.github.com>
RedisGraph · Feb 13, 2020 · db0f55c · db0f55c
1 parent e54ce35
commit db0f55c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/src/arithmetic/arithmetic_expression.c b/src/arithmetic/arithmetic_expression.c
@@ -298,8 +298,19 @@ static AR_EXP_Result _AR_EXP_EvaluateFunctionCall(AR_ExpNode *node, const Record
 	return res;
 }
 
-static inline void _AR_EXP_UpdateEntityIdx(AR_OperandNode *node, const Record r) {
-	node->variadic.entity_alias_idx = Record_GetEntryIdx(r, node->variadic.entity_alias);
+static bool _AR_EXP_UpdateEntityIdx(AR_OperandNode *node, const Record r) {
+	int entry_alias_idx = Record_GetEntryIdx(r, node->variadic.entity_alias);
+	if(entry_alias_idx == INVALID_INDEX) {
+		char *error;
+		asprintf(&error,
+				 "_AR_EXP_UpdateEntityIdx: Unable to locate a value with alias %s within the record",
+				 node->variadic.entity_alias);
+		QueryCtx_SetError(error); // Set the query-level error.
+		return false;
+	} else {
+		node->variadic.entity_alias_idx = entry_alias_idx;
+		return true;
+	}
 }
 
 static AR_EXP_Result _AR_EXP_EvaluateProperty(AR_ExpNode *node, const Record r, SIValue *result) {
@@ -334,10 +345,10 @@ static AR_EXP_Result _AR_EXP_EvaluateProperty(AR_ExpNode *node, const Record r,
 static AR_EXP_Result _AR_EXP_EvaluateVariadic(AR_ExpNode *node, const Record r, SIValue *result) {
 	// Make sure entity record index is known.
 	if(node->operand.variadic.entity_alias_idx == IDENTIFIER_NOT_FOUND) {
-		_AR_EXP_UpdateEntityIdx(&node->operand, r);
+		if(!_AR_EXP_UpdateEntityIdx(&node->operand, r)) return EVAL_ERR;
 	}
 
-	// Fetch entity property value.
+// Fetch entity property value.
 	if(node->operand.variadic.entity_prop != NULL) {
 		return _AR_EXP_EvaluateProperty(node, r, result);
 	} else {

diff --git a/src/execution_plan/record.c b/src/execution_plan/record.c
@@ -43,9 +43,8 @@ int Record_GetEntryIdx(Record r, const char *alias) {
 	assert(r && alias);
 
 	void *idx = raxFind(r->mapping, (unsigned char *)alias, strlen(alias));
-	assert(idx != raxNotFound && "ERR: tried to resolve unexpected alias");
 
-	return (intptr_t)idx;
+	return idx != raxNotFound ? (intptr_t)idx : INVALID_INDEX;
 }
 
 void Record_Clone(const Record r, Record clone) {

diff --git a/src/execution_plan/record.h b/src/execution_plan/record.h
@@ -12,6 +12,9 @@
 #include "../graph/entities/edge.h"
 #include <sys/types.h>
 
+// Return value in case of call to Record_GetEntryIdx with invalid entry alias.
+#define INVALID_INDEX -1
+
 typedef enum  {
 	REC_TYPE_UNKNOWN = 0,
 	REC_TYPE_SCALAR = 1 << 0,

diff --git a/tests/flow/test_query_validation.py b/tests/flow/test_query_validation.py
@@ -152,3 +152,13 @@ def test13_create_bound_variables(self):
         except redis.exceptions.ResponseError:
             # Expecting an error.
             pass
+
+    def test14_treat_path_as_entity(self):
+        redis_graph.query("CREATE ()-[:R]->()")
+        try:
+            query= """MATCH x=()-[]->() RETURN x.name"""
+            redis_graph.query(query)
+            assert(False)
+        except redis.exceptions.ResponseError:
+            # Expecting an error.
+            pass