From 70a3e37a61205927c23cebb97131aac147d4bc2f Mon Sep 17 00:00:00 2001
From: Joo Youngjin <68979537+youngjinj@users.noreply.github.com>
Date: Thu, 20 Apr 2023 10:05:36 +0900
Subject: [PATCH] [CBRD-24770] Whenever one `QFILE_TUPLE_RECORD` of
 `(CONNECTBY_PROC_NODE *)->start_with_list_id` is completed, `(INDX_SCAN_ID
 *)->indx_cov.list_id` must be cleared (#4297) (#4311)

http://jira.cubrid.org/browse/CBRD-24770

backport #4297
---
 src/query/query_executor.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/query/query_executor.c b/src/query/query_executor.c
index 096aa0f6e3..9f8e679e96 100644
--- a/src/query/query_executor.c
+++ b/src/query/query_executor.c
@@ -15256,6 +15256,23 @@ qexec_execute_connect_by (THREAD_ENTRY * thread_p, XASL_NODE * xasl, XASL_STATE
 	      break;
 	    }
 
+	  if (xasl->spec_list->s_id.type == S_INDX_SCAN && SCAN_IS_INDEX_COVERED (&xasl->spec_list->s_id.s.isid)
+	      && xasl->spec_list->s_id.s.isid.indx_cov.lsid->status == S_OPENED)
+	    {
+	      INDX_SCAN_ID *isidp = &xasl->spec_list->s_id.s.isid;
+
+	      /* close current list and start a new one */
+	      qfile_close_scan (thread_p, isidp->indx_cov.lsid);
+	      qfile_destroy_list (thread_p, isidp->indx_cov.list_id);
+	      QFILE_FREE_AND_INIT_LIST_ID (isidp->indx_cov.list_id);
+	      isidp->indx_cov.list_id =
+		qfile_open_list (thread_p, isidp->indx_cov.type_list, NULL, isidp->indx_cov.query_id, 0);
+	      if (isidp->indx_cov.list_id == NULL)
+		{
+		  GOTO_EXIT_ON_ERROR;
+		}
+	    }
+
 	  parent_tuple_added = false;
 
 	  /* reset parent tuple position pseudocolumn value */
@@ -15599,22 +15616,6 @@ qexec_execute_connect_by (THREAD_ENTRY * thread_p, XASL_NODE * xasl, XASL_STATE
 
       qfile_close_scan (thread_p, &lfscan_id);
 
-      if (xasl->spec_list->s_id.type == S_INDX_SCAN && SCAN_IS_INDEX_COVERED (&xasl->spec_list->s_id.s.isid))
-	{
-	  INDX_SCAN_ID *isidp = &xasl->spec_list->s_id.s.isid;
-
-	  /* close current list and start a new one */
-	  qfile_close_scan (thread_p, isidp->indx_cov.lsid);
-	  qfile_destroy_list (thread_p, isidp->indx_cov.list_id);
-	  QFILE_FREE_AND_INIT_LIST_ID (isidp->indx_cov.list_id);
-	  isidp->indx_cov.list_id =
-	    qfile_open_list (thread_p, isidp->indx_cov.type_list, NULL, isidp->indx_cov.query_id, 0);
-	  if (isidp->indx_cov.list_id == NULL)
-	    {
-	      GOTO_EXIT_ON_ERROR;
-	    }
-	}
-
       if (qp_lfscan != S_END)
 	{
 	  GOTO_EXIT_ON_ERROR;