sandy-bes commented on code in PR #2351:
URL: https://github.com/apache/age/pull/2351#discussion_r3013697757
##########
src/backend/utils/adt/agtype.c:
##########
@@ -12020,6 +12065,38 @@ static int64 get_int64_from_int_datums(Datum d, Oid
type, char *funcname,
return result;
}
+/*
+ * Helper function to find a valid index for a specific attribute.
+ * Returns the OID of the index, or InvalidOid if none is found.
+ */
+Oid find_usable_index_for_attr(Relation rel, AttrNumber attnum)
+{
+List *index_list = RelationGetIndexList(rel);
+ ListCell *ilc;
+ Oid index_oid = InvalidOid;
+
+ foreach(ilc, index_list)
+ {
+ Oid curr_idx_oid = lfirst_oid(ilc);
+ Relation curr_idx_rel = index_open(curr_idx_oid, AccessShareLock);
+
+ if (curr_idx_rel->rd_index->indisvalid &&
+ curr_idx_rel->rd_index->indnatts >= 1 &&
+ curr_idx_rel->rd_index->indkey.values[0] == attnum)
Review Comment:
I've updated the helper function to strictly filter for B-Tree indexes
(relam == BTREE_AM_OID) and to skip partial indexes. To make this specific
behavior explicit and prevent any future misuse, I also took the liberty of
renaming the function to find_usable_btree_index_for_attr.
##########
src/backend/utils/adt/agtype.c:
##########
@@ -5646,19 +5649,52 @@ static Datum get_vertex(const char *graph, const char
*vertex_label,
aclcheck_error(aclresult, OBJECT_TABLE, vertex_label);
}
- /* initialize the scan key */
- ScanKeyInit(&scan_keys[0], 1, BTEqualStrategyNumber, F_OIDEQ,
- Int64GetDatum(graphid));
-
- /* open the relation (table), begin the scan, and get the tuple */
+ /* open the relation (table) */
graph_vertex_label = table_open(vertex_label_table_oid, ShareLock);
- scan_desc = table_beginscan(graph_vertex_label, snapshot, 1, scan_keys);
- tuple = heap_getnext(scan_desc, ForwardScanDirection);
+
+ index_oid = find_usable_index_for_attr(graph_vertex_label, 1);
+
+ if (OidIsValid(index_oid))
+ {
+ IndexScanDesc index_scan_desc;
+ Relation index_rel;
+
+ index_rel = index_open(index_oid, ShareLock);
+ slot = table_slot_create(graph_vertex_label, NULL);
+
+ /* initialize the scan key using GRAPHIDEQ for index */
+ ScanKeyInit(&scan_keys[0], 1, BTEqualStrategyNumber,
+ F_GRAPHIDEQ, Int64GetDatum(graphid));
+
+ index_scan_desc = index_beginscan(graph_vertex_label, index_rel,
+ snapshot, NULL, 1, 0);
+ index_rescan(index_scan_desc, scan_keys, 1, NULL, 0);
+
+ if (index_getnext_slot(index_scan_desc, ForwardScanDirection, slot))
+ {
+ tuple = ExecCopySlotHeapTuple(slot);
+ should_free_tuple = true;
+ }
+
+ index_endscan(index_scan_desc);
+ index_close(index_rel, ShareLock);
+ ExecDropSingleTupleTableSlot(slot);
+ }
+ else
+ {
+ /* fallback to sequential scan */
+ ScanKeyInit(&scan_keys[0], 1, BTEqualStrategyNumber, F_OIDEQ,
+ Int64GetDatum(graphid));
+
+ scan_desc = table_beginscan(graph_vertex_label, snapshot, 1,
scan_keys);
+ tuple = heap_getnext(scan_desc, ForwardScanDirection);
Review Comment:
As I mentioned in a similar comment, this was existing code that I simply
moved into the else branch, which is why I didn't touch its internal mechanics
initially. I'll update the fallback path to use F_GRAPHIDEQ with the correct
datum conversion right away.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
