rename to DeferredChunkScan

Author: svenklemm

src/cross_module_fn.h

@@ -80,8 +80,8 @@ typedef struct CrossModuleFunctions
 	void (*set_rel_pathlist_query)(PlannerInfo *, RelOptInfo *, Index, RangeTblEntry *,
 								   Hypertable *);
 
-	bool (*should_hypertable_scan)(const Query *query, const Hypertable *ht);
-	void (*hypertable_scan_add_path)(PlannerInfo *root, RelOptInfo *rel, const Hypertable *ht);
+	bool (*should_deferred_chunk_scan)(const Query *query, const Hypertable *ht);
+	void (*deferred_chunk_scan_add_path)(PlannerInfo *root, RelOptInfo *rel, const Hypertable *ht);
 
 	/* gapfill */
 	PGFunction gapfill_marker;

src/guc.c

@@ -95,7 +95,7 @@ bool ts_guc_enable_parallel_chunk_append = true;
 bool ts_guc_enable_runtime_exclusion = true;
 bool ts_guc_enable_constraint_exclusion = true;
 bool ts_guc_enable_hypertable_expansion_for_dml = true;
-TSDLLEXPORT bool ts_guc_enable_hypertablescan = false;
+TSDLLEXPORT bool ts_guc_enable_deferredchunkscan = false;
 bool ts_guc_enable_qual_propagation = true;
 TSDLLEXPORT bool ts_guc_enable_columnar_scan_filter_pushdown = true;
 bool ts_guc_enable_qual_filtering = true;
@@ -213,7 +213,7 @@ DebugRequireOption ts_guc_debug_require_vector_qual = DRO_Allow;
 
 DebugRequireOption ts_guc_debug_require_vector_agg = DRO_Allow;
 
-DebugRequireOption ts_guc_debug_require_hypertable_scan = DRO_Allow;
+DebugRequireOption ts_guc_debug_require_deferred_chunk_scan = DRO_Allow;
 #endif
 
 DebugRequireOption ts_guc_debug_require_batch_sorted_merge = DRO_Allow;
@@ -781,11 +781,11 @@ _guc_init(void)
 							 NULL,
 							 NULL);
 
