[CBRD-26176] bestspace

cubrid/CMakeLists.txt

@@ -501,6 +501,7 @@ set(TRANSACTION_HEADERS
   )
 
 set(STORAGE_SOURCES
+  ${STORAGE_DIR}/bestspace.cpp
   ${STORAGE_DIR}/btree.c
   ${STORAGE_DIR}/btree_load.c
   ${STORAGE_DIR}/btree_unique.cpp
@@ -530,6 +531,7 @@ set(STORAGE_SOURCES
   ${STORAGE_DIR}/tde.c
   )
 set(STORAGE_HEADERS
+  ${STORAGE_DIR}/bestspace.hpp
   ${STORAGE_DIR}/btree_unique.hpp
   ${STORAGE_DIR}/double_write_buffer.hpp
   ${STORAGE_DIR}/ftab_set.hpp

sa/CMakeLists.txt

@@ -505,6 +505,7 @@ set(TRANSACTION_HEADERS
   )
 
 set(STORAGE_SOURCES
+  ${STORAGE_DIR}/bestspace.cpp
   ${STORAGE_DIR}/btree.c
   ${STORAGE_DIR}/btree_load.c
   ${STORAGE_DIR}/btree_unique.cpp
@@ -536,6 +537,7 @@ set(STORAGE_SOURCES
   ${STORAGE_DIR}/tde.c
   )
 set(STORAGE_HEADERS
+  ${STORAGE_DIR}/bestspace.hpp
   ${STORAGE_DIR}/btree_unique.hpp
   ${STORAGE_DIR}/ftab_set.hpp
   ${STORAGE_DIR}/record_descriptor.hpp
@@ -780,6 +782,12 @@ target_link_libraries(cubridsa
     cascci
   )
 
+if(UNIX)
+  target_include_directories(cubridsa PUBLIC ${TBB_INCLUDES})
+  target_link_libraries(cubridsa PRIVATE ${TBB_LIBS})
+  add_dependencies(cubridsa ${TBB_TARGETS})
+endif(UNIX)
+
 add_dependencies(cubridsa
   gen_csql_grammar
   gen_csql_lexer

src/base/perf_monitor.c

@@ -379,17 +379,6 @@ PSTAT_METADATA pstat_Metadata[] = {
   PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_HEAP_VACUUM_EXECUTE, "heap_vacuum_execute"),
   PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_HEAP_VACUUM_LOG, "heap_vacuum_log"),
 
-  /* Execution statistics for the heap manager */
-  /* best space info */
-  PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_HEAP_STATS_SYNC_BESTSPACE, "heap_stats_sync_bestspace"),
-  PSTAT_METADATA_INIT_SINGLE_PEEK (PSTAT_HF_NUM_STATS_ENTRIES, "Num_heap_stats_bestspace_entries"),
-  PSTAT_METADATA_INIT_SINGLE_ACC (PSTAT_HF_NUM_STATS_MAXED, "Num_heap_stats_bestspace_maxed"),
-  PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_HF_BEST_SPACE_ADD, "bestspace_add"),
-  PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_HF_BEST_SPACE_DEL, "bestspace_del"),
-  PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_HF_BEST_SPACE_FIND, "bestspace_find"),
-  PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_HF_HEAP_FIND_PAGE_BEST_SPACE, "heap_find_page_bestspace"),
-  PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_HF_HEAP_FIND_BEST_PAGE, "heap_find_best_page"),
-
   /* B-tree detailed statistics. */
   PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_BT_FIX_OVF_OIDS, "bt_fix_ovf_oids"),
   PSTAT_METADATA_INIT_COUNTER_TIMER (PSTAT_BT_UNIQUE_RLOCKS, "bt_unique_rlocks"),
@@ -4053,7 +4042,6 @@ perfmon_get_peek_stats (UINT64 * stats)
   /* fixme(rem) - will be fixed in stattool patch */
 #if defined (SERVER_MODE) || defined (SA_MODE)
   stats[pstat_Metadata[PSTAT_PC_NUM_CACHE_ENTRIES].start_offset] = xcache_get_entry_count ();
