From addeaca53fb6f25944152646fc9cf797a583e63e Mon Sep 17 00:00:00 2001
From: Hyung-Gyu Ryoo <hgryoo@cubrid.com>
Date: Fri, 6 Dec 2024 15:42:00 +0900
Subject: [PATCH] If p_current_oid is NULL OID, try to set heap scanner's
 current OID

---
 src/query/scan_manager.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/query/scan_manager.c b/src/query/scan_manager.c
index 59825007c34..4dc3b707374 100644
--- a/src/query/scan_manager.c
+++ b/src/query/scan_manager.c
@@ -5321,6 +5321,11 @@ scan_next_heap_scan (THREAD_ENTRY * thread_p, SCAN_ID * scan_id)
       /* evaluate the predicates to see if the object qualifies */
       scan_id->scan_stats.read_rows++;
 
+      if (OID_ISNULL (p_current_oid))
+	{
+	  COPY_OID (p_current_oid, &hsidp->curr_oid);
+	}
+
       ev_res = eval_data_filter (thread_p, p_current_oid, &recdes, &hsidp->scan_cache, &data_filter);
       if (ev_res == V_ERROR)
 	{