[CBRD-25728] Support parallel sort for ORDER_BY

src/base/system_parameter.c

@@ -664,6 +664,8 @@ static const char sysprm_ha_conf_file_name[] = "cubrid_ha.conf";
 
 #define PRM_NAME_CTE_MAX_RECURSIONS "cte_max_recursions"
 
+#define PRM_NAME_MAX_PARALLEL_THREAD "max_parallel_thread"
+
 #define PRM_NAME_DWB_SIZE "double_write_buffer_size"
 #define PRM_NAME_DWB_BLOCKS "double_write_buffer_blocks"
 #define PRM_NAME_ENABLE_DWB_FLUSH_THREAD "double_write_buffer_enable_flush_thread"
@@ -2159,6 +2161,12 @@ static int prm_cte_max_recursions_upper = 1000000;
 static int prm_cte_max_recursions_lower = 2;
 static unsigned int prm_cte_max_recursions_flag = 0;
 
+int PRM_MAX_PARALLEL_THREAD = 1;
+static int prm_max_parallel_thread_default = 1;
+static int prm_max_parallel_thread_upper = 32;
+static int prm_max_parallel_thread_lower = 1;
+static unsigned int prm_max_parallel_thread_flag = 0;
+
 bool PRM_JSON_LOG_ALLOCATIONS = false;
 static bool prm_json_log_allocations_default = false;
 static unsigned int prm_json_log_allocations_flag = 0;
@@ -6448,6 +6456,18 @@ SYSPRM_PARAM prm_Def[] = {
    (void *) &prm_max_subquery_cache_size_lower,
    (char *) NULL,
    (DUP_PRM_FUNC) NULL,
+   (DUP_PRM_FUNC) NULL},
+  {PRM_ID_MAX_PARALLEL_THREAD,
+   PRM_NAME_MAX_PARALLEL_THREAD,
+   (PRM_FOR_SERVER | PRM_FOR_CLIENT | PRM_USER_CHANGE | PRM_FOR_SESSION | PRM_HIDDEN),
+   PRM_INTEGER,
+   &prm_max_parallel_thread_flag,
+   (void *) &prm_max_parallel_thread_default,
+   (void *) &PRM_MAX_PARALLEL_THREAD,
+   (void *) &prm_max_parallel_thread_upper,
+   (void *) &prm_max_parallel_thread_lower,
+   (char *) NULL,
+   (DUP_PRM_FUNC) NULL,
    (DUP_PRM_FUNC) NULL}
 };
 

src/base/system_parameter.h

@@ -486,8 +486,9 @@ enum param_id
 
   PRM_ID_ENABLE_MEMORY_MONITORING,
   PRM_ID_MAX_SUBQUERY_CACHE_SIZE,
+  PRM_ID_MAX_PARALLEL_THREAD,
   /* change PRM_LAST_ID when adding new system parameters */
-  PRM_LAST_ID = PRM_ID_MAX_SUBQUERY_CACHE_SIZE
+  PRM_LAST_ID = PRM_ID_MAX_PARALLEL_THREAD
 };
 typedef enum param_id PARAM_ID;
 

src/query/list_file.c