-  stats[pstat_Metadata[PSTAT_HF_NUM_STATS_ENTRIES].start_offset] = heap_get_best_space_num_stats_entries ();
   stats[pstat_Metadata[PSTAT_QM_NUM_HOLDABLE_CURSORS].start_offset] = session_get_number_of_holdable_cursors ();
 #endif /* defined (SERVER_MODE) || defined (SA_MODE) */
 }

src/base/perf_monitor.h

@@ -453,17 +453,6 @@ typedef enum
   PSTAT_HEAP_VACUUM_EXECUTE,
   PSTAT_HEAP_VACUUM_LOG,
 
-  /* Execution statistics for the heap manager */
-  /* best space info */
-  PSTAT_HEAP_STATS_SYNC_BESTSPACE,
-  PSTAT_HF_NUM_STATS_ENTRIES,
-  PSTAT_HF_NUM_STATS_MAXED,
-  PSTAT_HF_BEST_SPACE_ADD,
-  PSTAT_HF_BEST_SPACE_DEL,
-  PSTAT_HF_BEST_SPACE_FIND,
-  PSTAT_HF_HEAP_FIND_PAGE_BEST_SPACE,
-  PSTAT_HF_HEAP_FIND_BEST_PAGE,
-
   /* B-tree ops detailed statistics. */
   PSTAT_BT_FIX_OVF_OIDS,
   PSTAT_BT_UNIQUE_RLOCKS,

src/base/system_parameter.c

@@ -801,6 +801,7 @@ static const char sysprm_ha_conf_file_name[] = "cubrid_ha.conf";
 #define PRM_NAME_LOG_POSTPONE_CACHE_SIZE "postpone_cache_size"
 
 #define PRM_NAME_HARDWARE_AFFINITY "hardware_affinity"
+#define PRM_NAME_BESTSPACE_SHARD_COUNT "bestspace_shard_count"
 
 // #endregion 
 
@@ -1197,12 +1198,13 @@ SYSPRM_PARAM prm_Def[] = {
    (DUP_PRM_FUNC) NULL},
   {PRM_ID_HF_MAX_BESTSPACE_ENTRIES,
    PRM_NAME_HF_MAX_BESTSPACE_ENTRIES,
-   (PRM_FOR_SERVER | PRM_HIDDEN | PRM_USER_CHANGE),
+   (PRM_FOR_SERVER | PRM_HIDDEN | PRM_USER_CHANGE | PRM_OBSOLETED),
    PRM_INTEGER,
    PRM_CLEAR_DYNAMIC_FLAG,
    {false, {.i = 1000000 /* 110 M */ }},
    {false, {.i = 1000000}},
-   NULL_SYSPRM_PARAM_VALUE, NULL_SYSPRM_PARAM_VALUE,
+   NULL_SYSPRM_PARAM_VALUE,
+   NULL_SYSPRM_PARAM_VALUE,
    (char *) NULL,
    (DUP_PRM_FUNC) NULL,
    (DUP_PRM_FUNC) NULL},
@@ -5384,6 +5386,18 @@ SYSPRM_PARAM prm_Def[] = {
    (char *) NULL,
    (DUP_PRM_FUNC) NULL,
    (DUP_PRM_FUNC) NULL},
+  {PRM_ID_BESTSPACE_SHARD_COUNT,
+   PRM_NAME_BESTSPACE_SHARD_COUNT,
+   (PRM_FOR_SERVER),
+   PRM_INTEGER,
+   PRM_CLEAR_DYNAMIC_FLAG,
+   {false, {.i = 8}},
+   {false, {.i = 8}},
+   {false, {.i = 28}},
+   {false, {.i = 1}},
+   (char *) NULL,
+   (DUP_PRM_FUNC) NULL,
+   (DUP_PRM_FUNC) NULL}
 };
 
 SYSPRM_INDIRECT_POS prm_Def_session_idx[DIM (prm_Def)];

src/base/system_parameter.h

@@ -535,8 +535,10 @@ enum param_id
 
   PRM_ID_HARDWARE_AFFINITY,
 
+  PRM_ID_BESTSPACE_SHARD_COUNT,
+
   /* change PRM_LAST_ID when adding new system parameters */
-  PRM_LAST_ID = PRM_ID_HARDWARE_AFFINITY
+  PRM_LAST_ID = PRM_ID_BESTSPACE_SHARD_COUNT
 };
 typedef enum param_id PARAM_ID;
 

