Folks,
Attached are 2 patches:
postgresql.conf.patch re-orders postgresql.conf.sample according to the order
patched into runtime.sgml last week.
initdb.patch, written by Shridhar, patches initdb so that the LC_*
localization variables are inserted into postgresql.conf at the point
commented "#LC VARS GO HERE!"
As I'm not great a patch-making, I've also attached the completed
postgresql.conf.sample for reference.
--
-Josh Berkus
Aglio Database Solutions
San Francisco
589,591c589,595
< cat "$POSTGRESQL_CONF_SAMPLE"|sed s/'#LC VARIABLES GO HERE!'/'\n#\n#\n# Locale settings\n#\n# (initialized by initdb -- may be changed)\n#\n#marker'/ >tmpfile;
<
<
---
> cat "$POSTGRESQL_CONF_SAMPLE"
> echo
> echo
> echo "#"
> echo "# Locale settings"
> echo "#"
> echo "# (initialized by initdb -- may be changed)"
593,596c597
< var="LC_$cat='`pg_getlocale $cat`'"
< var1="$var\n#marker";
< cat tmpfile |sed s/'#marker'/"$var1"/ > tmp1;
< mv -f tmp1 tmpfile;
---
> echo "LC_$cat = '`pg_getlocale $cat`'"
598,602c599
< cat tmpfile | sed s/'#marker'/' '/ > tmp1;
< mv -f tmp1 tmpfile;
< mv -f tmpfile "$PGDATA"/postgresql.conf
< ) || exit_nicely
<
---
> ) > "$PGDATA"/postgresql.conf || exit_nicely
#
# PostgreSQL configuration file
# -----------------------------
#
# This file consists of lines of the form:
#
# name = value
#
# (The '=' is optional.) White space may be used. Comments are introduced
# with '#' anywhere on a line. The complete list of option names and
# allowed values can be found in the PostgreSQL documentation. The
# commented-out settings shown in this file represent the default values.
#
# Any option can also be given as a command line switch to the
# postmaster, e.g. 'postmaster -c log_connections=on'. Some options
# can be changed at run-time with the 'SET' SQL command.
#
# This file is read on postmaster startup and when the postmaster
# receives a SIGHUP. If you edit the file on a running system, you have
# to SIGHUP the postmaster for the changes to take effect, or use
# "pg_ctl reload".
#========================================================================
#
# Connection Parameters
#
#CONNECTIONS AND AUTHENTICATION
#----------------------------------
#Connection Settings
#tcpip_socket = false
#max_connections = 32
# note: increasing max_connections also costs about 500 bytes each,
# in addition to costs from shared_buffers and max_locks_per_transaction.
#superuser_reserved_connections = 2
#port = 5432
#unix_socket_directory = ''
#unix_socket_group = ''
#unix_socket_permissions = 0777 # octal
#Security & Authentication
#authentication_timeout = 60 # 1-600, in seconds
#ssl = false
#krb_server_keyfile = ''
#virtual_host = ''
#db_user_namespace = false
#RESOURCE USAGE (except WAL)
#---------------------------------
#Memory
#shared_buffers = 64 # min 16, at least max_connections*2, 8KB each
#sort_mem = 1024 # min 64, size in KB
#vacuum_mem = 8192 # min 1024, size in KB
#Free Space Map
#max_fsm_pages = 20000 # min max_fsm_relations*16, 6 bytes each
#max_fsm_relations = 1000 # min 100, ~50 bytes each
#Disk Resource Usage
#max_files_per_process = 1000 # min 25
#preload_libraries = ''
#WRITE AHEAD LOG
#---------------------------------
#Settings
#fsync = true # turns WAL on or off
#wal_sync_method = fsync # the default varies across platforms:
# # fsync, fdatasync, open_sync, or open_datasync
#wal_buffers = 8 # min 4, 8KB each
#Checkpointing
#checkpoint_segments = 3 # in logfile segments, min 1, 16MB each
#checkpoint_timeout = 300 # range 30-3600, in seconds
#checkpoint_warning = 30 # 0 is off, in seconds
#commit_delay = 0 # range 0-100000, in microseconds
#commit_siblings = 5 # range 1-1000
#QUERY TUNING
#--------------------------------
#Planner Options
#enable_hashjoin = true
#enable_hashagg = true
#enable_indexscan = true
#enable_mergejoin = true
#enable_nestloop = true
#enable_seqscan = true
#enable_sort = true
#enable_tidscan = true
#Planner Cost Constants
#effective_cache_size = 1000 # typically 8KB each
#random_page_cost = 4 # units are one sequential page fetch cost
#cpu_tuple_cost = 0.01 # (same)
#cpu_index_tuple_cost = 0.001 # (same)
#cpu_operator_cost = 0.0025 # (same)
#Genetic Estimate Query Optimizer
#geqo = true
#geqo_threshold = 11
#geqo_effort = 1
#geqo_generations = 0
#geqo_pool_size = 0 # default based on tables in statement,
# range 128-1024
#geqo_random_seed = -1 # auto-compute seed
#geqo_selection_bias = 2.0 # range 1.5-2.0
#Query/Index Statistics Collector
#stats_start_collector = true
#stats_command_string = false
#stats_row_level = false
#stats_block_level = false
#stats_reset_on_server_start = true
#default_statistics_target = 10 # range 1-1000
#Other Query Options
#explain_pretty_print = true
#from_collapse_limit = 8
#join_collapse_limit = 8 # 1 disables collapsing of explicit JOINs
#max_expr_depth = 10000 # min 10
#LOGGING AND DEBUGGING
#------------------------------------
#Syslog
#syslog = 0 # range 0-2
#syslog_facility = 'LOCAL0'
#syslog_ident = 'postgres'
#When to Log
#log_min_messages = notice # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, log, fatal,
# panic
#client_min_messages = notice # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# log, info, notice, warning, error
#log_min_error_statement = panic # Values in order of increasing severity:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, panic(off)
#log_min_duration_statement = 0 # Log all statements whose
# execution time exceeds the value, in
# milliseconds. Zero disables.
#silent_mode = false #DO NOT USE without Syslog!
#What to Log
#debug_print_parse = false
#debug_print_rewritten = false
#debug_print_plan = false
#debug_pretty_print = false
#log_connections = false
#log_duration = false
#log_pid = false
#log_statement = false
#log_timestamp = false
#log_hostname = false
#log_source_port = false
#Statistics Logging
#log_parser_stats = false
#log_planner_stats = false
#log_executor_stats = false
#log_statement_stats = false
#CLIENT CONNECTION DEFAULTS
#-------------------------------------
#Statement Behavior
#search_path = '$user,public' # schema names
#default_transaction_isolation = 'read committed'
#default_transaction_read_only = false
#statement_timeout = 0 # 0 is disabled, in milliseconds
#Locale and Formatting
#datestyle = 'iso, us'
#timezone = unknown # actually, defaults to TZ environment setting
#australian_timezones = false
#LC VARIABLES GO HERE!
#extra_float_digits = 0 # min -15, max 2
#client_encoding = sql_ascii # actually, defaults to database encoding
#Other Defaults
#password_encryption = true
#dynamic_library_path = '$libdir'
#LOCK MANAGEMENT
#-----------------------------------------
#deadlock_timeout = 1000 # in milliseconds
#max_locks_per_transaction = 64 # min 10, ~260*max_connections bytes each
#VERSION/PLATFORM COMPATIBILITY
#-----------------------------------------
#Previous Postgres Versions
#add_missing_from = true
#regex_flavor = advanced # advanced, extended, or basic
#sql_inheritance = true
#Compatibility with Platforms & Clients
#transform_null_equals = false
? postgresql.conf.patch
Index: postgresql.conf.sample
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v
retrieving revision 1.81
diff -c -r1.81 postgresql.conf.sample
*** postgresql.conf.sample 11 Jun 2003 22:13:22 -0000 1.81
--- postgresql.conf.sample 26 Jun 2003 18:45:56 -0000
***************
*** 27,124 ****
#
# Connection Parameters
#
- #tcpip_socket = false
- #ssl = false
! #max_connections = 32
! #superuser_reserved_connections = 2
! #port = 5432
#unix_socket_directory = ''
#unix_socket_group = ''
#unix_socket_permissions = 0777 # octal
! #virtual_host = ''
#krb_server_keyfile = ''
- #
- # Shared Memory Size
- #
#shared_buffers = 64 # min 16, at least max_connections*2, 8KB each
! #max_locks_per_transaction = 64 # min 10, ~260*max_connections bytes each
! #wal_buffers = 8 # min 4, 8KB each
! # fsm = free space map
! #max_fsm_relations = 1000 # min 100, ~50 bytes each
#max_fsm_pages = 20000 # min max_fsm_relations*16, 6 bytes each
! # note: increasing max_connections also costs about 500 bytes each,
! # in addition to costs from shared_buffers and max_locks_per_transaction.
! #
! # Non-shared Memory Sizes
! #
! #sort_mem = 1024 # min 64, size in KB
! #vacuum_mem = 8192 # min 1024, size in KB
! #
! # Write-ahead log (WAL)
! #
#checkpoint_segments = 3 # in logfile segments, min 1, 16MB each
#checkpoint_timeout = 300 # range 30-3600, in seconds
#checkpoint_warning = 30 # 0 is off, in seconds
- #
#commit_delay = 0 # range 0-100000, in microseconds
#commit_siblings = 5 # range 1-1000
- #
- #fsync = true
- #wal_sync_method = fsync # the default varies across platforms:
- # # fsync, fdatasync, open_sync, or open_datasync
- #wal_debug = 0 # range 0-16
! #
! # Optimizer Parameters
! #
! #enable_seqscan = true
! #enable_indexscan = true
! #enable_tidscan = true
! #enable_sort = true
#enable_hashagg = true
! #enable_nestloop = true
#enable_mergejoin = true
! #enable_hashjoin = true
#effective_cache_size = 1000 # typically 8KB each
#random_page_cost = 4 # units are one sequential page fetch cost
#cpu_tuple_cost = 0.01 # (same)
#cpu_index_tuple_cost = 0.001 # (same)
#cpu_operator_cost = 0.0025 # (same)
! #from_collapse_limit = 8
! #join_collapse_limit = 8 # 1 disables collapsing of explicit JOINs
- #default_statistics_target = 10 # range 1-1000
-
- #
- # GEQO Optimizer Parameters
- #
#geqo = true
- #geqo_selection_bias = 2.0 # range 1.5-2.0
#geqo_threshold = 11
- #geqo_pool_size = 0 # default based on tables in statement,
- # range 128-1024
#geqo_effort = 1
#geqo_generations = 0
#geqo_random_seed = -1 # auto-compute seed
! #
! # Message display
! #
#log_min_messages = notice # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, log, fatal,
--- 27,152 ----
#
# Connection Parameters
#
! #CONNECTIONS AND AUTHENTICATION
! #----------------------------------
! #Connection Settings
! #tcpip_socket = false
! #max_connections = 32
! # note: increasing max_connections also costs about 500 bytes each,
! # in addition to costs from shared_buffers and max_locks_per_transaction.
+ #superuser_reserved_connections = 2
+ #port = 5432
#unix_socket_directory = ''
#unix_socket_group = ''
#unix_socket_permissions = 0777 # octal
! #Security & Authentication
+ #authentication_timeout = 60 # 1-600, in seconds
+ #ssl = false
#krb_server_keyfile = ''
+ #virtual_host = ''
+ #db_user_namespace = false
+
+ #RESOURCE USAGE (except WAL)
+ #---------------------------------
+ #Memory
#shared_buffers = 64 # min 16, at least max_connections*2, 8KB each
! #sort_mem = 1024 # min 64, size in KB
! #vacuum_mem = 8192 # min 1024, size in KB
!
! #Free Space Map
!
#max_fsm_pages = 20000 # min max_fsm_relations*16, 6 bytes each
! #max_fsm_relations = 1000 # min 100, ~50 bytes each
+ #Disk Resource Usage
! #max_files_per_process = 1000 # min 25
! #preload_libraries = ''
! #WRITE AHEAD LOG
! #---------------------------------
! #Settings
!
! #fsync = true # turns WAL on or off
! #wal_sync_method = fsync # the default varies across platforms:
! # # fsync, fdatasync, open_sync, or open_datasync
! #wal_buffers = 8 # min 4, 8KB each
!
! #Checkpointing
!
#checkpoint_segments = 3 # in logfile segments, min 1, 16MB each
#checkpoint_timeout = 300 # range 30-3600, in seconds
#checkpoint_warning = 30 # 0 is off, in seconds
#commit_delay = 0 # range 0-100000, in microseconds
#commit_siblings = 5 # range 1-1000
! #QUERY TUNING
! #--------------------------------
! #Planner Options
!
! #enable_hashjoin = true
#enable_hashagg = true
! #enable_indexscan = true
#enable_mergejoin = true
! #enable_nestloop = true
! #enable_seqscan = true
! #enable_sort = true
! #enable_tidscan = true
+ #Planner Cost Constants
#effective_cache_size = 1000 # typically 8KB each
#random_page_cost = 4 # units are one sequential page fetch cost
#cpu_tuple_cost = 0.01 # (same)
#cpu_index_tuple_cost = 0.001 # (same)
#cpu_operator_cost = 0.0025 # (same)
! #Genetic Estimate Query Optimizer
#geqo = true
#geqo_threshold = 11
#geqo_effort = 1
#geqo_generations = 0
+ #geqo_pool_size = 0 # default based on tables in statement,
+ # range 128-1024
#geqo_random_seed = -1 # auto-compute seed
+ #geqo_selection_bias = 2.0 # range 1.5-2.0
+
+ #Query/Index Statistics Collector
+
+ #stats_start_collector = true
+ #stats_command_string = false
+ #stats_row_level = false
+ #stats_block_level = false
+ #stats_reset_on_server_start = true
+ #default_statistics_target = 10 # range 1-1000
+
+ #Other Query Options
+
+ #explain_pretty_print = true
+ #from_collapse_limit = 8
+ #join_collapse_limit = 8 # 1 disables collapsing of explicit JOINs
+ #max_expr_depth = 10000 # min 10
! #LOGGING AND DEBUGGING
! #------------------------------------
! #Syslog
!
! #syslog = 0 # range 0-2
! #syslog_facility = 'LOCAL0'
! #syslog_ident = 'postgres'
!
! #When to Log
!
#log_min_messages = notice # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, log, fatal,
***************
*** 126,211 ****
#client_min_messages = notice # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# log, info, notice, warning, error
- #silent_mode = false
-
- #log_connections = false
- #log_hostname = false
- #log_source_port = false
- #log_pid = false
- #log_statement = false
- #log_duration = false
- #log_timestamp = false
#log_min_error_statement = panic # Values in order of increasing severity:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, panic(off)
!
#log_min_duration_statement = 0 # Log all statements whose
# execution time exceeds the value, in
# milliseconds. Zero disables.
#debug_print_parse = false
#debug_print_rewritten = false
#debug_print_plan = false
#debug_pretty_print = false
! #explain_pretty_print = true
!
! # requires USE_ASSERT_CHECKING
! #debug_assertions = true
!
!
! #
! # Syslog
! #
! #syslog = 0 # range 0-2
! #syslog_facility = 'LOCAL0'
! #syslog_ident = 'postgres'
!
- #
- # Statistics
- #
#log_parser_stats = false
#log_planner_stats = false
#log_executor_stats = false
#log_statement_stats = false
- # requires BTREE_BUILD_STATS
- #log_btree_build_stats = false
! #
! # Access statistics collection
! #
! #stats_start_collector = true
! #stats_reset_on_server_start = true
! #stats_command_string = false
! #stats_row_level = false
! #stats_block_level = false
- #
- # Misc
- #
- #dynamic_library_path = '$libdir'
- #search_path = '$user,public' # schema names
#datestyle = 'iso, us'
#timezone = unknown # actually, defaults to TZ environment setting
#australian_timezones = false
! #client_encoding = sql_ascii # actually, defaults to database encoding
! #authentication_timeout = 60 # 1-600, in seconds
! #deadlock_timeout = 1000 # in milliseconds
! #default_transaction_isolation = 'read committed'
! #default_transaction_read_only = false
#extra_float_digits = 0 # min -15, max 2
! #max_expr_depth = 10000 # min 10
! #max_files_per_process = 1000 # min 25
#password_encryption = true
#regex_flavor = advanced # advanced, extended, or basic
#sql_inheritance = true
#transform_null_equals = false
! #statement_timeout = 0 # 0 is disabled, in milliseconds
! #db_user_namespace = false
! #preload_libraries = ''
! #add_missing_from = true
--- 154,248 ----
#client_min_messages = notice # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# log, info, notice, warning, error
#log_min_error_statement = panic # Values in order of increasing severity:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, panic(off)
!
#log_min_duration_statement = 0 # Log all statements whose
# execution time exceeds the value, in
# milliseconds. Zero disables.
+ #silent_mode = false #DO NOT USE without Syslog!
+
+ #What to Log
+
#debug_print_parse = false
#debug_print_rewritten = false
#debug_print_plan = false
#debug_pretty_print = false
+ #log_connections = false
+ #log_duration = false
+ #log_pid = false
+ #log_statement = false
+ #log_timestamp = false
+ #log_hostname = false
+ #log_source_port = false
! #Statistics Logging
#log_parser_stats = false
#log_planner_stats = false
#log_executor_stats = false
#log_statement_stats = false
+ #CLIENT CONNECTION DEFAULTS
+ #-------------------------------------
+ #Statement Behavior
! #search_path = '$user,public' # schema names
! #default_transaction_isolation = 'read committed'
! #default_transaction_read_only = false
! #statement_timeout = 0 # 0 is disabled, in milliseconds
+ #Locale and Formatting
#datestyle = 'iso, us'
#timezone = unknown # actually, defaults to TZ environment setting
#australian_timezones = false
!
! #LC VARIABLES GO HERE!
!
#extra_float_digits = 0 # min -15, max 2
!
! #client_encoding = sql_ascii # actually, defaults to database encoding
!
! #Other Defaults
!
#password_encryption = true
+ #dynamic_library_path = '$libdir'
+
+ #LOCK MANAGEMENT
+ #-----------------------------------------
+
+ #deadlock_timeout = 1000 # in milliseconds
+ #max_locks_per_transaction = 64 # min 10, ~260*max_connections bytes each
+
+
+ #VERSION/PLATFORM COMPATIBILITY
+ #-----------------------------------------
+ #Previous Postgres Versions
+
+ #add_missing_from = true
#regex_flavor = advanced # advanced, extended, or basic
#sql_inheritance = true
+
+
+ #Compatibility with Platforms & Clients
+
#transform_null_equals = false
!
!
!
!
!
!
!
!
!
!
!
!
!
!
---------------------------(end of broadcast)---------------------------
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