@@ -243,8 +243,8 @@ static void qfile_close_and_free_list_file (THREAD_ENTRY * thread_p, QFILE_LIST_
 static QFILE_LIST_ID *qfile_union_list (THREAD_ENTRY * thread_p, QFILE_LIST_ID * list_id1, QFILE_LIST_ID * list_id2,
 					int flag);
 
-static SORT_STATUS qfile_get_next_sort_item (THREAD_ENTRY * thread_p, RECDES * recdes, void *arg);
 static int qfile_put_next_sort_item (THREAD_ENTRY * thread_p, const RECDES * recdes, void *arg);
+static SORT_STATUS qfile_get_next_sort_item (THREAD_ENTRY * thread_p, RECDES * recdes, void *arg);
 static SORT_INFO *qfile_initialize_sort_info (SORT_INFO * info, QFILE_LIST_ID * listid, SORT_LIST * sort_list);
 static void qfile_clear_sort_info (SORT_INFO * info);
 static int qfile_copy_list_pages (THREAD_ENTRY * thread_p, VPID * old_first_vpidp, QMGR_TEMP_FILE * old_tfile_vfidp,
@@ -2230,7 +2230,7 @@ qfile_destroy_list (THREAD_ENTRY * thread_p, QFILE_LIST_ID * list_id_p)
 	  /* because qmgr_free_list_temp_file() destroy only FILE_TEMP file */
 	  if (!VFID_ISNULL (&list_id_p->temp_vfid))
 	    {
-	      file_temp_retire (thread_p, &list_id_p->temp_vfid);
+	      file_temp_retire (thread_p, &list_id_p->temp_vfid, false);
 	    }
 	}
 
@@ -3983,6 +3983,9 @@ qfile_sort_list_with_func (THREAD_ENTRY * thread_p, QFILE_LIST_ID * list_id_p, S
   int sort_result, estimated_pages;
   SORT_DUP_OPTION dup_option;
 
+  /* The result file must be closed for parallel processing. If not closed, Latch contention may occur. */
+  qfile_close_list (thread_p, list_id_p);
+
   srlist_id = qfile_open_list (thread_p, &list_id_p->type_list, sort_list_p, list_id_p->query_id, flag, NULL);
   if (srlist_id == NULL)
     {
@@ -4005,6 +4008,7 @@ qfile_sort_list_with_func (THREAD_ENTRY * thread_p, QFILE_LIST_ID * list_id_p, S
 
   info.s_id = &s_scan_id;
   info.output_file = srlist_id;
+  info.input_file = list_id_p;
   info.extra_arg = extra_arg;
 
   if (get_func == NULL)
@@ -4037,9 +4041,23 @@ qfile_sort_list_with_func (THREAD_ENTRY * thread_p, QFILE_LIST_ID * list_id_p, S
 
   dup_option = ((option == Q_DISTINCT) ? SORT_ELIM_DUP : SORT_DUP);
 
+#if !defined(NDEBUG)
+  TSC_TICKS start_tick, end_tick;
+  TSCTIMEVAL tv_diff;
+  struct timeval orderby_time;
+  tsc_getticks (&start_tick);
+#endif
+
   sort_result =
     sort_listfile (thread_p, NULL_VOLID, estimated_pages, get_func, &info, put_func, &info, cmp_func, &info.key_info,
-		   dup_option, limit, srlist_id->tfile_vfid->tde_encrypted);
+		   dup_option, limit, srlist_id->tfile_vfid->tde_encrypted, SORT_ORDER_BY);
+
+#if !defined(NDEBUG)
+  tsc_getticks (&end_tick);
+  tsc_elapsed_time_usec (&tv_diff, end_tick, start_tick);
+  TSC_ADD_TIMEVAL (orderby_time, tv_diff);
+  printf ("sort_listfile time: %d\n", TO_MSEC (orderby_time));
+#endif
 
   if (sort_result < 0)
     {

src/query/list_file.h

@@ -230,4 +230,5 @@ extern int qfile_get_list_cache_number_of_entries (int ht_no);
 extern bool qfile_has_no_cache_entries ();
 
 
+
 #endif /* _LIST_FILE_H_ */

src/query/query_executor.c

@@ -4695,7 +4695,7 @@ qexec_groupby (THREAD_ENTRY * thread_p, XASL_NODE * xasl, XASL_STATE * xasl_stat
       /* sort and aggregate partial results */
       if (sort_listfile (thread_p, NULL_VOLID, estimated_pages, &qexec_hash_gby_get_next, &gbstate,
 			 &qexec_hash_gby_put_next, &gbstate, cmp_fn, &gbstate.agg_hash_context->sort_key, SORT_DUP,
-			 NO_SORT_LIMIT, gbstate.output_file->tfile_vfid->tde_encrypted) != NO_ERROR)
+			 NO_SORT_LIMIT, gbstate.output_file->tfile_vfid->tde_encrypted, SORT_GROUP_BY) != NO_ERROR)
 	{
 	  GOTO_EXIT_ON_ERROR;
 	}
@@ -4776,7 +4776,7 @@ qexec_groupby (THREAD_ENTRY * thread_p, XASL_NODE * xasl, XASL_STATE * xasl_stat
 
   if (sort_listfile (thread_p, NULL_VOLID, estimated_pages, &qexec_gby_get_next, &gbstate, &qexec_gby_put_next,
 		     &gbstate, gbstate.cmp_fn, &gbstate.key_info, SORT_DUP, NO_SORT_LIMIT,
-		     gbstate.output_file->tfile_vfid->tde_encrypted) != NO_ERROR)
+		     gbstate.output_file->tfile_vfid->tde_encrypted, SORT_GROUP_BY) != NO_ERROR)
     {
       GOTO_EXIT_ON_ERROR;
     }
@@ -22206,7 +22206,8 @@ qexec_execute_analytic (THREAD_ENTRY * thread_p, XASL_NODE * xasl, XASL_STATE *
 
   if (sort_listfile (thread_p, NULL_VOLID, estimated_pages, &qexec_analytic_get_next, &analytic_state,
 		     &qexec_analytic_put_next, &analytic_state, analytic_state.cmp_fn, &analytic_state.key_info,
-		     SORT_DUP, NO_SORT_LIMIT, analytic_state.output_file->tfile_vfid->tde_encrypted) != NO_ERROR)
+		     SORT_DUP, NO_SORT_LIMIT, analytic_state.output_file->tfile_vfid->tde_encrypted,
+		     SORT_ANALYTIC) != NO_ERROR)
     {
       GOTO_EXIT_ON_ERROR;
     }

src/query/query_manager.c

@@ -2592,7 +2592,7 @@ qmgr_get_new_page (THREAD_ENTRY * thread_p, VPID * vpid_p, QMGR_TEMP_FILE * tfil
   if (VFID_ISNULL (&tfile_vfid_p->temp_vfid))
     {
       TDE_ALGORITHM tde_algo = TDE_ALGORITHM_NONE;
-      if (file_create_temp (thread_p, 1, &tfile_vfid_p->temp_vfid) != NO_ERROR)
+      if (file_create_temp (thread_p, 1, &tfile_vfid_p->temp_vfid, false) != NO_ERROR)
 	{
 	  ASSERT_ERROR ();
 	  return NULL;
@@ -2607,7 +2607,7 @@ qmgr_get_new_page (THREAD_ENTRY * thread_p, VPID * vpid_p, QMGR_TEMP_FILE * tfil
       if (file_apply_tde_algorithm (thread_p, &tfile_vfid_p->temp_vfid, tde_algo) != NO_ERROR)
 	{
 	  ASSERT_ERROR ();
-	  file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid);
+	  file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid, false);
 	  VFID_SET_NULL (&tfile_vfid_p->temp_vfid);
 	  return NULL;
 	}
@@ -2871,7 +2871,7 @@ qmgr_create_result_file (THREAD_ENTRY * thread_p, QUERY_ID query_id)
     {
       /* query entry is not found */
       er_set (ER_ERROR_SEVERITY, ARG_FILE_LINE, ER_QPROC_UNKNOWN_QUERYID, 1, query_id);
-      file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid);
+      file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid, false);
       free_and_init (tfile_vfid_p);
       return NULL;
     }
@@ -2884,7 +2884,7 @@ qmgr_create_result_file (THREAD_ENTRY * thread_p, QUERY_ID query_id)
 
   if (file_apply_tde_algorithm (thread_p, &tfile_vfid_p->temp_vfid, tde_algo) != NO_ERROR)
     {
-      file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid);
+      file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid, false);
       free_and_init (tfile_vfid_p);
       return NULL;
     }
