Update

Author: JoshInnis

Makefile

@@ -71,7 +71,6 @@ EXTENSION = postgraph
 DATA = postgraph--0.1.0.sql
 
 REGRESS = new_cypher \
-	  vertex_am \
           cypher_create
 
 srcdir=`pwd`

regress/sql/cypher_create.sql

@@ -46,6 +46,11 @@ MATCH () RETURN 1;
 
 CREATE ()-[]->();
 
+EXPLAIN MATCH ()-[]->() RETURN 1;
+
+
+MATCH ()-[]->() RETURN 1;
+
 SELECT * FROM cypher_create._ag_label_vertex;
 
 SELECT * FROM cypher_create._adj__adj__ag_label_vertex;

regress/sql/vertex_am.sql

@@ -17,16 +17,16 @@
 -- Regression tests don't preload extensions, gotta load it first
 
 LOAD 'postgraph';
-set search_path 'postgraph';
-/*
+set search_path = 'postgraph';
+
 CREATE TABLE vertex_am_tst (id postgraph.graphid not null, props postgraph.gtype not null) USING vertex_adjlist;
 
 
 INSERT INTO vertex_am_tst (id, props)
 VALUES ('1'::postgraph.graphid, postgraph.gtype_build_map('id', 1));
 
-
-SELECT '1'::postgraph.graphid OPERATOR(postgraph.=) '1'::postgraph.graphid;
+/*
+--SELECT '1'::postgraph.graphid OPERATOR(postgraph.=) '1'::postgraph.graphid;
 EXPLAIN SELECT * FROM vertex_am_tst WHERE id OPERATOR(postgraph.=) '1'::postgraph.graphid;
 SELECT * FROM vertex_am_tst WHERE id OPERATOR(postgraph.=) '1'::postgraph.graphid;
 

src/backend/access/vertex_heap/vertex_heapam_handler.c

@@ -1301,9 +1301,16 @@ void vertex_scan_rescan(TableScanDesc scan, struct ScanKeyData *key,
 bool vertex_scan_getnextslot(TableScanDesc sscan, ScanDirection direction,
                 TupleTableSlot *slot) {
 	VertexScanDescData *vertex_desc = sscan;
-	TableAmRoutine *tableam = GetHeapamTableAmRoutine();
 
+
+	if(vertex_desc->rs_base.rs_nkeys != 1)
 	ereport(WARNING,errmsg_internal("here"));
+	else
+ereport(WARNING,errmsg_internal("there"));
+	
+
+	TableAmRoutine *tableam = GetHeapamTableAmRoutine();
+
 	return tableam->scan_getnextslot(vertex_desc->desc[0], direction, slot);
 
     VertexHeapScanDesc so = (VertexHeapScanDesc) sscan;
@@ -2784,18 +2791,18 @@ vertex_hash_doinsert(Relation rel, HeapTuple itup, Relation heapRel)
 }
 
 #include "executor/nodeSeqscan.h"
-
+#include "utils/ag_cache.h"
 static exec_seq_scan_scan_key_hook_type prev_exec_seq_scan_scan_key_hook = NULL;
 
 void postgraph_seq_scan_key_hook (SeqScanState *node,
 					   				int *numScanKeys, ScanKey scanKeys) {
 
-	ereport(WARNING, errmsg("In hook"));
-
-vertex_exec_index_build_ScanKeys(node, node->ss.ss_currentRelation,
-					   node->ss.ps.plan->qual,
-					   scanKeys, numScanKeys);
 
+	label_cache_data *lcd = search_label_vertex_adjlist_cache(RelationGetRelid(node->ss.ss_currentRelation));
+	if (lcd) {
+		ereport(WARNING, errmsg("Found an edge scan"));
+		vertex_exec_index_build_ScanKeys(node, node->ss.ss_currentRelation, node->ss.ps.plan->qual, scanKeys, numScanKeys);
+	}
 	return;
 }