Remove duplicated words split across lines in comments

This has been detected using some interesting tricks with sed, and the
method used is mentioned in details in the discussion below.

Author: Justin Pryzby
Discussion: https://postgr.es/m/20180908013109.GB15350@telsasoft.com

diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 030d0f44183534b9f5be5326996f570611013a30..d5a568106c580da7e9eeb87a1936ffa8cad7fca2 100644 (file)
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -211,7 +211,7 @@ freeGinBtreeStack(GinBtreeStack *stack)
 /*
  * Try to find parent for current stack position. Returns correct parent and
  * child's offset in stack->parent. The root page is never released, to
- * to prevent conflict with vacuum process.
+ * prevent conflict with vacuum process.
  */
 static void
 ginFindParents(GinBtree btree, GinBtreeStack *stack)

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index c06bbe72646c1896f8db7b715dd0c03c30fedc3e..3942734e5ae66659a6c6ef3c831269b1ed9ad76f 100644 (file)
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1726,7 +1726,7 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
  * possible that GXACTs that were valid at checkpoint start will no longer
  * exist if we wait a little bit. With typical checkpoint settings this
  * will be about 3 minutes for an online checkpoint, so as a result we
- * we expect that there will be no GXACTs that need to be copied to disk.
+ * expect that there will be no GXACTs that need to be copied to disk.
  *
  * If a GXACT remains valid across multiple checkpoints, it will already
  * be on disk so we don't bother to repeat that write.

diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c
index 5c6de4989c9a41f82ff77d4a561cacda21903915..4a039b119016fd269f31a6df608485f65bbccbce 100644 (file)
--- a/src/backend/access/transam/xlogarchive.c
+++ b/src/backend/access/transam/xlogarchive.c
@@ -422,7 +422,7 @@ ExecuteRecoveryCommand(const char *command, const char *commandName, bool failOn
 /*
  * A file was restored from the archive under a temporary filename (path),
  * and now we want to keep it. Rename it under the permanent filename in
- * in pg_wal (xlogfname), replacing any existing file with the same name.
+ * pg_wal (xlogfname), replacing any existing file with the same name.
  */
 void
 KeepFileRestoredFromArchive(const char *path, const char *xlogfname)

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index edbdce81f21f396d4da8a77dbff19c6804726e9d..2503ac651022801e801cc3e21a5e1bbbbb60aafe 100644 (file)
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -2888,7 +2888,7 @@ analyze_mcv_list(int *mcv_counts,
         * significantly more common than the estimated selectivity they would
         * have if they weren't in the list.  All non-MCV values are assumed to be
         * equally common, after taking into account the frequencies of all the
-        * the values in the MCV list and the number of nulls (c.f. eqsel()).
+        * values in the MCV list and the number of nulls (c.f. eqsel()).
         *
         * Here sumcount tracks the total count of all but the last (least common)
         * value in the MCV list, allowing us to determine the effect of excluding

diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c
index 5ee46905d840cc794e7bf74634c0758022352698..1ac7756f2a5e5c7c5710c9a3f14fed010eccf2d4 100644 (file)
--- a/src/backend/commands/seclabel.c
+++ b/src/backend/commands/seclabel.c
@@ -321,7 +321,7 @@ SetSharedSecurityLabel(const ObjectAddress *object,
 /*
  * SetSecurityLabel attempts to set the security label for the specified
  * provider on the specified object to the given value.  NULL means that any
- * any existing label should be deleted.
+ * existing label should be deleted.
  */
 void
 SetSecurityLabel(const ObjectAddress *object,

diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c
index 1b659a58703064e318e5a4a39c15a46902b741a8..6a576572bbe8a6f3ec53b9103d75b5171dc081aa 100644 (file)
--- a/src/backend/libpq/be-secure-openssl.c
+++ b/src/backend/libpq/be-secure-openssl.c
@@ -956,8 +956,8 @@ info_cb(const SSL *ssl, int type, int args)
  * precomputed.
  *
  * Since few sites will bother to create a parameter file, we also
- * also provide a fallback to the parameters provided by the
- * OpenSSL project.
+ * provide a fallback to the parameters provided by the OpenSSL
+ * project.
  *
  * These values can be static (once loaded or computed) since the
  * OpenSSL library can efficiently generate random keys from the

diff --git a/src/backend/partitioning/partprune.c b/src/backend/partitioning/partprune.c
index b5c1c7d4dd09acb92b71dc367287a98492d33ed8..e1ce8b4ddcb544fb1d1fa4c0bd83afdbbff91da0 100644 (file)
--- a/src/backend/partitioning/partprune.c
+++ b/src/backend/partitioning/partprune.c
@@ -2483,7 +2483,7 @@ get_matching_range_bounds(PartitionPruneContext *context,
 
        /*
         * If the query does not constrain all key columns, we'll need to scan the
-        * the default partition, if any.
+        * default partition, if any.
         */
        if (nvalues < partnatts)
                result->scan_default = partition_bound_has_default(boundinfo);

diff --git a/src/backend/storage/ipc/barrier.c b/src/backend/storage/ipc/barrier.c
index 00ab57c0f6284842db06cbbbdc3ed28763164e52..bcfe87b854b7fe1c09600a497962dd98c5b5c5a0 100644 (file)
--- a/src/backend/storage/ipc/barrier.c
+++ b/src/backend/storage/ipc/barrier.c
@@ -115,7 +115,7 @@ BarrierInit(Barrier *barrier, int participants)
  *
  * While waiting, pg_stat_activity shows a wait_event_class and wait_event
  * controlled by the wait_event_info passed in, which should be a value from
- * from one of the WaitEventXXX enums defined in pgstat.h.
+ * one of the WaitEventXXX enums defined in pgstat.h.
  *
  * Return true in one arbitrarily chosen participant.  Return false in all
  * others.  The return code can be used to elect one participant to execute a

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 017cc1a7b15ac297e326f5ab638369e6c8e4d2b5..46159de7958cd30a0bb2be28837357d8310bb5ce 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -1144,8 +1144,8 @@ DecodeDateTime(char **field, int *ftype, int nf,
                                         * Is this a YMD or HMS specification, or a year number?
                                         * YMD and HMS are required to be six digits or more, so
                                         * if it is 5 digits, it is a year.  If it is six or more
-                                        * more digits, we assume it is YMD or HMS unless no date
-                                        * and no time values have been specified.  This forces 6+
+                                        * digits, we assume it is YMD or HMS unless no date and
+                                        * no time values have been specified.  This forces 6+
                                         * digit years to be at the end of the string, or to use
                                         * the ISO date specification.
                                         */