recompress_chunk_segmentwise_impl

Author: svenklemm

tsl/src/compression/api.c

@@ -892,25 +892,25 @@ tsl_create_compressed_chunk(PG_FUNCTION_ARGS)
 Datum
 tsl_compress_chunk(PG_FUNCTION_ARGS)
 {
-	Oid uncompressed_chunk_id = PG_ARGISNULL(0) ? InvalidOid : PG_GETARG_OID(0);
+	Oid uncompressed_relid = PG_ARGISNULL(0) ? InvalidOid : PG_GETARG_OID(0);
 	bool if_not_compressed = PG_ARGISNULL(1) ? true : PG_GETARG_BOOL(1);
 	bool recompress = PG_ARGISNULL(2) ? false : PG_GETARG_BOOL(2);
 
 	ts_feature_flag_check(FEATURE_HYPERTABLE_COMPRESSION);
 
 	TS_PREVENT_FUNC_IF_READ_ONLY();
-	Chunk *chunk = ts_chunk_get_by_relid(uncompressed_chunk_id, true);
+	Chunk *chunk = ts_chunk_get_by_relid(uncompressed_relid, true);
 	ts_hypertable_permissions_check(chunk->hypertable_relid, GetUserId());
 
-	uncompressed_chunk_id = tsl_compress_chunk_wrapper(chunk, if_not_compressed, recompress);
+	uncompressed_relid = tsl_compress_chunk_wrapper(chunk, if_not_compressed, recompress);
 
-	PG_RETURN_OID(uncompressed_chunk_id);
+	PG_RETURN_OID(uncompressed_relid);
 }
 
 Oid
 tsl_compress_chunk_wrapper(Chunk *chunk, bool if_not_compressed, bool recompress)
 {
-	Oid uncompressed_chunk_id = chunk->table_id;
+	Oid uncompressed_relid = chunk->table_id;
 
 	if (ts_chunk_is_frozen(chunk))
 	{
@@ -920,14 +920,14 @@ tsl_compress_chunk_wrapper(Chunk *chunk, bool if_not_compressed, bool recompress
 						NameStr(chunk->fd.schema_name),
 						NameStr(chunk->fd.table_name)),
 				 errhint("Use _timescaledb_functions.unfreeze_chunk to unfreeze.")));
-		return uncompressed_chunk_id;
+		return uncompressed_relid;
 	}
 
 	write_logical_replication_msg_compression_start();
 
 	if (ts_chunk_needs_compression(chunk))
 	{
-		uncompressed_chunk_id = compress_chunk_impl(chunk->hypertable_relid, chunk->table_id);
+		uncompressed_relid = compress_chunk_impl(chunk->hypertable_relid, chunk->table_id);
 	}
 	else if (recompress || ts_chunk_needs_recompression(chunk))
 	{
@@ -954,21 +954,21 @@ tsl_compress_chunk_wrapper(Chunk *chunk, bool if_not_compressed, bool recompress
 	}
 
 	write_logical_replication_msg_compression_end();
-	return uncompressed_chunk_id;
+	return uncompressed_relid;
 }
 
 Datum
 tsl_decompress_chunk(PG_FUNCTION_ARGS)
 {
-	Oid uncompressed_chunk_id = PG_ARGISNULL(0) ? InvalidOid : PG_GETARG_OID(0);
+	Oid uncompressed_relid = PG_ARGISNULL(0) ? InvalidOid : PG_GETARG_OID(0);
 	bool if_compressed = PG_ARGISNULL(1) ? true : PG_GETARG_BOOL(1);
 	int32 chunk_id;
 
 	ts_feature_flag_check(FEATURE_HYPERTABLE_COMPRESSION);
 
 	TS_PREVENT_FUNC_IF_READ_ONLY();
 
-	Chunk *uncompressed_chunk = ts_chunk_get_by_relid(uncompressed_chunk_id, true);
+	Chunk *uncompressed_chunk = ts_chunk_get_by_relid(uncompressed_relid, true);
 	chunk_id = uncompressed_chunk->fd.id;
 
 	Hypertable *ht = ts_hypertable_get_by_id(uncompressed_chunk->fd.hypertable_id);
@@ -986,7 +986,7 @@ tsl_decompress_chunk(PG_FUNCTION_ARGS)
 		ereport((if_compressed ? NOTICE : ERROR),
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("chunk \"%s\" is not converted to columnstore",
-						get_rel_name(uncompressed_chunk_id))));
+						get_rel_name(uncompressed_relid))));
 
 		PG_RETURN_NULL();
 	}