-	DefineCustomBoolVariable(MAKE_EXTOPTION("enable_hypertablescan"),
-							 "Enable HypertableScan for LIMIT queries",
+	DefineCustomBoolVariable(MAKE_EXTOPTION("enable_deferredchunkscan"),
+							 "Enable DeferredChunkScan for LIMIT queries",
 							 "Custom scan node for hypertables that iterates chunks at"
 							 "execution instead of expanding every chunk at plan time.",
-							 &ts_guc_enable_hypertablescan,
+							 &ts_guc_enable_deferredchunkscan,
 							 false,
 							 PGC_USERSET,
 							 0,
@@ -1726,14 +1726,14 @@ _guc_init(void)
 							 /* assign_hook= */ NULL,
 							 /* show_hook= */ NULL);
 
-	DefineCustomEnumVariable(/* name= */ MAKE_EXTOPTION("debug_require_hypertable_scan"),
+	DefineCustomEnumVariable(/* name= */ MAKE_EXTOPTION("debug_require_deferred_chunk_scan"),
 							 /* short_desc= */
-							 "ensure that HypertableScan is used or not",
+							 "ensure that DeferredChunkScan is used or not",
 							 /* long_desc= */
 							 "this is for debugging purposes, to check whether a query uses the "
-							 "HypertableScan node without depending on version-specific EXPLAIN "
+							 "DeferredChunkScan node without depending on version-specific EXPLAIN "
 							 "output",
-							 /* valueAddr= */ (int *) &ts_guc_debug_require_hypertable_scan,
+							 /* valueAddr= */ (int *) &ts_guc_debug_require_deferred_chunk_scan,
 							 /* bootValue= */ DRO_Allow,
 							 /* options = */ debug_require_options,
 							 /* context= */ PGC_USERSET,

src/guc.h

@@ -28,7 +28,7 @@ extern bool ts_guc_enable_qual_filtering;
 extern bool ts_guc_enable_runtime_exclusion;
 extern bool ts_guc_enable_constraint_exclusion;
 extern bool ts_guc_enable_hypertable_expansion_for_dml;
-extern TSDLLEXPORT bool ts_guc_enable_hypertablescan;
+extern TSDLLEXPORT bool ts_guc_enable_deferredchunkscan;
 extern bool ts_guc_enable_cagg_reorder_groupby;
 extern TSDLLEXPORT bool ts_guc_enable_cagg_window_functions;
 extern TSDLLEXPORT bool ts_guc_skip_cagg_invalidation;
@@ -151,7 +151,7 @@ extern TSDLLEXPORT DebugRequireOption ts_guc_debug_require_vector_qual;
 
 extern TSDLLEXPORT DebugRequireOption ts_guc_debug_require_vector_agg;
 
-extern TSDLLEXPORT DebugRequireOption ts_guc_debug_require_hypertable_scan;
+extern TSDLLEXPORT DebugRequireOption ts_guc_debug_require_deferred_chunk_scan;
 
 #endif
 

src/planner/planner.c

@@ -1497,11 +1497,11 @@ timescaledb_set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, Index rti, Rang
 	reltype = ts_classify_relation(root, rel, &ht);
 
 	/*
-	 * Attach HypertableScan path for the (unexpanded) hypertable.
+	 * Attach DeferredChunkScan path for the (unexpanded) hypertable.
 	 */
-	if (reltype == TS_REL_HYPERTABLE && ht && ts_get_private_reloptinfo(rel)->hypertable_scan)
+	if (reltype == TS_REL_HYPERTABLE && ht && ts_get_private_reloptinfo(rel)->deferred_chunk_scan)
 	{
-		ts_cm_functions->hypertable_scan_add_path(root, rel, ht);
+		ts_cm_functions->deferred_chunk_scan_add_path(root, rel, ht);
 		if (prev_set_rel_pathlist_hook != NULL)
 		{
 			(*prev_set_rel_pathlist_hook)(root, rel, rti, rte);
@@ -1635,7 +1635,7 @@ timescaledb_get_relation_info(PlannerInfo *root, RelOptInfo *rel, bool inhparent
 			 * including the target relation. The support for expanding target
 			 * relation of MERGE is not implemented at the moment.
 			 *
-			 * For HypertableScan we don't expand during planning.
+			 * For DeferredChunkScan we don't expand during planning.
 			 *
 			 * The hypertables that are not expanded by our custom code here
 			 * fall back to the standard Postgres inheritance hierarchy
@@ -1644,9 +1644,9 @@ timescaledb_get_relation_info(PlannerInfo *root, RelOptInfo *rel, bool inhparent
 			 * `inhparent` goes to false in two cases: a hypertable without
 			 * chunks or a SELECT FROM ONLY hypertable.
 			 */
-			bool use_hypertable_scan = inhparent && ts_cm_functions->should_hypertable_scan &&
-									   ts_cm_functions->should_hypertable_scan(query, ht);
-			if (use_hypertable_scan)
+			bool use_deferred_chunk_scan = inhparent && ts_cm_functions->should_deferred_chunk_scan &&
+									   ts_cm_functions->should_deferred_chunk_scan(query, ht);
+			if (use_deferred_chunk_scan)
 			{
 				rte->inh = false;
 			}
@@ -1663,7 +1663,7 @@ timescaledb_get_relation_info(PlannerInfo *root, RelOptInfo *rel, bool inhparent
 				}
 			}
 
-			ts_create_private_reloptinfo(rel)->hypertable_scan = use_hypertable_scan;
+			ts_create_private_reloptinfo(rel)->deferred_chunk_scan = use_deferred_chunk_scan;
 
 			if (ts_guc_enable_optimizations)
 			{

src/planner/planner.h

@@ -45,8 +45,8 @@ typedef struct TimescaleDBPrivate
 	List *transformed_sort_pathkeys;
 	bool transformed_sort_pathkeys_valid;
 
-	/* Use HypertableScan for this relation */
-	bool hypertable_scan;
+	/* Use DeferredChunkScan for this relation */
+	bool deferred_chunk_scan;
 } TimescaleDBPrivate;
 
 extern TSDLLEXPORT bool ts_rte_is_hypertable(const RangeTblEntry *rte);

tsl/src/init.c

@@ -43,7 +43,7 @@
 #include "nodes/columnar_index_scan/columnar_index_scan.h"
 #include "nodes/columnar_scan/planner.h"
 #include "nodes/gapfill/gapfill_functions.h"
-#include "nodes/hypertable_scan/hypertable_scan.h"
+#include "nodes/deferred_chunk_scan/deferred_chunk_scan.h"
 #include "nodes/skip_scan/skip_scan.h"
 #include "nodes/vector_agg/plan.h"
 #include "planner.h"
@@ -71,8 +71,8 @@ CrossModuleFunctions tsl_cm_functions = {
 	.create_upper_paths_hook = tsl_create_upper_paths_hook,
 	.set_rel_pathlist_dml = tsl_set_rel_pathlist_dml,
 	.set_rel_pathlist_query = tsl_set_rel_pathlist_query,
-	.should_hypertable_scan = ts_should_hypertable_scan,
-	.hypertable_scan_add_path = ts_hypertable_scan_add_path,
+	.should_deferred_chunk_scan = ts_should_deferred_chunk_scan,
+	.deferred_chunk_scan_add_path = ts_deferred_chunk_scan_add_path,
 
 	/* bgw policies */
 	.policy_compression_add = policy_compression_add,
@@ -221,7 +221,7 @@ ts_module_init(PG_FUNCTION_ARGS)
 	_continuous_aggs_cache_inval_init();
 	_columnar_index_scan_init();
 	_columnar_scan_init();
-	_hypertable_scan_init();
+	_deferred_chunk_scan_init();
 	_skip_scan_init();
 	_vector_agg_init();
 

tsl/src/nodes/CMakeLists.txt

@@ -3,6 +3,6 @@ target_sources(${TSL_LIBRARY_NAME} PRIVATE ${SOURCES})
 add_subdirectory(columnar_index_scan)
 add_subdirectory(columnar_scan)
 add_subdirectory(gapfill)
-add_subdirectory(hypertable_scan)
+add_subdirectory(deferred_chunk_scan)
 add_subdirectory(skip_scan)
 add_subdirectory(vector_agg)

tsl/src/nodes/deferred_chunk_scan/CMakeLists.txt

@@ -0,0 +1,2 @@
+set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/deferred_chunk_scan.c)
+target_sources(${TSL_LIBRARY_NAME} PRIVATE ${SOURCES})