cleanup

timescale · Dec 5, 2024 · d18bef0 · d18bef0
1 parent 6194250
commit d18bef0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 36 deletions.
diff --git a/src/import/planner.c b/src/import/planner.c
@@ -387,10 +387,6 @@ ts_make_sort(Plan *lefttree, int numCols, AttrNumber *sortColIdx, Oid *sortOpera
 	node->collations = collations;
 	node->nullsFirst = nullsFirst;
 
-//	fprintf(stderr, "ts make sort\n");
-//	mybt();
-//	my_print(node);
-
 	return node;
 }
 

diff --git a/src/nodes/chunk_append/planner.c b/src/nodes/chunk_append/planner.c
@@ -84,12 +84,6 @@ adjust_childscan(PlannerInfo *root, Plan *plan, Path *path, List *pathkeys, List
 										 &collations,
 										 &nullsFirst);
 
-	fprintf(stderr, "required pathkeys:\n");
-	my_print(pathkeys);
-
-	fprintf(stderr, "child scan pathkeys:\n");
-	my_print(path->pathkeys);
-
 	/* inject sort node if child sort order does not match desired order */
 	if (!pathkeys_contained_in(pathkeys, path->pathkeys))
 	{
@@ -333,10 +327,6 @@ make_sort(Plan *lefttree, int numCols, AttrNumber *sortColIdx, Oid *sortOperator
 	node->collations = collations;
 	node->nullsFirst = nullsFirst;
 
-	fprintf(stderr, "make sort chunk append\n");
-	mybt();
-	my_print(node);
-
 	return node;
 }
 

diff --git a/src/planner/planner.c b/src/planner/planner.c
@@ -276,6 +276,9 @@ ts_rte_is_hypertable(const RangeTblEntry *rte)
 	return ht != NULL;
 }
 
+#define IS_UPDL_CMD(parse)                                                                         \
+	((parse)->commandType == CMD_UPDATE || (parse)->commandType == CMD_DELETE)
+
 typedef struct
 {
 	Query *rootquery;

diff --git a/src/planner/planner.h b/src/planner/planner.h
@@ -24,9 +24,6 @@
  */
 #define PLANNER_LOCATION_MAGIC -29811
 
-#define IS_UPDL_CMD(parse)                                                                         \
-	((parse)->commandType == CMD_UPDATE || (parse)->commandType == CMD_DELETE)
-
 typedef struct Chunk Chunk;
 typedef struct Hypertable Hypertable;
 typedef struct TimescaleDBPrivate

diff --git a/tsl/src/nodes/decompress_chunk/decompress_chunk.c b/tsl/src/nodes/decompress_chunk/decompress_chunk.c
@@ -746,8 +746,8 @@ can_batch_sorted_merge(PlannerInfo *root, CompressionInfo *info, const Chunk *ch
  * To save planning time, we therefore refrain from adding them.
  */
 static Path *
-make_chunk_sorted_path(PlannerInfo *root, RelOptInfo *chunk_rel, const Hypertable *ht, Index ht_relid,
-					   Path *path, Path *compressed_path)
+make_chunk_sorted_path(PlannerInfo *root, RelOptInfo *chunk_rel, const Hypertable *ht,
+					   Index ht_relid, Path *path, Path *compressed_path)
 {
 	if (root->query_pathkeys == NIL)
 	{
@@ -895,9 +895,11 @@ ts_decompress_chunk_generate_paths(PlannerInfo *root, RelOptInfo *chunk_rel, con
 	chunk_rel->rows = new_row_estimate;
 
 	create_compressed_scan_paths(root, compressed_rel, compression_info, &sort_info);
-	fprintf(stderr, "sortinfo: seqnum %d, pushdown %d, reverse %d, compressed pks:\n",
-		sort_info.needs_sequence_num, sort_info.can_pushdown_sort,
-		sort_info.reverse);
+	fprintf(stderr,
+			"sortinfo: seqnum %d, pushdown %d, reverse %d, compressed pks:\n",
+			sort_info.needs_sequence_num,
+			sort_info.can_pushdown_sort,
+			sort_info.reverse);
 	my_print(sort_info.required_compressed_pathkeys);
 
 	/* compute parent relids of the chunk and use it to filter paths*/
@@ -1154,21 +1156,23 @@ ts_decompress_chunk_generate_paths(PlannerInfo *root, RelOptInfo *chunk_rel, con
 				 */
 				if (path->pathkeys == NIL)
 				{
-				path = (Path *) create_append_path(root,
-												   chunk_rel,
-												   list_make2(path, uncompressed_path),
-												   NIL /* partial paths */,
-												   NIL, // path->pathkeys,
-												   req_outer,
-												   0,
-												   false,
-												   path->rows + uncompressed_path->rows);
+					path = (Path *) create_append_path(root,
+													   chunk_rel,
+													   list_make2(path, uncompressed_path),
+													   NIL /* partial paths */,
+													   NIL, // path->pathkeys,
+													   req_outer,
+													   0,
+													   false,
+													   path->rows + uncompressed_path->rows);
 				}
 				else
 				{
-					path = (Path *) create_merge_append_path(root, chunk_rel,
-						list_make2(path, uncompressed_path), path->pathkeys,
-						req_outer);
+					path = (Path *) create_merge_append_path(root,
+															 chunk_rel,
+															 list_make2(path, uncompressed_path),
+															 path->pathkeys,
+															 req_outer);
 				}
 				add_path(chunk_rel, path);
 			}
@@ -1262,8 +1266,8 @@ ts_decompress_chunk_generate_paths(PlannerInfo *root, RelOptInfo *chunk_rel, con
 
 			add_partial_path(chunk_rel, path);
 		}
-		/* the chunk_rel now owns the paths, remove them from the compressed_rel so they can't be
-		 * freed if it's planned */
+		/* the chunk_rel now owns the paths, remove them from the compressed_rel so they can't
+		 * be freed if it's planned */
 		compressed_rel->partial_pathlist = NIL;
 	}
 	/* Remove the compressed_rel from the simple_rel_array to prevent it from