@@ -1001,7 +1001,7 @@ tsl_decompress_chunk(PG_FUNCTION_ARGS)
 	 */
 	ts_chunk_column_stats_reset_by_chunk_id(chunk_id);
 
-	PG_RETURN_OID(uncompressed_chunk_id);
+	PG_RETURN_OID(uncompressed_relid);
 }
 
 static bool
@@ -1079,9 +1079,9 @@ extern Datum
 tsl_get_compressed_chunk_index_for_recompression(PG_FUNCTION_ARGS)
 {
 	ts_feature_flag_check(FEATURE_HYPERTABLE_COMPRESSION);
-	Oid uncompressed_chunk_id = PG_ARGISNULL(0) ? InvalidOid : PG_GETARG_OID(0);
+	Oid uncompressed_relid = PG_ARGISNULL(0) ? InvalidOid : PG_GETARG_OID(0);
 
-	Chunk *uncompressed_chunk = ts_chunk_get_by_relid(uncompressed_chunk_id, true);
+	Chunk *uncompressed_chunk = ts_chunk_get_by_relid(uncompressed_relid, true);
 
 	Oid index_oid = get_compressed_chunk_index_for_recompression(uncompressed_chunk);
 

tsl/src/compression/recompress.c

@@ -126,7 +126,7 @@ tsl_recompress_chunk_segmentwise(PG_FUNCTION_ARGS)
 				 NameStr(chunk->fd.schema_name),
 				 NameStr(chunk->fd.table_name));
 		}
-		uncompressed_relid = recompress_chunk_segmentwise_impl(chunk, nullable_orderby);
+		recompress_chunk_segmentwise_impl(chunk, nullable_orderby);
 	}
 
 	PG_RETURN_OID(uncompressed_relid);
@@ -235,7 +235,7 @@ free_chunk_recompress_ctx(RecompressContext *recompress_ctx)
 	pfree(recompress_ctx);
 }
 
-Oid
+void
 recompress_chunk_segmentwise_impl(Chunk *uncompressed_chunk,
 								  bool fullrecompress /* do full decompress/compress segmentwise */)
 {
@@ -307,7 +307,7 @@ recompress_chunk_segmentwise_impl(Chunk *uncompressed_chunk,
 			table_close(uncompressed_chunk_rel, NoLock);
 			table_close(compressed_chunk_rel, NoLock);
 
-			PG_RETURN_OID(uncompressed_relid);
+			return;
 		}
 	}
 
@@ -739,8 +739,6 @@ recompress_chunk_segmentwise_impl(Chunk *uncompressed_chunk,
 
 	table_close(uncompressed_chunk_rel, NoLock);
 	table_close(compressed_chunk_rel, NoLock);
-
-	PG_RETURN_OID(uncompressed_relid);
 }
 
 /*

tsl/src/compression/recompress.h

@@ -30,7 +30,7 @@ typedef struct RecompressContext
 
 extern Datum tsl_recompress_chunk_segmentwise(PG_FUNCTION_ARGS);
 
-Oid recompress_chunk_segmentwise_impl(Chunk *chunk, bool fullrecompress);
+void recompress_chunk_segmentwise_impl(Chunk *chunk, bool fullrecompress);
 bool recompress_chunk_in_memory_impl(Chunk *uncompressed_chunk);
 
 /* Result of matching an uncompressed tuple against a compressed batch */