src/parser/parse_tree.c

@@ -144,8 +144,6 @@ PT_RESERVED_NAME pt_Reserved_name_table[] = {
   {"p_offset_to_free_area", RESERVED_P_OFFSET_TO_FREE_AREA, DB_TYPE_INTEGER}
   ,
   {"p_is_saving", RESERVED_P_IS_SAVING, DB_TYPE_INTEGER}
-  ,
-  {"p_update_best", RESERVED_P_UPDATE_BEST, DB_TYPE_INTEGER}
 
   /* key info attributes */
   ,

src/parser/parse_tree.h

@@ -2539,7 +2539,6 @@ typedef enum
   RESERVED_P_CONT_FREE,
   RESERVED_P_OFFSET_TO_FREE_AREA,
   RESERVED_P_IS_SAVING,
-  RESERVED_P_UPDATE_BEST,
 
   /* Reserved key info names */
   RESERVED_KEY_VOLUMEID,
@@ -2568,7 +2567,7 @@ typedef enum
   RESERVED_LAST_RECORD_INFO = RESERVED_T_MVCC_PREV_VERSION_LSA,
 
   RESERVED_FIRST_PAGE_INFO = RESERVED_P_CLASS_OID,
-  RESERVED_LAST_PAGE_INFO = RESERVED_P_UPDATE_BEST,
+  RESERVED_LAST_PAGE_INFO = RESERVED_P_IS_SAVING,
 
   RESERVED_FIRST_KEY_INFO = RESERVED_KEY_VOLUMEID,
   RESERVED_LAST_KEY_INFO = RESERVED_KEY_OVERFLOW_OIDS,

src/parser/show_meta.c

@@ -223,7 +223,6 @@ metadata_of_slotted_page_header (void)
     {"Total_free_area", "int"},
     {"Contiguous_free_area", "int"},
     {"Free_space_offset", "int"},
-    {"Need_update_best_hint", "int"},
     {"Is_saving", "int"},
     {"Flags", "int"}
   };
@@ -304,21 +303,11 @@ metadata_of_heap_header (SHOW_ONLY_ALL flag)
     {"Header_page_id", "int"},
     {"Overflow_vfid", "varchar(64)"},
     {"Next_vpid", "varchar(64)"},
+    {"Last_vpid", "varchar(64)"},
     {"Unfill_space", "int"},
