Merge branch 'main' into dimension-skip

akuzm · web-flow · commit f0a7650ffcf9 · 2026-05-12T17:58:52.000+02:00
diff --git a/.github/workflows/llm-fuzzer.yaml b/.github/workflows/llm-fuzzer.yaml
@@ -232,7 +232,6 @@ jobs:
         exit $rc
 
     - name: Write job summary
-      if: always()
       run: |
         jq -r 'select(.type == "result") | "## LLM Fuzzer Result\n\n"
           + (.result // "No result produced.")
@@ -255,26 +254,25 @@ jobs:
         if-no-files-found: ignore
 
     - name: Check for reproducer
-      if: always()
       id: repro
       run: test -f ~/llm-fuzzer-repro.sql && echo "found=true" >> $GITHUB_OUTPUT || true
 
     - name: Rebuild after fuzzing
-      if: always() && steps.repro.outputs.found == 'true'
+      if: steps.repro.outputs.found == 'true'
       run: |
         set -xeu
         pkill -U "$(id -u)" postgres || true
         sleep 2
 
     - name: Restore clean PostgreSQL build
-      if: always() && steps.repro.outputs.found == 'true'
+      if: steps.repro.outputs.found == 'true'
       uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
       with:
         path: ~/${{ env.PG_SRC_DIR }}
         key: ${{ steps.cache-postgresql.outputs.cache-primary-key }}
 
     - name: Reinstall PostgreSQL and TimescaleDB
-      if: always() && steps.repro.outputs.found == 'true'
+      if: steps.repro.outputs.found == 'true'
       run: |
         set -xeu
         cd ~/$PG_SRC_DIR && make install
@@ -284,10 +282,12 @@ jobs:
         make -j$(getconf _NPROCESSORS_ONLN) -C build install
 
     - name: Run the reproducer
-      if: always() && steps.repro.outputs.found == 'true'
+      if: steps.repro.outputs.found == 'true'
       run: |
         set -xeu
 
+        sudo coredumpctl rm
+
         export PATH=$HOME/$PG_INSTALL_DIR/bin:$PATH
 
         export PGDATA=verify_db
diff --git a/.unreleased/pr_9767 b/.unreleased/pr_9767
@@ -0,0 +1 @@
+Fixes: #9767 Skip dropped chunks when trying to remove ts_cagg_invalidation_trigger
diff --git a/sql/updates/2.22.1--2.23.0.sql b/sql/updates/2.22.1--2.23.0.sql
@@ -32,7 +32,7 @@ BEGIN
     EXECUTE format('DROP TRIGGER IF EXISTS ts_cagg_invalidation_trigger ON %s;', rel);
   END LOOP;
   FOR rel IN SELECT format('%I.%I', schema_name, table_name)::regclass
-    FROM _timescaledb_catalog.chunk ch
+    FROM _timescaledb_catalog.chunk ch WHERE NOT dropped
   LOOP
     EXECUTE format('DROP TRIGGER IF EXISTS ts_cagg_invalidation_trigger ON %s;', rel);
   END LOOP;
diff --git a/src/bgw/job.h b/src/bgw/job.h
@@ -102,7 +102,6 @@ extern TSDLLEXPORT void ts_bgw_job_validate_schedule_interval(Interval *schedule
 extern TSDLLEXPORT char *ts_bgw_job_validate_timezone(Datum timezone);
 
 extern TSDLLEXPORT bool ts_is_telemetry_job(BgwJob *job);
-ScanTupleResult ts_bgw_job_change_owner(TupleInfo *ti, void *data);
 
 extern TSDLLEXPORT Oid ts_bgw_job_get_funcid(BgwJob *job);
 extern TSDLLEXPORT const char *ts_bgw_job_function_call_string(BgwJob *job);
diff --git a/src/import/planner.h b/src/import/planner.h
@@ -52,8 +52,6 @@ extern TSDLLEXPORT List *ts_build_path_tlist(PlannerInfo *root, Path *path);
 
 extern TSDLLEXPORT Node *ts_replace_nestloop_params(PlannerInfo *root, Node *expr);
 
-extern void ts_ExecSetTupleBound(int64 tuples_needed, PlanState *child_node);
-
 #if PG18_GE
 /* In PG18, child ems are not added to ec_members
  * but need to be maintained in separate Lists.
diff --git a/test/expected/agg_bookends-15.out b/test/expected/agg_bookends-15.out
@@ -505,12 +505,14 @@ INSERT INTO btest_numeric VALUES('2020-01-20T09:00:43', 30.5);
 :PREFIX SELECT first(temp, time) FROM ONLY btest;
 --- QUERY PLAN ---
  Aggregate (actual rows=1.00 loops=1)
-   ->  Seq Scan on btest (actual rows=0.00 loops=1)
+   ->  Result (actual rows=0.00 loops=1)
+         One-Time Filter: false
 
 :PREFIX SELECT last(temp, time) FROM ONLY btest;
 --- QUERY PLAN ---
  Aggregate (actual rows=1.00 loops=1)
-   ->  Seq Scan on btest (actual rows=0.00 loops=1)
+   ->  Result (actual rows=0.00 loops=1)
+         One-Time Filter: false
 
 -- test constants
 :PREFIX SELECT first(100, 100) FROM btest;
diff --git a/test/expected/agg_bookends-16.out b/test/expected/agg_bookends-16.out
@@ -505,12 +505,14 @@ INSERT INTO btest_numeric VALUES('2020-01-20T09:00:43', 30.5);
 :PREFIX SELECT first(temp, time) FROM ONLY btest;
 --- QUERY PLAN ---
  Aggregate (actual rows=1.00 loops=1)
-   ->  Seq Scan on btest (actual rows=0.00 loops=1)
+   ->  Result (actual rows=0.00 loops=1)
+         One-Time Filter: false
 
 :PREFIX SELECT last(temp, time) FROM ONLY btest;
 --- QUERY PLAN ---
  Aggregate (actual rows=1.00 loops=1)
-   ->  Seq Scan on btest (actual rows=0.00 loops=1)
+   ->  Result (actual rows=0.00 loops=1)
+         One-Time Filter: false
 
 -- test constants
 :PREFIX SELECT first(100, 100) FROM btest;
diff --git a/test/expected/agg_bookends-17.out b/test/expected/agg_bookends-17.out
@@ -465,12 +465,14 @@ INSERT INTO btest_numeric VALUES('2020-01-20T09:00:43', 30.5);
 :PREFIX SELECT first(temp, time) FROM ONLY btest;
 --- QUERY PLAN ---
  Aggregate (actual rows=1.00 loops=1)
-   ->  Seq Scan on btest (actual rows=0.00 loops=1)
+   ->  Result (actual rows=0.00 loops=1)
+         One-Time Filter: false
 
 :PREFIX SELECT last(temp, time) FROM ONLY btest;
 --- QUERY PLAN ---
  Aggregate (actual rows=1.00 loops=1)
-   ->  Seq Scan on btest (actual rows=0.00 loops=1)
+   ->  Result (actual rows=0.00 loops=1)
+         One-Time Filter: false
 
 -- test constants
 :PREFIX SELECT first(100, 100) FROM btest;
diff --git a/test/expected/agg_bookends-18.out b/test/expected/agg_bookends-18.out
@@ -465,12 +465,14 @@ INSERT INTO btest_numeric VALUES('2020-01-20T09:00:43', 30.5);
 :PREFIX SELECT first(temp, time) FROM ONLY btest;
 --- QUERY PLAN ---
  Aggregate (actual rows=1.00 loops=1)
-   ->  Seq Scan on btest (actual rows=0.00 loops=1)
+   ->  Result (actual rows=0.00 loops=1)
+         One-Time Filter: false
 
 :PREFIX SELECT last(temp, time) FROM ONLY btest;
 --- QUERY PLAN ---
  Aggregate (actual rows=1.00 loops=1)
-   ->  Seq Scan on btest (actual rows=0.00 loops=1)
+   ->  Result (actual rows=0.00 loops=1)
+         One-Time Filter: false
 
 -- test constants
 :PREFIX SELECT first(100, 100) FROM btest;
diff --git a/test/sql/CMakeLists.txt b/test/sql/CMakeLists.txt
@@ -113,7 +113,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
     alter_table_memory.sql
     bgw_launcher.sql
     c_unit_tests.sql
-    cache_invalidate_uaf.sql
     copy_memory_usage.sql
     metadata.sql
     multi_transaction_index.sql
@@ -127,6 +126,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
   if(USE_TELEMETRY)
     list(APPEND TEST_FILES telemetry.sql)
   endif()
+
+  list(APPEND SOLO_TESTS cache_invalidate_uaf.sql)
 endif(CMAKE_BUILD_TYPE MATCHES Debug)
 
 if((${PG_VERSION_MAJOR} GREATER_EQUAL "17"))
diff --git a/tsl/src/CMakeLists.txt b/tsl/src/CMakeLists.txt
@@ -35,12 +35,6 @@ target_include_directories(${TSL_LIBRARY_NAME} PRIVATE ${PG_INCLUDEDIR})
 target_compile_definitions(${TSL_LIBRARY_NAME} PUBLIC TS_TSL)
 target_compile_definitions(${TSL_LIBRARY_NAME} PUBLIC TS_SUBMODULE)
 
-if(WIN32)
-  target_link_libraries(${TSL_LIBRARY_NAME} ${PG_LIBDIR}/libpq.lib)
-else()
-  target_link_libraries(${TSL_LIBRARY_NAME} pq)
-endif()
-
 install(TARGETS ${TSL_LIBRARY_NAME} DESTINATION ${PG_PKGLIBDIR})
 
 # if (WIN32) target_link_libraries(${PROJECT_NAME}
diff --git a/tsl/src/chunk_api.h b/tsl/src/chunk_api.h
@@ -9,7 +9,6 @@
 
 #include <chunk.h>
 
-extern Datum chunk_status(PG_FUNCTION_ARGS);
 extern Datum chunk_show(PG_FUNCTION_ARGS);
 extern Datum chunk_create(PG_FUNCTION_ARGS);
 extern Datum chunk_detach(PG_FUNCTION_ARGS);
diff --git a/tsl/src/compression/algorithms/array.h b/tsl/src/compression/algorithms/array.h
@@ -36,7 +36,6 @@ extern void array_compressor_append_null(ArrayCompressor *compressor);
 extern void array_compressor_append(ArrayCompressor *compressor, Datum val);
 extern void *array_compressor_finish(ArrayCompressor *compressor);
 
-extern ArrayDecompressionIterator *array_decompression_iterator_alloc(void);
 extern DecompressionIterator *
 tsl_array_decompression_iterator_from_datum_forward(Datum compressed_array, Oid element_type);
 extern DecompressResult array_decompression_iterator_try_next_forward(DecompressionIterator *iter);
diff --git a/tsl/src/compression/api.c b/tsl/src/compression/api.c
@@ -17,7 +17,6 @@
 #include <commands/event_trigger.h>
 #include <commands/tablecmds.h>
 #include <commands/trigger.h>
-#include <libpq-fe.h>
 #include <miscadmin.h>
 #include <nodes/makefuncs.h>
 #include <nodes/parsenodes.h>
diff --git a/tsl/src/nodes/vector_agg/exec.c b/tsl/src/nodes/vector_agg/exec.c
@@ -194,6 +194,8 @@ columnar_result_set_row(ColumnarResult *columnar_result, DecompressBatchState co
 			memcpy(&columnar_result->body_buffer[columnar_result->current_offset],
 				   VARDATA_ANY(datum),
 				   result_bytes);
+			/* offset_buffer should be allocated for ArrowText type */
+			Assert(columnar_result->offset_buffer != NULL);
 			columnar_result->offset_buffer[row] = columnar_result->current_offset;
 			columnar_result->current_offset += result_bytes;
 			break;
diff --git a/tsl/src/process_utility.h b/tsl/src/process_utility.h
@@ -10,5 +10,3 @@
 
 extern void tsl_process_altertable_cmd(Hypertable *ht, const AlterTableCmd *cmd);
 extern void tsl_process_rename_cmd(Oid relid, Cache *hcache, const RenameStmt *stmt);
-extern DDLResult tsl_ddl_command_start(ProcessUtilityArgs *args);
-extern void tsl_ddl_command_end(EventTriggerData *command);
diff --git a/version.config b/version.config
@@ -1,2 +1,2 @@
-version = 2.27.0-dev
+version = 2.28.0-dev
 previous_version = 2.26.4

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fixes: #9767 Skip dropped chunks when trying to remove ts_cagg_invalidation_trigger`