@@ -2954,7 +2954,7 @@ qmgr_free_temp_file_list (THREAD_ENTRY * thread_p, QMGR_TEMP_FILE * tfile_vfid_p
 	    }
 	  else
 	    {
-	      fd_ret = file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid);
+	      fd_ret = file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid, false);
 	      if (fd_ret != NO_ERROR)
 		{
 		  /* set error but continue with the destroy process */
@@ -3095,7 +3095,7 @@ qmgr_free_list_temp_file (THREAD_ENTRY * thread_p, QUERY_ID query_id, QMGR_TEMP_
 		  rc = ER_FAILED;
 		}
 	    }
-	  else if (file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid) != NO_ERROR)
+	  else if (file_temp_retire (thread_p, &tfile_vfid_p->temp_vfid, false) != NO_ERROR)
 	    {
 	      /* stop; return error */
 	      rc = ER_FAILED;

src/storage/btree_load.c

@@ -3217,7 +3217,7 @@ btree_index_sort (THREAD_ENTRY * thread_p, SORT_ARGS * sort_args, SORT_PUT_FUNC
 
   return sort_listfile (thread_p, sort_args->hfids[0].vfid.volid, 0 /* TODO - support parallelism */ ,
 			&btree_sort_get_next, sort_args, out_func, out_args, compare_driver, sort_args, SORT_DUP,
-			NO_SORT_LIMIT, includes_tde_class);
+			NO_SORT_LIMIT, includes_tde_class, SORT_INDEX_LEAF);
 }
 
 /*