From 638b5af5c1d98a7918b9baf8e35a5dbcd8d2e17a Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 20 Nov 2018 11:48:24 +0100
Subject: [PATCH] postgres: Move comments around to match new upstream config
Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
roles/postgres/templates/postgresql.conf.j2 | 63 ++++++++++++++-------
1 file changed, 44 insertions(+), 19 deletions(-)
diff --git a/roles/postgres/templates/postgresql.conf.j2 b/roles/postgres/templates/postgresql.conf.j2
index 816ce9a83..c5550b65a 100644
--- a/roles/postgres/templates/postgresql.conf.j2
+++ b/roles/postgres/templates/postgresql.conf.j2
@@ -87,7 +87,6 @@ ssl_ca_file = '{{ postgres_ssl_ca_file }}'
#ssl_crl_file = ''
#password_encryption = md5 # md5 or scram-sha-256
#db_user_namespace = off
-#row_security = on
# GSSAPI using Kerberos
#krb_server_keyfile = ''
@@ -121,7 +120,6 @@ shared_buffers = {{ postgres_shared_buffers }} # min 128kB
# you actively intend to use prepared transactions.
#work_mem = 4MB # min 64kB
#maintenance_work_mem = 64MB # min 1MB
-#replacement_sort_tuples = 150000 # limits use of replacement selection sort
#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem
#max_stack_depth = 2MB # min 100kB
dynamic_shared_memory_type = posix # the default is the first option
@@ -138,11 +136,10 @@ dynamic_shared_memory_type = posix # the default is the first option
#temp_file_limit = -1 # limits per-process temp file space
# in kB, or -1 for no limit
-# - Kernel Resource Usage -
+# - Kernel Resources -
#max_files_per_process = 1000 # min 25
# (change requires restart)
-#shared_preload_libraries = '' # (change requires restart)
# - Cost-Based Vacuum Delay -
@@ -155,7 +152,7 @@ dynamic_shared_memory_type = posix # the default is the first option
# - Background Writer -
#bgwriter_delay = 200ms # 10-10000ms between rounds
-#bgwriter_lru_maxpages = 100 # 0-1000 max buffers written/round
+#bgwriter_lru_maxpages = 100 # max buffers written/round, 0 disables
#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round
#bgwriter_flush_after = 512kB # measured in pages, 0 disables
@@ -163,16 +160,18 @@ dynamic_shared_memory_type = posix # the default is the first option
#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching
#max_worker_processes = 8 # (change requires restart)
+#max_parallel_maintenance_workers = 2 # taken from max_parallel_workers
#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers
+#parallel_leader_participation = on
#max_parallel_workers = 8 # maximum number of max_worker_processes that
- # can be used in parallel queries
+ # can be used in parallel operations
#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate
# (change requires restart)
#backend_flush_after = 0 # measured in pages, 0 disables
#------------------------------------------------------------------------------
-# WRITE AHEAD LOG
+# WRITE-AHEAD LOG
#------------------------------------------------------------------------------
# - Settings -
@@ -228,13 +227,13 @@ dynamic_shared_memory_type = posix # the default is the first option
# REPLICATION
#------------------------------------------------------------------------------
-# - Sending Server(s) -
+# - Sending Servers -
# Set these on the master and on any standby that will send replication data.
#max_wal_senders = 10 # max number of walsender processes
# (change requires restart)
-#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables
+#wal_keep_segments = 0 # in logfile segments; 0 disables
#wal_sender_timeout = 60s # in milliseconds; 0 disables
#max_replication_slots = 10 # max number of replication slots
@@ -297,9 +296,14 @@ dynamic_shared_memory_type = posix # the default is the first option
#enable_material = on
#enable_mergejoin = on
#enable_nestloop = on
+#enable_parallel_append = on
#enable_seqscan = on
#enable_sort = on
#enable_tidscan = on
+#enable_partitionwise_join = off
+#enable_partitionwise_aggregate = off
+#enable_parallel_hash = on
+#enable_partition_pruning = on
# - Planner Cost Constants -
@@ -310,6 +314,16 @@ dynamic_shared_memory_type = posix # the default is the first option
#cpu_operator_cost = 0.0025 # same scale as above
#parallel_tuple_cost = 0.1 # same scale as above
#parallel_setup_cost = 1000.0 # same scale as above
+
+#jit_above_cost = 100000 # perform JIT compilation if available
+ # and query more expensive than this;
+ # -1 disables
+#jit_inline_above_cost = 500000 # inline small functions if query is
+ # more expensive than this; -1 disables
+#jit_optimize_above_cost = 500000 # use expensive JIT optimizations if
+ # query is more expensive than this;
+ # -1 disables
+
#min_parallel_table_scan_size = 8MB
#min_parallel_index_scan_size = 512kB
#effective_cache_size = 4GB
@@ -333,10 +347,11 @@ dynamic_shared_memory_type = posix # the default is the first option
#join_collapse_limit = 8 # 1 disables collapsing of explicit
# JOIN clauses
#force_parallel_mode = off
+#jit = off # allow JIT compilation
#------------------------------------------------------------------------------
-# ERROR REPORTING AND LOGGING
+# REPORTING AND LOGGING
#------------------------------------------------------------------------------
# - Where to Log -
@@ -471,8 +486,9 @@ log_line_prefix = '%d: ' # special values:
# -1 disables, 0 logs all temp files
log_timezone = 'UTC'
-
-# - Process Title -
+#------------------------------------------------------------------------------
+# PROCESS TITLE
+#------------------------------------------------------------------------------
#cluster_name = '' # added to process titles if nonempty
# (change requires restart)
@@ -480,10 +496,10 @@ log_timezone = 'UTC'
#------------------------------------------------------------------------------
-# RUNTIME STATISTICS
+# STATISTICS
#------------------------------------------------------------------------------
-# - Query/Index Statistics Collector -
+# - Query and Index Statistics Collector -
#track_activities = on
#track_counts = on
@@ -493,7 +509,7 @@ log_timezone = 'UTC'
#stats_temp_directory = 'pg_stat_tmp'
-# - Statistics Monitoring -
+# - Monitoring -
#log_parser_stats = off
#log_planner_stats = off
@@ -502,7 +518,7 @@ log_timezone = 'UTC'
#------------------------------------------------------------------------------
-# AUTOVACUUM PARAMETERS
+# AUTOVACUUM
#------------------------------------------------------------------------------
#autovacuum = on # Enable autovacuum subprocess? 'on'
@@ -540,6 +556,7 @@ log_timezone = 'UTC'
# - Statement Behavior -
#search_path = '"$user", public' # schema names
+#row_security = on
#default_tablespace = '' # a tablespace name, '' uses the default
#temp_tablespaces = '' # a list of tablespace names, '' uses
# only default tablespace
@@ -555,6 +572,9 @@ log_timezone = 'UTC'
#vacuum_freeze_table_age = 150000000
#vacuum_multixact_freeze_min_age = 5000000
#vacuum_multixact_freeze_table_age = 150000000
+#vacuum_cleanup_index_scale_factor = 0.1 # fraction of total number of tuples
+ # before index cleanup, 0 always performs
+ # index cleanup
#bytea_output = 'hex' # hex, escape
#xmlbinary = 'base64'
#xmloption = 'content'
@@ -587,11 +607,16 @@ lc_time = 'en_US.utf-8' # locale for time formatting
# default configuration for text search
default_text_search_config = 'pg_catalog.english'
-# - Other Defaults -
+# - Shared Library Preloading -
-#dynamic_library_path = '$libdir'
+#shared_preload_libraries = '' # (change requires restart)
#local_preload_libraries = ''
#session_preload_libraries = ''
+#jit_provider = 'llvmjit' # JIT library to use
+
+# - Other Defaults -
+
+#dynamic_library_path = '$libdir'
#------------------------------------------------------------------------------
@@ -610,7 +635,7 @@ default_text_search_config = 'pg_catalog.english'
#------------------------------------------------------------------------------
-# VERSION/PLATFORM COMPATIBILITY
+# VERSION AND PLATFORM COMPATIBILITY
#------------------------------------------------------------------------------
# - Previous PostgreSQL Versions -
--
GitLab