From ab72d0f7035867f54a5f57d1e7a26c60e6c3be59 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Fri, 29 Mar 2019 19:52:22 -0500 Subject: [PATCH v2 06/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 ab83885..4722392 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 ( @@ -6329,7 +6329,7 @@ local0.* /var/log/postgresql %s - Process start time stamp + Process start timestamp no @@ -6384,7 +6384,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. @@ -6533,7 +6533,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, @@ -7959,7 +7959,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 cced57b..ba7e70c 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 798aae4..c2d29c9 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 5c3724a..defc287 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -5964,7 +5964,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') @@ -6022,7 +6022,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') @@ -7357,7 +7357,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 @@ -7647,8 +7647,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 @@ -7881,7 +7881,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: @@ -8288,7 +8288,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. @@ -8310,7 +8310,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 @@ -8318,7 +8318,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 @@ -8355,7 +8355,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 @@ -8448,7 +8448,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. @@ -20143,7 +20143,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 @@ -21601,9 +21601,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 50f1884..27dc1c7 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 7d3cf25..ee111b8 100644 --- a/doc/src/sgml/ref/pgbench.sgml +++ b/doc/src/sgml/ref/pgbench.sgml @@ -1660,9 +1660,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 @@ -1718,7 +1718,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 f7f726b..965f517 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 77bb7c2..73d8e31 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 a7e0fe6..35697e2 100644 --- a/src/interfaces/ecpg/pgtypeslib/timestamp.c +++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c @@ -854,7 +854,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 * @@ -913,7 +913,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.1.4