ts_chunk_exists_with_compression

Author: svenklemm

src/chunk.c

@@ -3130,10 +3130,11 @@ ts_chunk_exists_with_compression(int32 hypertable_id)
 	init_scan_by_hypertable_id(&iterator, hypertable_id);
 	ts_scanner_foreach(&iterator)
 	{
-		bool isnull_chunk_id =
-			slot_attisnull(ts_scan_iterator_slot(&iterator), Anum_chunk_compressed_chunk_id);
+		bool status_isnull;
+		Datum status =
+			slot_getattr(ts_scan_iterator_slot(&iterator), Anum_chunk_status, &status_isnull);
 
-		if (!isnull_chunk_id)
+		if (!status_isnull && ts_flags_are_set_32(DatumGetInt32(status), CHUNK_STATUS_COMPRESSED))
 		{
 			found = true;
 			break;

tsl/src/chunk_merge.c

@@ -715,7 +715,8 @@ merge_relinfos(RelationMergeInfo *relinfos, int nrelids, int mergeindex, LOCKMOD
 	}
 
 	stats->relid = result_minfo->relid;
-	stats->chunk_id = result_minfo->chunk->fd.id;
+	/* Compressed relinfos carry no Chunk */
+	stats->chunk_id = result_minfo->chunk ? result_minfo->chunk->fd.id : INVALID_CHUNK_ID;
 
 	Oid tablespace = result_rel->rd_rel->reltablespace;
 	struct VacuumCutoffs *merged_cutoffs = &result_minfo->cutoffs;
@@ -1358,16 +1359,9 @@ chunk_merge_chunks(PG_FUNCTION_ARGS)
 		if (ts_chunk_is_compressed(chunk))
 		{
 			RelationMergeInfo *crelinfo = &crelinfos[i];
-			Chunk *cchunk = ts_chunk_get_by_id(chunk->fd.compressed_chunk_id, true);
-			/*
-			 * Allocate on merge_cxt to survive transaction end in
-			 * concurrent mode.
-			 */
-			MemoryContext old_mcxt = MemoryContextSwitchTo(merge_cxt);
-			crelinfo->chunk = ts_chunk_copy(cchunk);
-			MemoryContextSwitchTo(old_mcxt);
-
-			crelinfo->relid = crelinfo->chunk->table_id;
+			/* Merging the compressed relation only needs its relid, not a full Chunk. */
+			crelinfo->chunk = NULL;
+			crelinfo->relid = ts_relation_get_compressed_relid(chunk->table_id);
 			crelinfo->rel = table_open(crelinfo->relid, lockmode);
 			crelinfo->isresult = relinfos[i].isresult;
 			crelinfo->iscompressed_rel = true;