modify code to account for OSM chunks having valid ranges

in the catalog
timescale · Sep 19, 2023 · bc3a6e1 · bc3a6e1
1 parent 45edc0e
commit bc3a6e1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 362 deletions.
diff --git a/src/chunk.c b/src/chunk.c
@@ -3960,6 +3960,7 @@ ts_chunk_do_drop_chunks(Hypertable *ht, int64 older_than, int64 newer_than, int3
 
 	DEBUG_WAITPOINT("drop_chunks_chunks_found");
 
+	int32 osm_chunk_id = ts_chunk_get_osm_chunk_id(ht->fd.id);
 	if (has_continuous_aggs)
 	{
 		/* Exclusively lock all chunks, and invalidate the continuous
@@ -3989,6 +3990,11 @@ ts_chunk_do_drop_chunks(Hypertable *ht, int64 older_than, int64 newer_than, int3
 		 * therefore be able to refresh accordingly.*/
 		for (uint64 i = 0; i < num_chunks; i++)
 		{
+			if (osm_chunk_id == chunks[i].fd.id)
+			{
+				// we do not rebuild continuous aggs if tiered data is dropped */
+				continue;
+			}
 			int64 start = ts_chunk_primary_dimension_start(&chunks[i]);
 			int64 end = ts_chunk_primary_dimension_end(&chunks[i]);
 
@@ -4008,8 +4014,11 @@ ts_chunk_do_drop_chunks(Hypertable *ht, int64 older_than, int64 newer_than, int3
 		/* frozen chunks are skipped. Not dropped. */
 		if (!ts_chunk_validate_chunk_status_for_operation(&chunks[i],
 														  CHUNK_DROP,
-														  false /*throw_error */))
+														  false /*throw_error */) ||
+			osm_chunk_id == chunks[i].fd.id)
+		{
 			continue;
+		}
 
 		/* store chunk name for output */
 		schema_name = quote_identifier(chunks[i].fd.schema_name.data);
@@ -4032,7 +4041,6 @@ ts_chunk_do_drop_chunks(Hypertable *ht, int64 older_than, int64 newer_than, int3
 	}
 	// if we have tiered chunks cascade drop to tiering layer as well
 #if PG14_GE
-	int32 osm_chunk_id = ts_chunk_get_osm_chunk_id(ht->fd.id);
 
 	if (osm_chunk_id != INVALID_CHUNK_ID)
 	{