ts_chunk_is_compressed

Author: svenklemm

tsl/src/chunk_merge.c

@@ -1355,7 +1355,7 @@ chunk_merge_chunks(PG_FUNCTION_ARGS)
 		 * Fill in the compressed mergerelinfo array here after final sort of
 		 * rels so that the two arrays have the same order.
 		 */
-		if (chunk->fd.compressed_chunk_id != INVALID_CHUNK_ID)
+		if (ts_chunk_is_compressed(chunk))
 		{
 			RelationMergeInfo *crelinfo = &crelinfos[i];
 			Chunk *cchunk = ts_chunk_get_by_id(chunk->fd.compressed_chunk_id, true);
@@ -1395,7 +1395,7 @@ chunk_merge_chunks(PG_FUNCTION_ARGS)
 		const CompressionSettings *result_settings = NULL;
 		const Chunk *result_chunk = relinfos[mergeindex].chunk;
 
-		if (result_chunk->fd.compressed_chunk_id != INVALID_CHUNK_ID)
+		if (ts_chunk_is_compressed(result_chunk))
 		{
 			result_settings = ts_compression_settings_get(result_chunk->table_id);
 		}
@@ -1405,7 +1405,7 @@ chunk_merge_chunks(PG_FUNCTION_ARGS)
 			const Chunk *chunk = relinfos[i].chunk;
 			const CompressionSettings *settings;
 
-			if (i == mergeindex || chunk->fd.compressed_chunk_id == INVALID_CHUNK_ID)
+			if (i == mergeindex || !ts_chunk_is_compressed(chunk))
 			{
 				continue;
 			}

tsl/src/compression/api.c

@@ -314,7 +314,7 @@ find_chunk_to_merge_into(Hypertable *ht, Chunk *current_chunk)
 	/* If there is no previous adjacent chunk along the time dimension or
 	 * if it hasn't been compressed yet, we can't merge.
 	 */
-	if (!previous_chunk || !OidIsValid(previous_chunk->fd.compressed_chunk_id))
+	if (!previous_chunk || !ts_chunk_is_compressed(previous_chunk))
 	{
 		return NULL;
 	}
@@ -633,7 +633,7 @@ decompress_chunk_impl(Chunk *uncompressed_chunk, bool if_compressed)
 		elog(ERROR, "hypertable and chunk do not match");
 	}
 
-	if (uncompressed_chunk->fd.compressed_chunk_id == INVALID_CHUNK_ID)
+	if (!ts_chunk_is_compressed(uncompressed_chunk))
 	{
 		ts_cache_release(&hcache);
 		ereport((if_compressed ? NOTICE : ERROR),
@@ -1098,9 +1098,9 @@ tsl_get_compressed_chunk_index_for_recompression(PG_FUNCTION_ARGS)
 static Oid
 get_compressed_chunk_index_for_recompression(Chunk *uncompressed_chunk)
 {
-	Chunk *compressed_chunk = ts_chunk_get_by_id(uncompressed_chunk->fd.compressed_chunk_id, true);
+	Oid compressed_relid = ts_relation_get_compressed_relid(uncompressed_chunk->table_id);
 	Relation uncompressed_chunk_rel = table_open(uncompressed_chunk->table_id, AccessShareLock);
-	Relation compressed_chunk_rel = table_open(compressed_chunk->table_id, AccessShareLock);
+	Relation compressed_chunk_rel = table_open(compressed_relid, AccessShareLock);
 
 	CompressionSettings *settings = ts_compression_settings_get(uncompressed_chunk->table_id);