-    {"Estimates_num_pages", "bigint"},
-    {"Estimates_num_recs", "bigint"},
-    {"Estimates_avg_rec_len", "int"},
-    {"Estimates_num_high_best", "int"},
-    {"Estimates_num_others_high_best", "int"},
-    {"Estimates_head", "int"},
-    {"Estimates_best_list", "varchar(512)"},
-    {"Estimates_num_second_best", "int"},
-    {"Estimates_head_second_best", "int"},
-    {"Estimates_tail_second_best", "int"},
-    {"Estimates_num_substitutions", "int"},
-    {"Estimates_second_best_list", "varchar(256)"},
-    {"Estimates_last_vpid", "varchar(64)"},
-    {"Estimates_full_search_vpid", "varchar(64)"}
+    {"Num_pages", "bigint"},
+    {"Num_recs", "bigint"},
+    {"Avg_rec_len", "int"}
   };
 
   static const SHOWSTMT_COLUMN_ORDERBY orderby[] = {

src/parser/xasl_generation.c

@@ -27929,8 +27929,6 @@ pt_reserved_id_to_valuelist_index (PARSER_CONTEXT * parser, PT_RESERVED_NAME_ID
       return HEAP_PAGE_INFO_OFFSET_TO_FREE_AREA;
     case RESERVED_P_IS_SAVING:
       return HEAP_PAGE_INFO_IS_SAVING;
-    case RESERVED_P_UPDATE_BEST:
-      return HEAP_PAGE_INFO_UPDATE_BEST;
 
       /* Key info names */
     case RESERVED_KEY_VOLUMEID:

src/query/parallel/px_scan/px_scan_input_handler_heap.cpp

@@ -23,6 +23,7 @@
 #include "px_scan_input_handler_heap.hpp"
 #include "error_code.h"
 #include "bit.h"
+#include "heap_file.h"
 
 // XXX: SHOULD BE THE LAST INCLUDE HEADER
 #include "memory_wrapper.hpp"
@@ -158,6 +159,15 @@ namespace parallel_scan
 		    return S_ERROR;
 		  }
 
+		if (heap_page_is_bestspace (thread_p, m_tl_scan_cache->page_watcher.pgptr))
+		  {
+		    pgbuf_ordered_unfix (thread_p, &m_tl_scan_cache->page_watcher);
+		    PGBUF_CLEAR_WATCHER (&m_tl_scan_cache->page_watcher);
+		    /* the manual advance is only needed on the S_SUCCESS return path */
+		    found = false;
+		    continue;
+		  }
+
 		*vpid = m_tl_vpid;
 		m_tl_pgoffset++;
 		m_tl_vpid.pageid++;

src/query/vacuum.c

@@ -32,6 +32,7 @@
 #include "boot_sr.h"
 #include "btree.h"
 #include "dbtype.h"
+#include "bestspace.hpp"
 #include "heap_file.h"
 #include "lockfree_circular_queue.hpp"
 #include "log_append.hpp"
@@ -1677,7 +1678,7 @@ vacuum_heap_page (THREAD_ENTRY * thread_p, VACUUM_HEAP_OBJECT * heap_objects, in
   (void) pgbuf_check_page_ptype (thread_p, helper.home_page, PAGE_HEAP);
 #endif /* !NDEBUG */
 
-  helper.initial_home_free_space = spage_get_free_space_without_saving (thread_p, helper.home_page, NULL);
+  helper.initial_home_free_space = spage_get_free_space_without_saving (thread_p, helper.home_page);
 
   if (HFID_IS_NULL (hfid))
     {
@@ -2416,23 +2417,8 @@ vacuum_heap_record (THREAD_ENTRY * thread_p, VACUUM_HEAP_HELPER * helper)
 
       spage_vacuum_slot (thread_p, helper->forward_page, helper->forward_oid.slotid, true);
 
-      if (prm_get_integer_value (PRM_ID_HF_MAX_BESTSPACE_ENTRIES) > 0)
-	{
-	  int freespace = spage_get_free_space_without_saving (thread_p, helper->forward_page, NULL);
-
-	  if (freespace > HEAP_DROP_FREE_SPACE)
-	    {
-	      /*
-	       * NOTE:
-	       * By checking the freespace > HEAP_DROP_FREE_SPACE condition, heap_Bestspace->bestspace_mutex contention is reduced
-	       * and the unnecessarily frequent extraction from heap_Bestspace->vpid_ht due to small free space is prevented in heap_stats_find_page_in_bestspace().
-	       * And Passing the prev_freespace argument to 0 is a trick to get heap_stats_add_bestspace() called from heap_stats_update().
-	       *
-	       * This part will be refactored right away in the related issue, at which time this comment will be removed.
-	       */
-	      heap_stats_update (thread_p, helper->forward_page, &helper->hfid, 0);
-	    }
-	}
+      /* add candidate page into bestspace candidates */
+      heap_add_bestpage (thread_p, &helper->hfid, helper->forward_page);
 
       VACUUM_PERF_HEAP_TRACK_EXECUTE (thread_p, helper);
 
@@ -2613,7 +2599,7 @@ vacuum_heap_page_log_and_reset (THREAD_ENTRY * thread_p, VACUUM_HEAP_HELPER * he
   if (update_best_space_stat == true && helper->initial_home_free_space != -1)
     {
       assert (!HFID_IS_NULL (&helper->hfid));
-      heap_stats_update (thread_p, helper->home_page, &helper->hfid, helper->initial_home_free_space);
+      heap_add_bestpage (thread_p, &helper->hfid, helper->home_page, helper->initial_home_free_space);
     }
 
   VACUUM_PERF_HEAP_TRACK_EXECUTE (thread_p, helper);
@@ -6422,6 +6408,7 @@ vacuum_rv_notify_dropped_file (THREAD_ENTRY * thread_p, LOG_RCV * rcv)
     {
       (void) heap_delete_hfid_from_cache (thread_p, class_oid);
     }
+  cubstorage::bestspaces.destroy (&rcv_data->vfid);
 
   /* Success */
   return NO_ERROR;