0003-Add-missing-utils-acl.h-includes.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149
  1. From e68915d0aad6760c1feebb04219af9bfbccd71d7 Mon Sep 17 00:00:00 2001
  2. From: Sven Klemm <sven@timescale.com>
  3. Date: Sat, 26 Sep 2020 13:58:17 +0200
  4. Subject: [PATCH] Add missing utils/acl.h includes
  5. PG13 removed acl.h from objectaddress.h so the places that need it
  6. need to now include it explicitly if they got it indirectly this
  7. way previously.
  8. https://github.com/postgres/postgres/commit/3c173a53a8
  9. Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
  10. Fetch from: https://github.com/timescale/timescaledb/commit/be8dd086a089f7419824bbc3b77182b95d0bbba7.patch
  11. ---
  12. src/bgw/job.c | 1 +
  13. src/bgw/scheduler.c | 1 +
  14. src/chunk.c | 1 +
  15. src/chunk_adaptive.c | 1 +
  16. src/extension_utils.c | 1 +
  17. src/license_guc.c | 1 +
  18. src/process_utility.c | 1 +
  19. tsl/src/bgw_policy/continuous_aggregate_api.c | 1 +
  20. tsl/src/bgw_policy/job_api.c | 1 +
  21. tsl/src/continuous_aggs/refresh.c | 1 +
  22. 10 files changed, 10 insertions(+)
  23. diff --git a/src/bgw/job.c b/src/bgw/job.c
  24. index 313caa94..3ae8c9f7 100644
  25. --- a/src/bgw/job.c
  26. +++ b/src/bgw/job.c
  27. @@ -19,6 +19,7 @@
  28. #include <storage/proc.h>
  29. #include <storage/procarray.h>
  30. #include <storage/sinvaladt.h>
  31. +#include <utils/acl.h>
  32. #include <utils/elog.h>
  33. #include <utils/jsonb.h>
  34. diff --git a/src/bgw/scheduler.c b/src/bgw/scheduler.c
  35. index 2d024317..7a7e360c 100644
  36. --- a/src/bgw/scheduler.c
  37. +++ b/src/bgw/scheduler.c
  38. @@ -19,6 +19,7 @@
  39. #include <storage/lwlock.h>
  40. #include <storage/proc.h>
  41. #include <storage/shmem.h>
  42. +#include <utils/acl.h>
  43. #include <utils/inval.h>
  44. #include <utils/jsonb.h>
  45. #include <utils/timestamp.h>
  46. diff --git a/src/chunk.c b/src/chunk.c
  47. index c2671885..e5ffc3fa 100644
  48. --- a/src/chunk.c
  49. +++ b/src/chunk.c
  50. @@ -29,6 +29,7 @@
  51. #include <fmgr.h>
  52. #include <utils/datum.h>
  53. #include <catalog/pg_type.h>
  54. +#include <utils/acl.h>
  55. #include <utils/timestamp.h>
  56. #include <nodes/execnodes.h>
  57. #include <executor/executor.h>
  58. diff --git a/src/chunk_adaptive.c b/src/chunk_adaptive.c
  59. index 470248ed..88e2910b 100644
  60. --- a/src/chunk_adaptive.c
  61. +++ b/src/chunk_adaptive.c
  62. @@ -7,6 +7,7 @@
  63. #include <postgres.h>
  64. #include <catalog/pg_proc.h>
  65. #include <catalog/pg_type.h>
  66. +#include <utils/acl.h>
  67. #include <utils/syscache.h>
  68. #include <utils/lsyscache.h>
  69. #include <utils/guc.h>
  70. diff --git a/src/extension_utils.c b/src/extension_utils.c
  71. index 3fac177b..3d72c5f0 100644
  72. --- a/src/extension_utils.c
  73. +++ b/src/extension_utils.c
  74. @@ -18,6 +18,7 @@
  75. #include <access/relscan.h>
  76. #include <catalog/pg_extension.h>
  77. #include <catalog/pg_authid.h>
  78. +#include <utils/acl.h>
  79. #include <utils/fmgroids.h>
  80. #include <utils/builtins.h>
  81. #include <utils/rel.h>
  82. diff --git a/src/license_guc.c b/src/license_guc.c
  83. index 32629ca9..baa49be5 100644
  84. --- a/src/license_guc.c
  85. +++ b/src/license_guc.c
  86. @@ -5,6 +5,7 @@
  87. */
  88. #include <postgres.h>
  89. #include <fmgr.h>
  90. +#include <utils/acl.h>
  91. #include <utils/builtins.h>
  92. #include <utils/guc.h>
  93. #include <miscadmin.h>
  94. diff --git a/src/process_utility.c b/src/process_utility.c
  95. index 3576cb97..8f915113 100644
  96. --- a/src/process_utility.c
  97. +++ b/src/process_utility.c
  98. @@ -22,6 +22,7 @@
  99. #include <access/htup_details.h>
  100. #include <access/xact.h>
  101. #include <storage/lmgr.h>
  102. +#include <utils/acl.h>
  103. #include <utils/rel.h>
  104. #include <utils/inval.h>
  105. #include <utils/lsyscache.h>
  106. diff --git a/tsl/src/bgw_policy/continuous_aggregate_api.c b/tsl/src/bgw_policy/continuous_aggregate_api.c
  107. index 1c18d2e0..596f3bf7 100644
  108. --- a/tsl/src/bgw_policy/continuous_aggregate_api.c
  109. +++ b/tsl/src/bgw_policy/continuous_aggregate_api.c
  110. @@ -7,6 +7,7 @@
  111. #include <postgres.h>
  112. #include <miscadmin.h>
  113. #include <parser/parse_coerce.h>
  114. +#include <utils/acl.h>
  115. #include <jsonb_utils.h>
  116. #include <utils/builtins.h>
  117. diff --git a/tsl/src/bgw_policy/job_api.c b/tsl/src/bgw_policy/job_api.c
  118. index e1c24841..536ce692 100644
  119. --- a/tsl/src/bgw_policy/job_api.c
  120. +++ b/tsl/src/bgw_policy/job_api.c
  121. @@ -7,6 +7,7 @@
  122. #include <postgres.h>
  123. #include <funcapi.h>
  124. #include <miscadmin.h>
  125. +#include <utils/acl.h>
  126. #include <utils/builtins.h>
  127. #include <bgw/job.h>
  128. diff --git a/tsl/src/continuous_aggs/refresh.c b/tsl/src/continuous_aggs/refresh.c
  129. index 71d5075f..46f83127 100644
  130. --- a/tsl/src/continuous_aggs/refresh.c
  131. +++ b/tsl/src/continuous_aggs/refresh.c
  132. @@ -4,6 +4,7 @@
  133. * LICENSE-TIMESCALE for a copy of the license.
  134. */
  135. #include <postgres.h>
  136. +#include <utils/acl.h>
  137. #include <utils/lsyscache.h>
  138. #include <utils/fmgrprotos.h>
  139. #include <utils/snapmgr.h>
  140. --
  141. 2.29.2