Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hksjs-0005hN-Pf for pgsql-hackers@arkaria.postgresql.org; Tue, 09 Jul 2019 16:13:09 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1hksjr-0005ik-M7 for pgsql-hackers@arkaria.postgresql.org; Tue, 09 Jul 2019 16:13:07 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hksjq-0005iZ-Od for pgsql-hackers@lists.postgresql.org; Tue, 09 Jul 2019 16:13:07 +0000 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hksjl-00073x-26 for pgsql-hackers@postgresql.org; Tue, 09 Jul 2019 16:13:05 +0000 Received: by mail-io1-xd2d.google.com with SMTP id s7so44326120iob.11 for ; Tue, 09 Jul 2019 09:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telsasoft-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=hYQwIzcajoe5B5GVAGBQu5RgRNcxAuY7aZje/16BUx4=; b=Uf9EsBzD9YnwJp6JjjIU+6fwA/AcCFIGLqp/TlhCAF1x7OYBqY7xjywWgn8eiq8pmn dLtAcPAoti4c7XBojQYmiDyEqE4Ee7YcefjbPIboQknex0skrpoPOBRs1Bn8EOFeS1tY 7A0v9lnJX5nRNO9eCG5/hl7yffzhVG+aIO+Dp7dJ1bCDNHffLtdkbvsASbs6IwQduu9i Kr/AVShY6U51vIHWCcRD3PGkdI6Op5nZGH/xzgJOOCLaCwoyZMtg3/2O4ERP29W5TG// W9HN1CBmgG3lDy8Zm/OWz0AboOg+T/atwkUzqgtV6sVMszPSAE4MkOEAiClpEpoF+MM+ 7X6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=hYQwIzcajoe5B5GVAGBQu5RgRNcxAuY7aZje/16BUx4=; b=hle2TAd0V9I0A8vhdWFcEJoFOZj7Gytm3TGYJ4veTiXxBiJhTCEogTjiDwexNlO0Ja K0ahgdtaFnfqNQ+attS5yhMKAhHGiQWlOQnFld+evi3nQno7PBgQ/8OjJMIouQGkzVB6 if5lbgkpo53kVib1s8fLJZzuxzJk+ZNItq9V+5PEYgDwytP3o72g4+NPFI892IiFVfhd nYhsD+0I+Reafr5eMgQ/aVrVAKHjA0XgJaHoJBip38hUVtgn+tgG5tf4AOjB0jVYqDKB Lc5z5xMJfnsX4bof1N0ueGyQ2iRxqJT1CX61PzR+yY9GdDcp2CGGnLVDvZcDqAX2xqsR iuEQ== X-Gm-Message-State: APjAAAUfk/1h5a4O9T8wo/VlVLkzBhNVlYUIh7y8IcaGTOQuGI6x2zLY fepkmRaIcyAUQmpcIN8M7wX1kdTmi8I= X-Google-Smtp-Source: APXvYqxwsG5tGtctVHct2SoQJ9HlIxWOeVoHgY43GUphhSzQqFS9y3Z/JQ5ESiswdhqnQQROSC9qkg== X-Received: by 2002:a5d:8195:: with SMTP id u21mr8497179ion.260.1562688779978; Tue, 09 Jul 2019 09:12:59 -0700 (PDT) Received: from pryzbyj (charmander.telsasoft.com. [50.244.222.1]) by smtp.gmail.com with ESMTPSA id w23sm36703806ioa.51.2019.07.09.09.12.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jul 2019 09:12:58 -0700 (PDT) Received: by pryzbyj (Postfix, from userid 1000) id 2A91E800969; Tue, 9 Jul 2019 11:12:57 -0500 (CDT) Date: Tue, 9 Jul 2019 11:12:57 -0500 From: Justin Pryzby To: pgsql-hackers@postgresql.org Subject: Re: clean up docs for v12 Message-ID: <20190709161256.GH22387@telsasoft.com> References: <20190330224333.GQ5815@telsasoft.com> <20190408141828.GE10080@telsasoft.com> <20190419080026.GJ2660@paquier.xyz> <20190520182001.GA25675@telsasoft.com> <20190520225959.wx3awkenwf7kv5dn@alap3.anarazel.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="FkmkrVfFsRoUs1wW" Content-Disposition: inline In-Reply-To: <20190520225959.wx3awkenwf7kv5dn@alap3.anarazel.de> User-Agent: Mutt/1.5.24 (2015-08-30) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --FkmkrVfFsRoUs1wW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I made bunch of changes based on Andres' review and I split some more indisputable 1 line changes from the large commit, hoping it will be easier to review both. Several bits and pieces of the patch have been applied piecemeal, but I was hoping to avoid continuing to do that. I think at least these are also necessary. v5-0002-Say-it-more-naturally.patch v5-0010-spelling-and-typos.patch I suggest to anyone reading to look at the large patch last, since its changes are longer and less easy to read. Many of the changes are intended to improve the text rather than to fix a definite error. Justin --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0001-review-docs-for-pg12dev.patch" From 292f9854ac0f847a1783a7d276e6009b3bdd3e91 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Thu, 28 Mar 2019 18:50:03 -0500 Subject: [PATCH v5 01/12] review docs for pg12dev --- doc/src/sgml/catalogs.sgml | 4 ++-- doc/src/sgml/config.sgml | 14 +++++++------ doc/src/sgml/ddl.sgml | 16 +++++++------- doc/src/sgml/ecpg.sgml | 16 +++++++------- doc/src/sgml/monitoring.sgml | 43 +++++++++++++++++++------------------- doc/src/sgml/perform.sgml | 8 +++---- doc/src/sgml/protocol.sgml | 6 +++--- doc/src/sgml/ref/create_index.sgml | 4 ++-- doc/src/sgml/ref/pg_rewind.sgml | 13 ++++++------ doc/src/sgml/ref/pgbench.sgml | 7 +++---- doc/src/sgml/ref/vacuum.sgml | 6 +++--- doc/src/sgml/runtime.sgml | 4 ++-- doc/src/sgml/sources.sgml | 18 ++++++++-------- doc/src/sgml/xfunc.sgml | 12 +++++------ src/bin/pg_upgrade/check.c | 6 +++--- 15 files changed, 87 insertions(+), 90 deletions(-) diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 3428a7c..47482f2 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -3060,7 +3060,7 @@ SCRAM-SHA-256$<iteration count>:&l simplifies ATTACH/DETACH PARTITION operations: the partition dependencies need only be added or removed. Example: a child partitioned index is made partition-dependent - on both the partition table it is on and the parent partitioned + on both the table partition and the parent partitioned index, so that it goes away if either of those is dropped, but not otherwise. The dependency on the parent index is primary, so that if the user tries to drop the child partitioned index, @@ -3123,7 +3123,7 @@ SCRAM-SHA-256$<iteration count>:&l Note that it's quite possible for two objects to be linked by more than one pg_depend entry. For example, a child partitioned index would have both a partition-type dependency on its - associated partition table, and an auto dependency on each column of + associated table partition, and an auto dependency on each column of that table that it indexes. This sort of situation expresses the union of multiple dependency semantics. A dependent object can be dropped without CASCADE if any of its dependencies satisfies diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index aaab1c5..fa8b40a 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -3433,7 +3433,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows current when the base backup was taken. The value latest recovers to the latest timeline found in the archive, which is useful in - a standby server. latest is the default. + a standby server. The default is latest. @@ -4195,8 +4195,9 @@ ANY num_sync ( bytea - The handling of the bytea type is also similar to - the VARCHAR. The definition on an array of type + The handling of the bytea type is similar to + the VARCHAR. The definition of an array of type bytea is converted into a named struct for every variable. A declaration like: @@ -1220,9 +1220,8 @@ bytea var[180]; struct bytea_var { int len; char arr[180]; } var; - The member arr hosts binary format - data. It also can handle even '\0' as part of - data unlike VARCHAR. + The member arr stores binary format + data, which can include zero bytes, unlike VARCHAR. The data is converted from/to hex format and sent/received by ecpglib. @@ -7571,8 +7570,7 @@ PREPARE name FROM A literal C string or a host variable containing a preparable - statement, one of the SELECT, INSERT, UPDATE, or - DELETE. + statement (SELECT, INSERT, UPDATE, or DELETE). diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index bf72d0c..7cec551 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -271,13 +271,13 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser Some of the information in the dynamic statistics views shown in is security restricted. - Ordinary users can only see all the information about their own sessions - (sessions belonging to a role that they are a member of). In rows about + Ordinary users can only see all information about their own sessions + (sessions belonging to a role of which they are a member). In rows for other sessions, many columns will be null. Note, however, that the existence of a session and its general properties such as its sessions user and database are visible to all users. Superusers and members of the built-in role pg_read_all_stats (see also ) can see all the information about all sessions. + linkend="default-roles"/>) can see all information about all sessions. @@ -667,7 +667,7 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser timestamp with time zoneTime when this process' current transaction was started, or null if no transaction is active. If the current - query is the first of its transaction, this column is equal to the + query is the first of its transaction, this is equal to the query_start column. @@ -3603,16 +3603,16 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, partitions_totalbigint - When creating an index on a partitioned table, this column is set to - the total number of partitions on which the index is to be created. + When creating an index on a partitioned table, this is + the total number of partitions to be processed. partitions_done bigint - When creating an index on a partitioned table, this column is set to - the number of partitions on which the index has been completed. + When creating an index on a partitioned table, this is + the number of partitions for which the process is complete. @@ -3650,11 +3650,10 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, building index - The index is being built by the access method-specific code. In this phase, - access methods that support progress reporting fill in their own progress data, - and the subphase is indicated in this column. Typically, + The index is being built by code specific to the access method, and if + it supports progress reporting, this indicates the method's subphase. blocks_total and blocks_done - will contain progress data, as well as potentially + will contain progress data, as may tuples_total and tuples_done. @@ -3739,15 +3738,15 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, VACUUM Progress Reporting - Whenever VACUUM is running, the - pg_stat_progress_vacuum view will contain - one row for each backend (including autovacuum worker processes) that is - currently vacuuming. The tables below describe the information + The pg_stat_progress_vacuum view will contain one + row for each backend that is running VACUUM, including + autovacuum worker processes. + The tables below describe the information that will be reported and provide information about how to interpret it. Progress for VACUUM FULL commands is reported via - pg_stat_progress_cluster - because both VACUUM FULL and CLUSTER - rewrite the table, while regular VACUUM only modifies it + pg_stat_progress_cluster, + because VACUUM FULL rewrites the table, like CLUSTER, + while regular VACUUM only modifies it in place. See . @@ -3931,9 +3930,9 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, CLUSTER Progress Reporting - Whenever CLUSTER or VACUUM FULL is - running, the pg_stat_progress_cluster view will - contain a row for each backend that is currently running either command. + The pg_stat_progress_cluster view will contain a + row for each backend that is running either + CLUSTER or VACUUM FULL. The tables below describe the information that will be reported and provide information about how to interpret it. diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml index 8e16583..0e34652 100644 --- a/doc/src/sgml/perform.sgml +++ b/doc/src/sgml/perform.sgml @@ -899,10 +899,10 @@ EXPLAIN ANALYZE SELECT * FROM tenk1 WHERE unique1 < 100 AND unique2 > 9000 Generally, the EXPLAIN output will display details for every plan node which was generated by the query planner. However, there are cases where the executor is able to determine that certain nodes are - not required; currently, the only node types to support this are the - Append and MergeAppend nodes. These - node types have the ability to discard subnodes which they are able to - determine won't contain any records required by the query. It is possible + not required; currently, the only node types to support this are + Append and MergeAppend, which + are able to discard subnodes when it's deduced that + they will not contain any records required by the query. It is possible to determine that nodes have been removed in this way by the presence of a "Subplans Removed" property in the EXPLAIN output. diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index b20f169..70f7286 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -1515,7 +1515,7 @@ SELECT 1/0; the server will only accept encrypted packets from the client which are less than 16kB; gss_wrap_size_limit() should be used by the client to determine the size of the unencrypted message which will fit - within this limit and larger messages should be broken up into multiple + within this limit; larger messages should be broken up into multiple gss_wrap() calls. Typical segments are 8kB of unencrypted data, resulting in encrypted packets of slightly larger than 8kB but well within the 16kB maximum. The server can be expected to not send @@ -1531,8 +1531,8 @@ SELECT 1/0; support to PostgreSQL. In this case the connection must be closed, but the frontend might choose to open a fresh connection and proceed without requesting GSSAPI - encryption. Given the length limits specified above, the ErrorMessage can - not be confused with a proper response from the server with an appropriate + encryption. Given the length limits specified above, the ErrorMessage + cannot be confused with a proper response from the server with an appropriate length. diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml index 629a31e..713e2c3 100644 --- a/doc/src/sgml/ref/create_index.sgml +++ b/doc/src/sgml/ref/create_index.sgml @@ -181,8 +181,8 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] - Currently, the B-tree and the GiST index access methods support this - feature. In B-tree and the GiST indexes, the values of columns listed + Currently, only the B-tree and GiST index access methods support this + feature. In B-tree and GiST indexes, the values of columns listed in the INCLUDE clause are included in leaf tuples which correspond to heap tuples, but are not included in upper-level index entries used for tree navigation. diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml index 4d91eeb..f39fe53 100644 --- a/doc/src/sgml/ref/pg_rewind.sgml +++ b/doc/src/sgml/ref/pg_rewind.sgml @@ -106,15 +106,14 @@ PostgreSQL documentation - pg_rewind will fail immediately if it finds - files it cannot write directly to. This can happen for example when - the source and the target server use the same file mapping for read-only - SSL keys and certificates. If such files are present on the target server + pg_rewind will fail immediately if it experiences + a write error. This can happen for example when + the source and target server use the same file mapping for read-only + SSL keys and certificates. If such files are present on the target server, it is recommended to remove them before running - pg_rewind. After doing the rewind, some of + pg_rewind. After performing the rewind, some of those files may have been copied from the source, in which case it may - be necessary to remove the data copied and restore back the set of links - used before the rewind. + be necessary to remove them and restore the files removed beforehand. diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml index e3b73a4..cc2e533 100644 --- a/doc/src/sgml/ref/pgbench.sgml +++ b/doc/src/sgml/ref/pgbench.sgml @@ -474,10 +474,9 @@ pgbench options d - Because in "prepared" mode pgbench reuses - the parse analysis result for the second and subsequent query - iteration, pgbench runs faster in the - prepared mode than in other modes. + pgbench runs faster in prepared mode because + parse analysis and planning are done only once rather than during each + query. The default is simple query protocol. (See diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml index f9b0fb8..ec2503d 100644 --- a/doc/src/sgml/ref/vacuum.sgml +++ b/doc/src/sgml/ref/vacuum.sgml @@ -215,9 +215,9 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ ). + systems, and that PostgreSQL was built with + GSSAPI support (see ). diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index a339ebb..e869a31 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -103,7 +103,7 @@ less -x4 message text. In addition there are optional elements, the most common of which is an error identifier code that follows the SQL spec's SQLSTATE conventions. - ereport itself is just a shell function, that exists + ereport itself is just a shell function that exists mainly for the syntactic convenience of making message generation look like a function call in the C source code. The only parameter accepted directly by ereport is the severity level. @@ -886,10 +886,10 @@ BETTER: unrecognized node type: 42 For example _StaticAssert() and __builtin_constant_p are currently used, even though - they are from newer revisions of the C standard and a - GCC extension respectively. If not available - we respectively fall back to using a C99 compatible replacement that - performs the same checks, but emits rather cryptic messages and do not + they are from a newer revision of the C standard and a + GCC extension, respectively. If not available, in the first case, + we fall back to using a C99 compatible replacement that + performs the same checks, but emits rather cryptic messages; in the second case, we do not use __builtin_constant_p. @@ -948,7 +948,7 @@ MemoryContextSwitchTo(MemoryContext context) Barring special arrangements code in signal handlers may only call async-signal safe functions (as defined in POSIX) and access variables of type volatile sig_atomic_t. A few - functions in postgres are also deemed signal safe, importantly + functions in postgres are also deemed signal safe; specifically, SetLatch(). @@ -969,9 +969,9 @@ handle_sighup(SIGNAL_ARGS) } errno is saved and restored because - SetLatch() might change it. If that were not done - interrupted code that's currently inspecting errno might see the wrong - value. + SetLatch() might change it. If that were not done, + code interrupted by a signal might see the wrong value of + errno. diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml index 34a1938..d14457b 100644 --- a/doc/src/sgml/xfunc.sgml +++ b/doc/src/sgml/xfunc.sgml @@ -3364,11 +3364,11 @@ if (!ptr) - By default, a function is just a black box that the - database system knows very little about the behavior of. However, - that means that queries using the function may be executed much less + By default, a function is a black box that the + database system knows very little about, which + means queries calling the function may be executed less efficiently than they could be. It is possible to supply additional - knowledge that helps the planner optimize function calls. + information that helps the planner optimize function calls. @@ -3381,7 +3381,7 @@ if (!ptr) The parallel safety property (PARALLEL UNSAFE, PARALLEL RESTRICTED, or PARALLEL SAFE) must also be specified if you hope - to use the function in parallelized queries. + queries calling the function to be run using the parallel infrastructure. It can also be useful to specify the function's estimated execution cost, and/or the number of rows a set-returning function is estimated to return. However, the declarative way of specifying those two @@ -3393,7 +3393,7 @@ if (!ptr) It is also possible to attach a planner support function to a SQL-callable function (called its target function), and thereby provide - knowledge about the target function that is too complex to be + information about the target function that is too complex to be represented declaratively. Planner support functions have to be written in C (although their target functions might not be), so this is an advanced feature that relatively few people will use. diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c index 617270f..370c7aa 100644 --- a/src/bin/pg_upgrade/check.c +++ b/src/bin/pg_upgrade/check.c @@ -222,13 +222,13 @@ output_completion_banner(char *analyze_script_file_name, /* Did we copy the free space files? */ if (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) pg_log(PG_REPORT, - "Optimizer statistics are not transferred by pg_upgrade so,\n" - "once you start the new server, consider running:\n" + "Optimizer statistics are not transferred by pg_upgrade.\n" + "Once you start the new server, consider running:\n" " %s\n\n", analyze_script_file_name); else pg_log(PG_REPORT, "Optimizer statistics and free space information are not transferred\n" - "by pg_upgrade so, once you start the new server, consider running:\n" + "by pg_upgrade. Once you start the new server, consider running:\n" " %s\n\n", analyze_script_file_name); -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0002-Say-it-more-naturally.patch" From 52164bf5147dcf13599881f21e918cafcd99c369 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Tue, 9 Jul 2019 10:42:26 -0500 Subject: [PATCH v5 02/12] Say it more naturally --- doc/src/sgml/config.sgml | 4 ++-- doc/src/sgml/ddl.sgml | 2 +- doc/src/sgml/libpq.sgml | 2 +- doc/src/sgml/monitoring.sgml | 6 +++--- doc/src/sgml/ref/alter_table.sgml | 2 +- doc/src/sgml/ref/pg_rewind.sgml | 4 ++-- doc/src/sgml/ref/reindex.sgml | 2 +- doc/src/sgml/runtime.sgml | 2 +- doc/src/sgml/sources.sgml | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index fa8b40a..ff60875 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -112,7 +112,7 @@ For example, 30.1 GB will be converted to 30822 MB not 32319628902 B. If the parameter is of integer type, a final rounding to integer - occurs after any units conversion. + occurs after any unit conversion. @@ -3540,7 +3540,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows servers or streaming base backup clients (i.e., the maximum number of simultaneously running WAL sender processes). The default is 10. The value 0 means - replication is disabled. Abrupt streaming client disconnection might + replication is disabled. Abrupt disconnection of a streaming client might leave an orphaned connection slot behind until a timeout is reached, so this parameter should be set slightly higher than the maximum number of expected clients so disconnected clients can immediately diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index cf390a2..98cb89f 100644 --- a/doc/src/sgml/ddl.sgml +++ b/doc/src/sgml/ddl.sgml @@ -3941,7 +3941,7 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02 Before running the ATTACH PARTITION command, it is recommended to create a CHECK constraint on the table to be attached describing the desired partition constraint. That way, - the system will be able to skip the scan to validate the implicit + the system will be able to skip the scan which is otherwise needed to validate the implicit partition constraint. Without such a constraint, the table will be scanned to validate the partition constraint while holding an ACCESS EXCLUSIVE lock on that partition diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 7f01fcc..8a8427f 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1122,7 +1122,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname connect_timeout - Maximum wait for connection, in seconds (write as a decimal integer, + Maximum time to wait while connecting, in seconds (write as a decimal integer, e.g. 10). Zero, negative, or not specified means wait indefinitely. The minimum allowed timeout is 2 seconds, therefore a value of 1 is interpreted as 2. diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 7cec551..728db6b 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -2504,14 +2504,14 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i datname name - Name of this database, or NULL for the shared + Name of this database, or NULL for shared objects. numbackends integer Number of backends currently connected to this database, or - NULL for the shared objects. This is the only column + NULL for shared objects. This is the only column in this view that returns a value reflecting current state; all other columns return the accumulated values since the last reset. @@ -2633,7 +2633,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i The pg_stat_database view will contain one row - for each database in the cluster, plus one for the shared objects, showing + for each database in the cluster, plus one for shared objects, showing database-wide statistics. diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 90bf195..058324e 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -643,7 +643,7 @@ WITH ( MODULUS numeric_literal, REM When applied to a partitioned table, nothing is moved, but any partitions created afterwards with CREATE TABLE PARTITION OF will use that tablespace, - unless the TABLESPACE clause is used to override it. + unless overridden by its TABLESPACE clause. diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml index f39fe53..6f6d220 100644 --- a/doc/src/sgml/ref/pg_rewind.sgml +++ b/doc/src/sgml/ref/pg_rewind.sgml @@ -184,7 +184,7 @@ PostgreSQL documentation pg_rewind to return without waiting, which is faster, but means that a subsequent operating system crash can leave the synchronized data folder corrupt. Generally, this option is - useful for testing but should not be used when creating a production + useful for testing but should not be used on a production installation. @@ -265,7 +265,7 @@ GRANT EXECUTE ON function pg_catalog.pg_read_binary_file(text, bigint, bigint, b When executing pg_rewind using an online cluster as source which has been recently promoted, it is necessary - to execute a CHECKPOINT after promotion so as its + to execute a CHECKPOINT after promotion such that its control file reflects up-to-date timeline information, which is used by pg_rewind to check if the target cluster can be rewound using the designated source cluster. diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 303436c..5a1f634 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -240,7 +240,7 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } [ CONCURR Reindexing a single index or table requires being the owner of that index or table. Reindexing a schema or database requires being the - owner of that schema or database. Note that is therefore sometimes + owner of that schema or database. Note specifically that it's possible for non-superusers to rebuild indexes of tables owned by other users. However, as a special exception, when REINDEX DATABASE, REINDEX SCHEMA diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index cefff77..ecdaafc 100644 --- a/doc/src/sgml/runtime.sgml +++ b/doc/src/sgml/runtime.sgml @@ -2642,7 +2642,7 @@ openssl x509 -req -in server.csr -text -days 365 \ The PostgreSQL server will listen for both normal and GSSAPI-encrypted connections on the same TCP - port, and will negotiate with any connecting client on whether to + port, and will negotiate with any connecting client whether to use GSSAPI for encryption (and for authentication). By default, this decision is up to the client (which means it can be downgraded by an attacker); see about diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index e869a31..b94e7f7 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -359,7 +359,7 @@ ereport(ERROR, specify suppression of the CONTEXT: portion of a message in the postmaster log. This should only be used for verbose debugging messages where the repeated inclusion of context would bloat the log - volume too much. + too much. @@ -504,7 +504,7 @@ Hint: the addendum Use of Quotes - Use quotes always to delimit file names, user-supplied identifiers, and + Always use quotes to delimit file names, user-supplied identifiers, and other variables that might contain words. Do not use them to mark up variables that will not contain words (for example, operator names). -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0003-Add-comma-for-readability.patch" From 37a5f024bd6ded444b99cd441ef33062da950d1d Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Fri, 29 Mar 2019 19:37:35 -0500 Subject: [PATCH v5 03/12] Add comma for readability --- doc/src/sgml/backup.sgml | 2 +- doc/src/sgml/bki.sgml | 2 +- doc/src/sgml/client-auth.sgml | 4 ++-- doc/src/sgml/config.sgml | 4 ++-- doc/src/sgml/ddl.sgml | 2 +- doc/src/sgml/indices.sgml | 2 +- doc/src/sgml/installation.sgml | 2 +- doc/src/sgml/logical-replication.sgml | 2 +- doc/src/sgml/monitoring.sgml | 8 ++++---- doc/src/sgml/protocol.sgml | 6 +++--- doc/src/sgml/ref/create_table.sgml | 2 +- doc/src/sgml/ref/create_table_as.sgml | 2 +- doc/src/sgml/ref/pgupgrade.sgml | 2 +- doc/src/sgml/ref/psql-ref.sgml | 2 +- doc/src/sgml/sources.sgml | 20 ++++++++++---------- doc/src/sgml/wal.sgml | 2 +- doc/src/sgml/xoper.sgml | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml index 9d4c000..aba0414 100644 --- a/doc/src/sgml/backup.sgml +++ b/doc/src/sgml/backup.sgml @@ -1024,7 +1024,7 @@ SELECT pg_start_backup('label', true); consider during this backup. - As noted above, if the server crashes during the backup it may not be + As noted above, if the server crashes during the backup, it may not be possible to restart until the backup_label file has been manually deleted from the PGDATA directory. Note that it is very important to never remove the diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml index aa3d6f8..e27fa76 100644 --- a/doc/src/sgml/bki.sgml +++ b/doc/src/sgml/bki.sgml @@ -403,7 +403,7 @@ 8000—9999. This minimizes the risk of OID collisions with other patches being developed concurrently. To keep the 8000—9999 range free for development purposes, after a patch has been committed - to the master git repository its OIDs should be renumbered into + to the master git repository, its OIDs should be renumbered into available space below that range. Typically, this will be done near the end of each development cycle, moving all OIDs consumed by patches committed in that cycle at the same time. The script diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml index 3ed74d8..4a01b1b 100644 --- a/doc/src/sgml/client-auth.sgml +++ b/doc/src/sgml/client-auth.sgml @@ -157,7 +157,7 @@ hostnogssenc database user - To make use of this option the server must be built with + To make use of this option, the server must be built with SSL support. Furthermore, SSL must be enabled by setting the configuration parameter (see @@ -189,7 +189,7 @@ hostnogssenc database user - To make use of this option the server must be built with + To make use of this option, the server must be built with GSSAPI support. Otherwise, the hostgssenc record is ignored except for logging a warning that it cannot match any connections. diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index ff60875..b898214 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -3458,7 +3458,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows reached. The default is pause, which means recovery will be paused. promote means the recovery process will finish and the server will start to accept connections. - Finally shutdown will stop the server after reaching the + Finally, shutdown will stop the server after reaching the recovery target. @@ -4188,7 +4188,7 @@ ANY num_sync ( @@ -3018,7 +3018,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i pg_statio_user_tables and pg_statio_sys_tables views contain the same information, - but filtered to only show user and system tables respectively. + but filtered to only show user and system tables, respectively.
@@ -3079,7 +3079,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i pg_statio_user_indexes and pg_statio_sys_indexes views contain the same information, - but filtered to only show user and system indexes respectively. + but filtered to only show user and system indexes, respectively.
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index 70f7286..3f907f6 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -1449,7 +1449,7 @@ SELECT 1/0; S, perform an SSL startup handshake (not described here, part of the SSL specification) with the server. If this is successful, continue - with sending the usual StartupMessage. In this case the + with sending the usual StartupMessage. In this case, the StartupMessage and all subsequent data will be SSL-encrypted. To continue after N, send the usual StartupMessage and proceed without @@ -1462,7 +1462,7 @@ SELECT 1/0; the server predates the addition of SSL support to PostgreSQL. (Such servers are now very ancient, and likely do not exist in the wild anymore.) - In this case the connection must + In this case, the connection must be closed, but the frontend might choose to open a fresh connection and proceed without requesting SSL. @@ -1528,7 +1528,7 @@ SELECT 1/0; The frontend should also be prepared to handle an ErrorMessage response to GSSENCRequest from the server. This would only occur if the server predates the addition of GSSAPI encryption - support to PostgreSQL. In this case the + support to PostgreSQL. In this case, the connection must be closed, but the frontend might choose to open a fresh connection and proceed without requesting GSSAPI encryption. Given the length limits specified above, the ErrorMessage diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 9009add..4f3ff1d 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -1189,7 +1189,7 @@ WITH ( MODULUS numeric_literal, REM This clause specifies optional storage parameters for a table or index; see for more - information. For backward-compatibility the WITH + information. For backward-compatibility, the WITH clause for a table can also include OIDS=FALSE to specify that rows of the new table should not contain OIDs (object identifiers), OIDS=TRUE is not supported anymore. diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml index b5c4ce6..0880459 100644 --- a/doc/src/sgml/ref/create_table_as.sgml +++ b/doc/src/sgml/ref/create_table_as.sgml @@ -142,7 +142,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI This clause specifies optional storage parameters for the new table; see for more - information. For backward-compatibility the WITH + information. For backward-compatibility, the WITH clause for a table can also include OIDS=FALSE to specify that rows of the new table should contain no OIDs (object identifiers), OIDS=TRUE is not supported anymore. diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml index 8288676..6a898d9 100644 --- a/doc/src/sgml/ref/pgupgrade.sgml +++ b/doc/src/sgml/ref/pgupgrade.sgml @@ -746,7 +746,7 @@ psql --username=postgres --file=script.sql postgres pg_upgrade launches short-lived postmasters in the old and new data directories. Temporary Unix socket files for communication with these postmasters are, by default, made in the current - working directory. In some situations the path name for the current + working directory. In some situations, the path name for the current directory might be too long to be a valid socket name. In that case you can use the option to put the socket files in some directory with a shorter path name. For security, be sure that that diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 7789fc6..8076495 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1056,7 +1056,7 @@ testdb=> These operations are not as efficient as the SQL COPY command with a file or program data source or destination, because all data must pass through the client/server - connection. For large amounts of data the SQL + connection. For large amounts of data, the SQL command might be preferable. diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index b94e7f7..c57f51d 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -100,7 +100,7 @@ less -x4 There are two required elements for every message: a severity level (ranging from DEBUG to PANIC) and a primary - message text. In addition there are optional elements, the most + message text. In addition, there are optional elements, the most common of which is an error identifier code that follows the SQL spec's SQLSTATE conventions. ereport itself is just a shell function that exists @@ -473,7 +473,7 @@ Hint: the addendum Rationale: Messages are not necessarily displayed on terminal-type - displays. In GUI displays or browsers these formatting instructions are + displays. In GUI displays or browsers, these formatting instructions are at best ignored. @@ -884,7 +884,7 @@ BETTER: unrecognized node type: 42 features can be used, if a fallback is provided. - For example _StaticAssert() and + For example, _StaticAssert() and __builtin_constant_p are currently used, even though they are from a newer revision of the C standard and a GCC extension, respectively. If not available, in the first case, @@ -897,14 +897,14 @@ BETTER: unrecognized node type: 42 Function-Like Macros and Inline Functions - Both, macros with arguments and static inline - functions, may be used. The latter are preferable if there are + Both macros with arguments and static inline + functions may be used. The latter are preferable if there are multiple-evaluation hazards when written as a macro, as e.g. the case with #define Max(x, y) ((x) > (y) ? (x) : (y)) - or when the macro would be very long. In other cases it's only + or when the macro would be very long. In other cases, it's only possible to use macros, or at least easier. For example because expressions of various types need to be passed to the macro. @@ -936,16 +936,16 @@ MemoryContextSwitchTo(MemoryContext context) Writing Signal Handlers - To be suitable to run inside a signal handler code has to be + To be suitable to run inside a signal handler, code has to be written very carefully. The fundamental problem is that, unless blocked, a signal handler can interrupt code at any time. If code - inside the signal handler uses the same state as code outside - chaos may ensue. As an example consider what happens if a signal + inside the signal handler uses the same state as code outside, + chaos may ensue. As an example, consider what happens if a signal handler tries to acquire a lock that's already held in the interrupted code. - Barring special arrangements code in signal handlers may only + Barring special arrangements, code in signal handlers may only call async-signal safe functions (as defined in POSIX) and access variables of type volatile sig_atomic_t. A few functions in postgres are also deemed signal safe; specifically, diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml index 4eb8feb..30bde24 100644 --- a/doc/src/sgml/wal.sgml +++ b/doc/src/sgml/wal.sgml @@ -326,7 +326,7 @@ before returning a success indication to the client. The client is therefore guaranteed that a transaction reported to be committed will be preserved, even in the event of a server crash immediately after. - However, for short transactions this delay is a major component of the + However, for short transactions, this delay is a major component of the total transaction time. Selecting asynchronous commit mode means that the server returns success as soon as the transaction is logically completed, before the WAL records it generated have diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml index 260e43c..55cd3b1 100644 --- a/doc/src/sgml/xoper.sgml +++ b/doc/src/sgml/xoper.sgml @@ -375,7 +375,7 @@ table1.column1 OP table2.column2 Another example is that on machines that meet the IEEE floating-point standard, negative zero and positive zero are different values (different bit patterns) but they are defined to compare equal. - If a float value might contain negative zero then extra steps are needed + If a float value might contain negative zero, then extra steps are needed to ensure it generates the same hash value as positive zero. -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0004-Consistent-language-must-be-superuser.patch" From 0a1257363330e4c30d4c6c65ca8e748ba125f743 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Fri, 29 Mar 2019 19:40:49 -0500 Subject: [PATCH v5 04/12] Consistent language: "must be superuser" --- src/backend/storage/ipc/signalfuncs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/storage/ipc/signalfuncs.c b/src/backend/storage/ipc/signalfuncs.c index ade8d71..1eec165 100644 --- a/src/backend/storage/ipc/signalfuncs.c +++ b/src/backend/storage/ipc/signalfuncs.c @@ -115,7 +115,7 @@ pg_cancel_backend(PG_FUNCTION_ARGS) if (r == SIGNAL_BACKEND_NOSUPERUSER) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("must be a superuser to cancel superuser query")))); + (errmsg("must be superuser to cancel superuser query")))); if (r == SIGNAL_BACKEND_NOPERMISSION) ereport(ERROR, @@ -139,12 +139,12 @@ pg_terminate_backend(PG_FUNCTION_ARGS) if (r == SIGNAL_BACKEND_NOSUPERUSER) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("must be a superuser to terminate superuser process")))); + (errmsg("must be superuser to terminate superuser process")))); if (r == SIGNAL_BACKEND_NOPERMISSION) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend")))); + (errmsg("must be member of role whose process is being terminated or member of pg_signal_backend")))); PG_RETURN_BOOL(r == SIGNAL_BACKEND_SUCCESS); } -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0005-Consistent-spelling-timestamp.patch" From 443db8ffc2157c137cb84563c1326da727d95850 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Fri, 29 Mar 2019 19:52:22 -0500 Subject: [PATCH v5 05/12] Consistent spelling: "timestamp" --- doc/src/sgml/config.sgml | 14 ++++++------- doc/src/sgml/datatype.sgml | 6 +++--- doc/src/sgml/ecpg.sgml | 4 ++-- doc/src/sgml/func.sgml | 30 +++++++++++++-------------- doc/src/sgml/logicaldecoding.sgml | 4 ++-- doc/src/sgml/plpgsql.sgml | 2 +- doc/src/sgml/ref/pgbench.sgml | 6 +++--- doc/src/sgml/replication-origins.sgml | 2 +- doc/src/sgml/trigger.sgml | 2 +- doc/src/sgml/uuid-ossp.sgml | 2 +- src/backend/utils/misc/guc.c | 4 ++-- src/backend/utils/misc/postgresql.conf.sample | 2 +- src/include/catalog/pg_control.h | 4 ++-- src/interfaces/ecpg/pgtypeslib/timestamp.c | 4 ++-- 14 files changed, 43 insertions(+), 43 deletions(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index b898214..bdc1d12 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -3344,7 +3344,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows - This parameter specifies the time stamp up to which recovery + This parameter specifies the timestamp up to which recovery will proceed. The precise stopping point is also influenced by . @@ -4171,7 +4171,7 @@ ANY num_sync ( @@ -6335,7 +6335,7 @@ local0.* /var/log/postgresql %s - Process start time stamp + Process start timestamp no @@ -6390,7 +6390,7 @@ FROM pg_stat_activity; Syslog produces its own - time stamp and process ID information, so you probably do not want to + timestamp and process ID information, so you probably do not want to include those escapes if you are logging to syslog. @@ -6539,7 +6539,7 @@ log_line_prefix = '%m [%p] %q%u@%d/%a ' This option emits log lines in comma-separated-values (CSV) format, with these columns: - time stamp with milliseconds, + timestamp with milliseconds, user name, database name, process ID, @@ -7977,7 +7977,7 @@ SET XML OPTION { DOCUMENT | CONTENT }; - Sets the time zone for displaying and interpreting time stamps. + Sets the time zone for displaying and interpreting timestamps. The built-in default is GMT, but that is typically overridden in postgresql.conf; initdb will install a setting there corresponding to its system environment. diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml index 35ecd48..9f3e7a0 100644 --- a/doc/src/sgml/datatype.sgml +++ b/doc/src/sgml/datatype.sgml @@ -2031,7 +2031,7 @@ MINUTE TO SECOND - Valid input for the time stamp types consists of the concatenation + Valid input for the timestamp types consists of the concatenation of a date and a time, followed by an optional time zone, followed by an optional AD or BC. (Alternatively, AD/BC can appear @@ -2159,12 +2159,12 @@ January 8 04:05:06 1999 PST infinity date, timestamp - later than all other time stamps + later than all other timestamps -infinity date, timestamp - earlier than all other time stamps + earlier than all other timestamps now diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index d2dd96c..3c42c0a 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -1030,7 +1030,7 @@ struct varchar_var { int len; char arr[180]; } var; the pgtypes library. The pgtypes library, described in detail in contains basic functions to deal with those types, such that you do not need to send a query to - the SQL server just for adding an interval to a time stamp for + the SQL server just for adding an interval to a timestamp for example. @@ -3622,7 +3622,7 @@ void PGTYPESdecimal_free(decimal *var); PGTYPESInvalidTimestamp - A value of type timestamp representing an invalid time stamp. This is + A value of type timestamp representing an invalid timestamp. This is returned by the function PGTYPEStimestamp_from_asc on parse error. Note that due to the internal representation of the timestamp data type, diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 185a184..90b592d 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -5984,7 +5984,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}'); to_char(timestamp, text) text - convert time stamp to string + convert timestamp to string to_char(current_timestamp, 'HH12:MI:SS') @@ -6042,7 +6042,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}'); to_timestamp(text, text) timestamp with time zone - convert string to time stamp + convert string to timestamp to_timestamp('05 Dec 2000', 'DD Mon YYYY') @@ -7377,7 +7377,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}'); isfinite(timestamp) boolean - Test for finite time stamp (not +/-infinity) + Test for finite timestamp (not +/-infinity) isfinite(timestamp '2001-02-16 21:28:30') true @@ -7667,8 +7667,8 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}'); This expression yields true when two time periods (defined by their endpoints) overlap, false when they do not overlap. The endpoints - can be specified as pairs of dates, times, or time stamps; or as - a date, time, or time stamp followed by an interval. When a pair + can be specified as pairs of dates, times, or timestamps; or as + a date, time, or timestamp followed by an interval. When a pair of values is provided, either the start or the end can be written first; OVERLAPS automatically takes the earlier value of the pair as the start. Each time period is considered to @@ -7901,7 +7901,7 @@ SELECT EXTRACT(EPOCH FROM INTERVAL '5 days 3 hours'); - You can convert an epoch value back to a time stamp + You can convert an epoch value back to a timestamp with to_timestamp: @@ -8308,7 +8308,7 @@ SELECT date_trunc('hour', INTERVAL '3 days 02:47:33'); The AT TIME ZONE converts time stamp without time zone to/from - time stamp with time zone, and + timestamp with time zone, and time values to different time zones. shows its variants. @@ -8330,7 +8330,7 @@ SELECT date_trunc('hour', INTERVAL '3 days 02:47:33'); timestamp without time zone AT TIME ZONE zone timestamp with time zone - Treat given time stamp without time zone as located in the specified time zone + Treat given timestamp without time zone as located in the specified time zone @@ -8338,7 +8338,7 @@ SELECT date_trunc('hour', INTERVAL '3 days 02:47:33'); timestamp with time zone AT TIME ZONE zone timestamp without time zone - Convert given time stamp with time zone to the new time + Convert given timestamp with time zone to the new time zone, with no time zone designation @@ -8375,7 +8375,7 @@ SELECT TIMESTAMP '2001-02-16 20:38:40-05' AT TIME ZONE 'Asia/Tokyo' AT TIME ZONE The first example adds a time zone to a value that lacks it, and displays the value using the current TimeZone - setting. The second example shifts the time stamp with time zone value + setting. The second example shifts the timestamp with time zone value to the specified time zone, and returns the value without a time zone. This allows storage and display of values different from the current TimeZone setting. The third example converts @@ -8468,7 +8468,7 @@ SELECT LOCALTIMESTAMP; the intent is to allow a single transaction to have a consistent notion of the current time, so that multiple modifications within the same transaction bear the same - time stamp. + timestamp. @@ -20218,7 +20218,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup()); pg_last_xact_replay_timestamp() timestamp with time zone - Get time stamp of last transaction replayed during recovery. + Get timestamp of last transaction replayed during recovery. This is the time at which the commit or abort WAL record for that transaction was generated on the primary. If no transactions have been replayed during recovery, this function @@ -21678,9 +21678,9 @@ SELECT convert_from(pg_read_binary_file('file_in_utf8.txt'), 'UTF8'); pg_stat_file returns a record containing the file - size, last accessed time stamp, last modified time stamp, - last file status change time stamp (Unix platforms only), - file creation time stamp (Windows only), and a boolean + size, last accessed timestamp, last modified timestamp, + last file status change timestamp (Unix platforms only), + file creation timestamp (Windows only), and a boolean indicating if it is a directory. Typical usages include: SELECT * FROM pg_stat_file('filename'); diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml index 8db9686..01eacf7 100644 --- a/doc/src/sgml/logicaldecoding.sgml +++ b/doc/src/sgml/logicaldecoding.sgml @@ -536,7 +536,7 @@ typedef void (*LogicalDecodeBeginCB) (struct LogicalDecodingContext *ctx, ReorderBufferTXN *txn); The txn parameter contains meta information about - the transaction, like the time stamp at which it has been committed and + the transaction, like the timestamp at which it has been committed and its XID. @@ -660,7 +660,7 @@ typedef void (*LogicalDecodeMessageCB) (struct LogicalDecodingContext *ctx, const char *message); The txn parameter contains meta information about - the transaction, like the time stamp at which it has been committed and + the transaction, like the timestamp at which it has been committed and its XID. Note however that it can be NULL when the message is non-transactional and the XID was not assigned yet in the transaction which logged the message. The lsn has WAL diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml index ef1556b..6e3ace0 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -4855,7 +4855,7 @@ $$ LANGUAGE plpgsql; PL/pgSQL interpreter casts this string to the timestamp type by calling the text_out and timestamp_in - functions for the conversion. So, the computed time stamp is updated + functions for the conversion. So, the computed timestamp is updated on each execution as the programmer expects. Even though this happens to work as expected, it's not terribly efficient, so use of the now() function would still be a better idea. diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml index cc2e533..5460765 100644 --- a/doc/src/sgml/ref/pgbench.sgml +++ b/doc/src/sgml/ref/pgbench.sgml @@ -1661,9 +1661,9 @@ END; script_no identifies which script file was used (useful when multiple scripts were specified with or ), and time_epoch/time_us are a - Unix-epoch time stamp and an offset + Unix-epoch timestamp and an offset in microseconds (suitable for creating an ISO 8601 - time stamp with fractional seconds) showing when + timestamp with fractional seconds) showing when the transaction completed. The schedule_lag field is the difference between the transaction's scheduled start time, and the time it actually started, in @@ -1719,7 +1719,7 @@ END; where interval_start is the start of the interval (as a Unix - epoch time stamp), + epoch timestamp), num_transactions is the number of transactions within the interval, sum_latency is the sum of the transaction diff --git a/doc/src/sgml/replication-origins.sgml b/doc/src/sgml/replication-origins.sgml index a03ce76..aaa3705 100644 --- a/doc/src/sgml/replication-origins.sgml +++ b/doc/src/sgml/replication-origins.sgml @@ -61,7 +61,7 @@ marked as replaying from a remote node (using the pg_replication_origin_session_setup() function). Additionally the LSN and commit - time stamp of every source transaction can be configured on a per + timestamp of every source transaction can be configured on a per transaction basis using pg_replication_origin_xact_setup(). If that's done replication progress will persist in a crash safe diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml index 67e1861..1bd69f2 100644 --- a/doc/src/sgml/trigger.sgml +++ b/doc/src/sgml/trigger.sgml @@ -335,7 +335,7 @@ requirements to call the same function. As an example, there could be a generalized trigger function that takes as its arguments two column names and puts the current user in one and - the current time stamp in the other. Properly written, this + the current timestamp in the other. Properly written, this trigger function would be independent of the specific table it is triggering on. So the same function could be used for INSERT events on any table with suitable diff --git a/doc/src/sgml/uuid-ossp.sgml b/doc/src/sgml/uuid-ossp.sgml index b3b816c..db8871b 100644 --- a/doc/src/sgml/uuid-ossp.sgml +++ b/doc/src/sgml/uuid-ossp.sgml @@ -41,7 +41,7 @@ This function generates a version 1 UUID. This involves the MAC - address of the computer and a time stamp. Note that UUIDs of this + address of the computer and a timestamp. Note that UUIDs of this kind reveal the identity of the computer that created the identifier and the time at which it did so, which might make it unsuitable for certain security-sensitive applications. diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index fc46360..cf564ca 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -3534,7 +3534,7 @@ static struct config_string ConfigureNamesString[] = }, { {"recovery_target_time", PGC_POSTMASTER, WAL_RECOVERY_TARGET, - gettext_noop("Sets the time stamp up to which recovery will proceed."), + gettext_noop("Sets the timestamp up to which recovery will proceed."), NULL }, &recovery_target_time_string, @@ -3916,7 +3916,7 @@ static struct config_string ConfigureNamesString[] = { {"TimeZone", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Sets the time zone for displaying and interpreting time stamps."), + gettext_noop("Sets the time zone for displaying and interpreting timestamps."), NULL, GUC_REPORT }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index cfad86c..16e4360 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -259,7 +259,7 @@ # (change requires restart) #recovery_target_name = '' # the named restore point to which recovery will proceed # (change requires restart) -#recovery_target_time = '' # the time stamp up to which recovery will proceed +#recovery_target_time = '' # the timestamp up to which recovery will proceed # (change requires restart) #recovery_target_xid = '' # the transaction ID up to which recovery will proceed # (change requires restart) diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index ff98d9e..06fbe76 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -48,7 +48,7 @@ typedef struct CheckPoint Oid oldestXidDB; /* database with minimum datfrozenxid */ MultiXactId oldestMulti; /* cluster-wide minimum datminmxid */ Oid oldestMultiDB; /* database with minimum datminmxid */ - pg_time_t time; /* time stamp of checkpoint */ + pg_time_t time; /* timestamp of checkpoint */ TransactionId oldestCommitTsXid; /* oldest Xid with valid commit * timestamp */ TransactionId newestCommitTsXid; /* newest Xid with valid commit @@ -125,7 +125,7 @@ typedef struct ControlFileData * System status data */ DBState state; /* see enum above */ - pg_time_t time; /* time stamp of last pg_control update */ + pg_time_t time; /* timestamp of last pg_control update */ XLogRecPtr checkPoint; /* last check point record ptr */ CheckPoint checkPointCopy; /* copy of last check point record */ diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c index efd9f3a..4d33453 100644 --- a/src/interfaces/ecpg/pgtypeslib/timestamp.c +++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c @@ -850,7 +850,7 @@ PGTYPEStimestamp_defmt_asc(const char *str, const char *fmt, timestamp * d) } /* -* add an interval to a time stamp +* add an interval to a timestamp * * *tout = tin + span * @@ -909,7 +909,7 @@ PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout /* -* subtract an interval from a time stamp +* subtract an interval from a timestamp * * *tout = tin - span * -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0006-consistent-language-not-implemented.patch" From 8fe7597a4cdf87a721d98e214e90fc689dbfcd49 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Mon, 20 May 2019 12:57:17 -0500 Subject: [PATCH v5 06/12] consistent language: not implemented Should we change the rest of these, too ? git grep 'errmsg.*not yet implemented' --- src/backend/catalog/index.c | 2 +- src/backend/commands/indexcmds.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index bb60b23..7f607e6 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -3511,7 +3511,7 @@ reindex_relation(Oid relid, int flags, int options) { ereport(WARNING, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("REINDEX of partitioned tables is not yet implemented, skipping \"%s\"", + errmsg("REINDEX of partitioned tables is not implemented, skipping \"%s\"", RelationGetRelationName(rel)))); table_close(rel, ShareLock); return false; diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 6fa5738..5b0ae20 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -2898,7 +2898,7 @@ ReindexRelationConcurrently(Oid relationOid, int options) /* see reindex_relation() */ ereport(WARNING, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("REINDEX of partitioned tables is not yet implemented, skipping \"%s\"", + errmsg("REINDEX of partitioned tables is not implemented, skipping \"%s\"", get_rel_name(relationOid)))); return false; default: @@ -3344,7 +3344,7 @@ ReindexPartitionedIndex(Relation parentIdx) { ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("REINDEX is not yet implemented for partitioned indexes"))); + errmsg("REINDEX is not implemented for partitioned indexes"))); } /* -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0007-consistent-language-to-which.patch" From ec0ff2e46bd59bea87178b83d03fd07c8769e788 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Mon, 20 May 2019 19:02:42 -0500 Subject: [PATCH v5 07/12] consistent language: to which XXX: should have trailing period in tables? --- doc/src/sgml/monitoring.sgml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index cba36c0..df5df62 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -602,12 +602,12 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser datid oid - OID of the database this backend is connected to + OID of the database to which this backend is connected datname name - Name of the database this backend is connected to + Name of the database to which this backend is connected pid @@ -2099,7 +2099,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i text Host of the PostgreSQL instance - this WAL receiver is connected to. This can be a host name, + to which this WAL receiver is connected. This can be a host name, an IP address, or a directory path if the connection is via Unix socket. (The path case can be distinguished because it will always be an absolute path, beginning with /.) @@ -2110,7 +2110,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i integer Port number of the PostgreSQL instance - this WAL receiver is connected to. + to which this WAL receiver is connected. @@ -3375,7 +3375,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, pg_stat_get_backend_dbid(integer) oid - OID of the database this backend is connected to + OID of the database to which this backend is connected -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0008-Consistent-language-contains.patch" From e4101c7f192ab82866e5593d5d913a19595ca10d Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Mon, 20 May 2019 19:04:15 -0500 Subject: [PATCH v5 08/12] Consistent language: contains --- doc/src/sgml/monitoring.sgml | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index df5df62..964c8c5 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -1976,9 +1976,9 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
- The pg_stat_replication view will contain one row - per WAL sender process, showing statistics about replication to that - sender's connected standby server. Only directly connected standbys are + The pg_stat_replication view contains one row + per WAL sender process, showing statistics about replication to the + associated standby server. Only directly connected standbys are listed; no information is available about downstream standby servers. @@ -2126,7 +2126,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_wal_receiver view will contain only + The pg_stat_wal_receiver view contains only one row, showing statistics about the WAL receiver from that receiver's connected server. @@ -2198,8 +2198,8 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_subscription view will contain one - row per subscription for main worker (with null PID if the worker is + The pg_stat_subscription view contains one + row per subscription for the main worker (with null PID if the worker is not running), and additional rows for workers handling the initial data copy of the subscribed tables. @@ -2281,9 +2281,9 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_ssl view will contain one row per + The pg_stat_ssl view contains one row per backend or WAL sender process, showing statistics about SSL usage on - this connection. It can be joined to pg_stat_activity + the associated connection. It can be joined to pg_stat_activity or pg_stat_replication on the pid column to get more details about the connection. @@ -2330,8 +2330,8 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_gssapi view will contain one row per - backend, showing information about GSSAPI usage on this connection. It can + The pg_stat_gssapi view contains one row per + backend, showing information about GSSAPI usage on the associated connection. It can be joined to pg_stat_activity or pg_stat_replication on the pid column to get more details about the @@ -2632,7 +2632,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_database view will contain one row + The pg_stat_database view contains one row for each database in the cluster, plus one for shared objects, showing database-wide statistics. @@ -2694,7 +2694,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_database_conflicts view will contain + The pg_stat_database_conflicts view contains one row per database, showing database-wide statistics about query cancels occurring due to conflicts with recovery on standby servers. This view will only contain information on standby servers, since @@ -2835,7 +2835,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_all_tables view will contain + The pg_stat_all_tables view contains one row for each table in the current database (including TOAST tables), showing statistics about accesses to that specific table. The pg_stat_user_tables and @@ -2902,7 +2902,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_all_indexes view will contain + The pg_stat_all_indexes view contains one row for each index in the current database, showing statistics about accesses to that specific index. The pg_stat_user_indexes and @@ -3012,7 +3012,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_statio_all_tables view will contain + The pg_statio_all_tables view contains one row for each table in the current database (including TOAST tables), showing statistics about I/O on that specific table. The pg_statio_user_tables and @@ -3073,7 +3073,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_statio_all_indexes view will contain + The pg_statio_all_indexes view contains one row for each index in the current database, showing statistics about I/O on that specific index. The pg_statio_user_indexes and @@ -3124,7 +3124,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_statio_all_sequences view will contain + The pg_statio_all_sequences view contains one row for each sequence in the current database, showing statistics about I/O on that specific sequence. @@ -3178,7 +3178,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i - The pg_stat_user_functions view will contain + The pg_stat_user_functions view contains one row for each tracked function, showing statistics about executions of that function. The parameter controls exactly which functions are tracked. @@ -3490,7 +3490,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, Whenever CREATE INDEX or REINDEX is running, the - pg_stat_progress_create_index view will contain + pg_stat_progress_create_index view contains one row for each backend that is currently creating indexes. The tables below describe the information that will be reported and provide information about how to interpret it. @@ -3653,7 +3653,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, The index is being built by code specific to the access method, and if it supports progress reporting, this indicates the method's subphase. blocks_total and blocks_done - will contain progress data, as may + contain progress data, as may tuples_total and tuples_done. @@ -3738,7 +3738,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, VACUUM Progress Reporting - The pg_stat_progress_vacuum view will contain one + The pg_stat_progress_vacuum view contains one row for each backend that is running VACUUM, including autovacuum worker processes. The tables below describe the information @@ -3930,8 +3930,8 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid, CLUSTER Progress Reporting - The pg_stat_progress_cluster view will contain a - row for each backend that is running either + The pg_stat_progress_cluster view contains a + row for each backend running CLUSTER or VACUUM FULL. The tables below describe the information that will be reported and provide information about how to interpret it. -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0009-overridden-vs-overwritten.patch" From dccb832daa0f339dbc7bd34687f8690df441cdd5 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Fri, 29 Mar 2019 13:18:12 -0500 Subject: [PATCH v5 09/12] overridden vs overwritten --- doc/src/sgml/ref/pgbench.sgml | 2 +- doc/src/sgml/ref/psql-ref.sgml | 2 +- src/test/regress/expected/create_table.out | 2 +- src/test/regress/sql/create_table.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml index 5460765..f0f0a0c 100644 --- a/doc/src/sgml/ref/pgbench.sgml +++ b/doc/src/sgml/ref/pgbench.sgml @@ -942,7 +942,7 @@ pgbench options d random_seed - random generator seed (unless overwritten with ) + random generator seed (unless overridden with ) diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 8076495..7b5949b 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -478,7 +478,7 @@ EOF leave off the equal sign. To set a variable with an empty value, use the equal sign but leave off the value. These assignments are done during command line processing, so variables that reflect - connection state will get overwritten later. + connection state will be overridden later. diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index 262abf2..654cbfe 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -874,7 +874,7 @@ create table parted_notnull_inh_test1 partition of parted_notnull_inh_test (a no insert into parted_notnull_inh_test (b) values (null); ERROR: null value in column "b" violates not-null constraint DETAIL: Failing row contains (1, null). --- note that while b's default is overriden, a's default is preserved +-- note that while b's default is overridden, a's default is preserved \d parted_notnull_inh_test1 Table "public.parted_notnull_inh_test1" Column | Type | Collation | Nullable | Default diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql index 9c6d86a..b2eeb34 100644 --- a/src/test/regress/sql/create_table.sql +++ b/src/test/regress/sql/create_table.sql @@ -720,7 +720,7 @@ CREATE TABLE part_c_1_10 PARTITION OF part_c FOR VALUES FROM (1) TO (10); create table parted_notnull_inh_test (a int default 1, b int not null default 0) partition by list (a); create table parted_notnull_inh_test1 partition of parted_notnull_inh_test (a not null, b default 1) for values in (1); insert into parted_notnull_inh_test (b) values (null); --- note that while b's default is overriden, a's default is preserved +-- note that while b's default is overridden, a's default is preserved \d parted_notnull_inh_test1 drop table parted_notnull_inh_test; -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0010-spelling-and-typos.patch" From 204275836f9283ade5a68b2349b2f4712e9c4dd7 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Thu, 9 May 2019 21:13:55 -0500 Subject: [PATCH v5 10/12] spelling and typos --- doc/src/sgml/bloom.sgml | 2 +- doc/src/sgml/config.sgml | 2 +- doc/src/sgml/func.sgml | 4 ++-- doc/src/sgml/ref/alter_table.sgml | 2 +- doc/src/sgml/sources.sgml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/src/sgml/bloom.sgml b/doc/src/sgml/bloom.sgml index 6eeadde..c341b65 100644 --- a/doc/src/sgml/bloom.sgml +++ b/doc/src/sgml/bloom.sgml @@ -65,7 +65,7 @@ Number of bits generated for each index column. Each parameter's name refers to the number of the index column that it controls. The default - is 2 bits and maximum is 4095. Parameters for + is 2 bits and the maximum is 4095. Parameters for index columns not actually used are ignored. diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index bdc1d12..095cfb5 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -4196,7 +4196,7 @@ ANY num_sync ( 2' @@ -12934,7 +12934,7 @@ table2-mapping boolean Returns JSON path predicate result for the specified JSON value. - Only first result item is taken into account. If there are no results + Only the first result item is taken into account. If there are no results or the first result item is not Boolean, then null is returned. diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 058324e..6b079a7 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -220,7 +220,7 @@ WITH ( MODULUS numeric_literal, REM SET NOT NULL may only be applied to a column - providing none of the records in the table contain a + provided none of the records in the table contain a NULL value for the column. Ordinarily this is checked during the ALTER TABLE by scanning the entire table; however, if a valid CHECK constraint is diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index c57f51d..65efd8c 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -511,7 +511,7 @@ Hint: the addendum There are functions in the backend that will double-quote their own output - at need (for example, format_type_be()). Do not put + as needed (for example, format_type_be()). Do not put additional quotes around the output of such functions. @@ -880,7 +880,7 @@ BETTER: unrecognized node type: 42 practices. - Features from later revision of the C standard or compiler specific + Features from later revisions of the C standard or compiler specific features can be used, if a fallback is provided. -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0011-is-vs-are-plural.patch" From 981a4e0b43c463b2253b5f7375fe8868ea138d27 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Thu, 4 Apr 2019 18:57:48 -0500 Subject: [PATCH v5 11/12] is vs are plural --- doc/src/sgml/auto-explain.sgml | 4 ++-- doc/src/sgml/ddl.sgml | 2 +- doc/src/sgml/func.sgml | 2 +- doc/src/sgml/sources.sgml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/src/sgml/auto-explain.sgml b/doc/src/sgml/auto-explain.sgml index 3d619d4..9cd8718 100644 --- a/doc/src/sgml/auto-explain.sgml +++ b/doc/src/sgml/auto-explain.sgml @@ -180,8 +180,8 @@ LOAD 'auto_explain'; auto_explain.log_settings controls whether information - about modified configuration options are printed when execution plan is logged. - Only options affecting query planning with value different from the built-in + about modified configuration options is printed when an execution plan is logged. + Only those options which affect query planning and whose value differs from its built-in default value are included in the output. This parameter is off by default. Only superusers can change this setting. diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index 093ef05..a364127 100644 --- a/doc/src/sgml/ddl.sgml +++ b/doc/src/sgml/ddl.sgml @@ -3868,7 +3868,7 @@ CREATE INDEX ON measurement (logdate); Normally, the set of partitions established when initially defining the - table are not intended to remain static. It is common to + table is not intended to remain static. It is common to remove partitions of old data and add partitions for new data. One of the most important advantages of partitioning is allowing this otherwise painful task to be executed diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 0139ceb..5dfdf38 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -10295,7 +10295,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple Producing XML Content - A set of functions and function-like expressions are available for + A set of functions and function-like expressions is available for producing XML content from SQL data. As such, they are particularly suitable for formatting query results into XML documents for processing in client applications. diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index 65efd8c..520bbae 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -452,8 +452,8 @@ Hint: the addendum enough for error messages. Detail and hint messages can be relegated to a verbose mode, or perhaps a pop-up error-details window. Also, details and hints would normally be suppressed from the server log to save - space. Reference to implementation details is best avoided since users - aren't expected to know the details. + space. References to implementation details are best avoided since users + aren't expected to know them. -- 2.7.4 --FkmkrVfFsRoUs1wW Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v5-0012-s-recommendable-recommended.patch" From a9dec43c45a23e27ea716aeb2a3dc639cfcab117 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Thu, 9 May 2019 21:22:10 -0500 Subject: [PATCH v5 12/12] s/recommendable/recommended --- doc/src/sgml/btree.sgml | 2 +- doc/src/sgml/libpq.sgml | 2 +- doc/src/sgml/runtime.sgml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/sgml/btree.sgml b/doc/src/sgml/btree.sgml index 5881ea5..b0e0f08 100644 --- a/doc/src/sgml/btree.sgml +++ b/doc/src/sgml/btree.sgml @@ -60,7 +60,7 @@ contain the single-type operators (and associated support functions) for its input data type, while cross-type comparison operators and support functions are loose in the family. It is - recommendable that a complete set of cross-type operators be included + recommended that a complete set of cross-type operators be included in the family, thus ensuring that the planner can represent any comparison conditions that it deduces from transitivity. diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 8a8427f..4b031ff 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -7107,7 +7107,7 @@ int PQresultSetInstanceData(PGresult *res, PGEventProc proc, void *data); Beware that any storage represented by data will not be accounted for by PQresultMemorySize, unless it is allocated using PQresultAlloc. - (Doing so is recommendable because it eliminates the need to free + (Doing so is recommended because it eliminates the need to free such storage explicitly when the result is destroyed.) diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index ecdaafc..e3d0dec 100644 --- a/doc/src/sgml/runtime.sgml +++ b/doc/src/sgml/runtime.sgml @@ -111,7 +111,7 @@ initdb will attempt to create the directory you specify if it does not already exist. Of course, this will fail if initdb does not have permissions to write in the - parent directory. It's generally recommendable that the + parent directory. It's generally recommended that the PostgreSQL user own not just the data directory but its parent directory as well, so that this should not be a problem. If the desired parent directory doesn't exist either, -- 2.7.4 --FkmkrVfFsRoUs1wW--